aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAge
* Merge branch 'upstream-davem' of ↵David S. Miller2008-08-07
|\ | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
| * Merge branch 'for-jeff' of ↵Jeff Garzik2008-08-07
| |\ | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6 into tmp
| | * WAN: Use u32 type instead of u_int32_t in LMC driver.Krzysztof Hałasa2008-07-23
| | | | | | | | | | | | Signed-off-by: Krzysztof Hałasa <khc@pm.waw.pl>
| | * WAN: don't mention syncppp in z8530 DocBook.Krzysztof Hałasa2008-07-23
| | | | | | | | | | | | Signed-off-by: Krzysztof Hałasa <khc@pm.waw.pl>
| | * WAN: Port LMC driver to generic HDLCKrzysztof Hałasa2008-07-23
| | | | | | | | | | | | Signed-off-by: Krzysztof Hałasa <khc@pm.waw.pl>
| | * WAN: Convert Zilog-based drivers to generic HDLCKrzysztof Hałasa2008-07-23
| | | | | | | | | | | | Signed-off-by: Krzysztof Hałasa <khc@pm.waw.pl>
| | * WAN: Port COSA driver to generic HDLC.Krzysztof Hałasa2008-07-23
| | | | | | | | | | | | Signed-off-by: Krzysztof Hałasa <khc@pm.waw.pl>
| | * WAN: farsync driver no longer uses syncppp.c directlyKrzysztof Hałasa2008-07-23
| | | | | | | | | | | | Signed-off-by: Krzysztof Hałasa <khc@pm.waw.pl>
| | * WAN: Convert PC300 driver to use normal u8/u16/u32 typesKrzysztof Hałasa2008-07-23
| | | | | | | | | | | | Signed-off-by: Krzysztof Hałasa <khc@pm.waw.pl>
| | * WAN: Remove dead code from PC300 driver, part #2Krzysztof Hałasa2008-07-23
| | | | | | | | | | | | Signed-off-by: Krzysztof Hałasa <khc@pm.waw.pl>
| | * WAN: Remove dead code from PC300 driver, part #1Krzysztof Hałasa2008-07-23
| | | | | | | | | | | | Signed-off-by: Krzysztof Hałasa <khc@pm.waw.pl>
| | * WAN: Remove unneeded "#include <net/syncppp.h>"Krzysztof Hałasa2008-07-23
| | | | | | | | | | | | Signed-off-by: Krzysztof Hałasa <khc@pm.waw.pl>
| | * wanmain.c doesn't need syncppp.hKrzysztof Hałasa2008-07-23
| | | | | | | | | | | | Signed-off-by: Krzysztof Hałasa <khc@pm.waw.pl>
| | * Remove dead code from wanmain.c, CONFIG_WANPIPE_MULTPPP doesn't existKrzysztof Hałasa2008-07-23
| | | | | | | | | | | | Signed-off-by: Krzysztof Hałasa <khc@pm.waw.pl>
| | * Remove bogus variables from syncppp.[ch]Krzysztof Hałasa2008-07-23
| | | | | | | | | | | | Signed-off-by: Krzysztof Hałasa <khc@pm.waw.pl>
| | * Remove bogus dosyncppp variable from synclink drivers.Krzysztof Hałasa2008-07-23
| | | | | | | | | | | | Signed-off-by: Krzysztof Hałasa <khc@pm.waw.pl>
| | * WAN: cosmetic changes to generic HDLCKrzysztof Hałasa2008-07-23
| | | | | | | | | | | | Signed-off-by: Krzysztof Hałasa <khc@pm.waw.pl>
| * | WAN: remove extra help text from HDLC_PPP config optionKrzysztof Halasa2008-08-07
| | | | | | | | | | | | | | | | | | | | | Remove extra help text from HDLC_PPP config option. Signed-off-by: Krzysztof Hałasa <khc@pm.waw.pl> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
| * | net/core: Allow receive on active slaves.Joe Eykholt2008-08-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | If a packet_type specifies an active slave to bonding and not just any interface, allow it to receive frames that came in on that interface. Signed-off-by: Joe Eykholt <jre@nuovasystems.com> Signed-off-by: Jay Vosburgh <fubar@us.ibm.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
| * | net/core: Allow certain receives on inactive slave.Joe Eykholt2008-08-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow a packet_type that specifies the exact device to receive even on an inactive bonding slave devices. This is important for some L2 protocols such as LLDP and FCoE. This can eventually be used for the bonding special cases as well. Signed-off-by: Joe Eykholt <jre@nuovasystems.com> Signed-off-by: Jay Vosburgh <fubar@us.ibm.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
| * | net/core: Uninline skb_bond().Joe Eykholt2008-08-07
| | | | | | | | | | | | | | | | | | | | | | | | Otherwise subsequent changes need multiple return values. Signed-off-by: Joe Eykholt <jre@nuovasystems.com> Signed-off-by: Jay Vosburgh <fubar@us.ibm.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
| * | bonding: Don't destroy bonding master when removing slave via sysfsMoni Shoua2008-08-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is wrong to destroy a bonding master from a context that uses the sysfs of that bond. When last IPoIB slave is unenslaved from by writing to a sysfs file (for bond0 this would be /sys/class/net/bond0/bonding/slaves) the driver tries to destroy the bond. This is wrong and can lead to a lockup or a crash. This fix lets the bonding master stay and relies on the user to destroy the bonding master if necessary (i.e. before module ib_ipoib is unloaded) This patch affects only bonds of IPoIB slaves. Ethernet slaves stay unaffected. Signed-off-by: Moni Shoua <monis@voltaire.com> Signed-off-by: Jay Vosburgh <fubar@us.ibm.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
| * | bonding: refactor mii monitorJay Vosburgh2008-08-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor mii monitor. As with the previous ARP monitor refactor, the motivation for this is to handle locking rationally (in this case, removing conditional locking) and generally clean up the code. This patch breaks up the monolithic mii monitor into two phases: an inspection phase, followed by an optional commit phase. The commit phase is the only portion that requires RTNL or makes changes to state, and is only called when inspection finds something to change. Signed-off-by: Jay Vosburgh <fubar@us.ibm.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
| * | [netdrvr] Drivers should not set IFF_* flag themselvesWang Chen2008-08-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some hardware set promisc when they are requested to set IFF_ALLMULTI flag. It's ok, but if drivers set IFF_PROMISC flag when they set promisc, it will broken upper layer handle for promisc and allmulti. In addition, drivers can use their own hardware programming to make it. So do not allow drivers to set IFF_* flags. This is a general driver fix, so I didn't split it to pieces and send to specific driver maintainers. Signed-off-by: Wang Chen <wangchen@cn.fujitsu.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
| * | dm9000: Support MAC address setting through platform data.Laurent Pinchart2008-08-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The dm9000 driver reads the chip's MAC address from the attached EEPROM. When no EEPROM is present, or when the MAC address is invalid, it falls back to reading the address from the chip. This patch lets platform code set the desired MAC address through platform data. Signed-off-by: Laurent Pinchart <laurentp@cse-semaphore.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
| * | 3c59x: use netdev_alloc_skbStephen Hemminger2008-08-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix possible bug where end of receive buffer could be overwritten. The allocation needs to allow for the reserved space. This would only happen if device received packet greater than Ethernet standard MTU. Change this driver to use netdev_alloc_skb rather than setting skb->dev directly. For the initial allocation it doesn't need to be GFP_ATOMIC. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
| * | ethtool: Expand ethtool_cmd.speed to 32 bitsBrandon Philips2008-08-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce the speed_hi field to ethtool_cmd, using the reserved space, to expand the speed field to 2^32 Megabits/second. Making this field expansion now gives us plenty of time to fix up the user-space pieces that use SIOCETHTOOL before hardware faster than 64 Gb/s is available. Signed-off-by: Brandon Philips <bphilips@suse.de> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
| * | pegasus: add blacklist support to fix Belkin bluetooth dongle.Ben Collins2008-08-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reference: https://launchpad.net/bugs/140511 The Belkin bluetooth dongle unfortunately shares the vendor and device id with the network adapter which causes lockups whenever the bluetooth dongle is inserted. Signed-off-by: Stefan Bader <stefan.bader@canonical.com> Signed-off-by: Ben Collins <ben.collins@canonical.com> Cc: Greg Kroah-Hartman <gregkh@suse.de> Cc: David Brownell <david-b@pacbell.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
| * | drivers/net/netxen/netxen_nic_hw.c: fix printk warningsAndrew Morton2008-08-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | drivers/net/netxen/netxen_nic_hw.c: In function 'netxen_nic_pci_mem_read_direct': drivers/net/netxen/netxen_nic_hw.c:1414: warning: format '%llx' expects type 'long long unsigned int', but argument 3 has type 'u64' drivers/net/netxen/netxen_nic_hw.c: In function 'netxen_nic_pci_mem_write_direct': drivers/net/netxen/netxen_nic_hw.c:1487: warning: format '%llx' expects type 'long long unsigned int', but argument 3 has type 'u64' You don't know what type was used for u64 hence they cannot be printed without casting. Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
| * | hamradio: add missing sanity check to tty operationEugene Teo2008-08-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing sanity check to tty operation. Acked-by: Alan Cox <alan@redhat.com> Signed-off-by: Eugene Teo <eteo@redhat.com> Cc: Jeff Garzik <jeff@garzik.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
| * | drivers/net: coding styles fixes to drivers/net/8390.cGustavo F. Padovan2008-08-07
| | | | | | | | | | | | | | | | | | | | | Fix all errors and warnings reported by checkpatch.pl Signed-off-by: Gustavo F. Padovan <gustavo@las.ic.unicamp.br> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
| * | drivers/net: coding styles fixes to drivers/net/8390p.cGustavo F. Padovan2008-08-07
| | | | | | | | | | | | | | | | | | | | | Fix all errors and warnings reported by checkpatch.pl Signed-off-by: Gustavo F. Padovan <gustavo@las.ic.unicamp.br> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
| * | drivers/net: Remove 'return' of void function NS8390p_init()Gustavo F. Padovan2008-08-07
| | | | | | | | | | | | | | | | | | | | | We don't need this into a void function. Signed-off-by: Gustavo F. Padovan <gustavo@las.ic.unicamp.br> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
| * | [netdrvr] sh_eth: Add SH7619 supportYoshinori Sato2008-08-07
| | | | | | | | | | | | | | | | | | | | | Add support SH7619 Internal ethernet controler. Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
| * | METH: fix MAC address setupThomas Bogendoerfer2008-08-07
| | | | | | | | | | | | | | | | | | | | | | | | Setup of the mac filter lost the upper 16bit of the mac address. This bug got unconvered by a patch, which fixed the promiscous handling. Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
| * | xen-netfront: use netif_start_queue() on xennet_open()Eduardo Habkost2008-08-07
| | | | | | | | | | | | | | | | | | | | | | | | xen-netfront never called netif_start_queue() and was was waking the queue on xennet_open(), triggering the BUG_ON() on __netif_schedule(). Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
| * | qla3xxx: driver version change.root2008-08-07
| | | | | | | | | | | | | | | Signed-off-by: Ron Mercer <ron.mercer@qlogic.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
| * | qla3xxx: cleanup: Remove some unused structure definitions and structure ↵Ron Mercer2008-08-07
| | | | | | | | | | | | | | | | | | | | | elements. Signed-off-by: Ron Mercer <ron.mercer@qlogic.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
| * | qla3xxx: cleanup: Remove some unused defined constants in the header file.Ron Mercer2008-08-07
| | | | | | | | | | | | | | | Signed-off-by: Ron Mercer <ron.mercer@qlogic.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
| * | qla3xxx: fix: Fix IFF_MULTICAST setting.Ron Mercer2008-08-07
| | | | | | | | | | | | | | | | | | | | | The driver was erroneously clearing this bit though the hardware supports multicast. Signed-off-by: Ron Mercer <ron.mercer@qlogic.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
| * | qla3xxx: fix: Remove unused set_multicast function.Ron Mercer2008-08-07
| | | | | | | | | | | | | | | | | | | | | | | | This device is one side of a two-function adapter (NIC and iSCSI). Promiscuous mode setting/clearing is not allowed from the NIC side. Signed-off-by: Ron Mercer <ron.mercer@qlogic.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
| * | netxen: fix promisc mode, mtu settingDhananjay Phadke2008-08-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For NX3031, multicast filtering, promisc mode, and max frame size setting is handled by firmware, driver needs to send request to enable/disable it. For old chip revisions / firmware, driver still sets it directly. Added function pointer to set mtu according to chip revision. Signed-off-by: Dhananjay Phadke <dhananjay@netxen.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
| * | netxen: fix cmd ring initDhananjay Phadke2008-08-07
| | | | | | | | | | | | | | | | | | | | | | | | Initialize producer and consumer indices during netdev open(), only for old firmware/chip. Signed-off-by: Dhananjay Phadke <dhananjay@netxen.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
| * | netxen: fix legacy interruptsDhananjay Phadke2008-08-07
| | | | | | | | | | | | | | | | | | | | | | | | Fix legacy interrupt mode for NX3031 chips, read pci interrupt state in hardware to guard against spurious interrupt. Signed-off-by: Dhananjay Phadke <dhananjay@netxen.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
| * | netxen: add new board typesDhananjay Phadke2008-08-07
| | | | | | | | | | | | | | | | | | | | | Add couple of new board configurations based on NX3031 chip. Signed-off-by: Dhananjay Phadke <dhananjay@netxen.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
| * | netxen: fix link status, link speedDhananjay Phadke2008-08-07
| | | | | | | | | | | | | | | | | | | | | | | | For NX3031, the phy is managed by firmware, so driver should avoid setting any phy registers. Signed-off-by: Dhananjay Phadke <dhananjay@netxen.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
| * | remove bogus CONFIG_GFAR_NAPI'sAdrian Bunk2008-08-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The commit that made the CONFIG_GFAR_NAPI code unconditional was included at the same time as a new CONFIG_GFAR_NAPI user, resulting in these bugus #ifdef's. Reported-by: Robert P. J. Day <rpjday@crashcourse.ca> Signed-off-by: Adrian Bunk <bunk@kernel.org> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
| * | net/fs_enet: remove redundant messages for performanceLi Yang2008-08-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | Currently when we do a packet flood to the Ethernet port, the console reports error every time when a packet is dropped. This is too redundant and cost performance. Remove message for this type of event. Signed-off-by: Li Yang <leoli@freescale.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
| * | forcedeth: add tx pause limitAyaz Abdulla2008-08-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds support for limiting the number of tx pause frames to a default of 8. Previously, hardware would send out continuous stream of pause frames. Signed-off-by: Ayaz Abdulla <aabdulla@nvidia.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
| * | forcedeth: add jumbo frame support for mcp79Ayaz Abdulla2008-08-07
| | | | | | | | | | | | | | | | | | | | | This patch adds jumbo frame support for MCP79 chipsets. Signed-off-by: Ayaz Abdulla <aabdulla@nvidia.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>