summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2009-01-08123-10910/+1826
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (84 commits) wimax: fix kernel-doc for debufs_dentry member of struct wimax_dev net: convert pegasus driver to net_device_ops bnx2x: Prevent eeprom set when driver is down net: switch kaweth driver to netdevops pcnet32: round off carrier watch timer i2400m/usb: wrap USB power saving in #ifdef CONFIG_PM wimax: testing for rfkill support should also test for CONFIG_RFKILL_MODULE wimax: fix kconfig interactions with rfkill and input layers wimax: fix '#ifndef CONFIG_BUG' layout to avoid warning r6040: bump release number to 0.20 r6040: warn about MAC address being unset r6040: check PHY status when bringing interface up r6040: make printks consistent with DRV_NAME gianfar: Fixup use of BUS_ID_SIZE mlx4_en: Returning real Max in get_ringparam mlx4_en: Consider inline packets on completion netdev: bfin_mac: enable bfin_mac net dev driver for BF51x qeth: convert to net_device_ops vlan: add neigh_setup dm9601: warn on invalid mac address ...
| * wimax: fix kernel-doc for debufs_dentry member of struct wimax_devInaky Perez-Gonzalez2009-01-081-0/+3
| | | | | | | | | | | | | | | | Reported by Randy Dunlap from a warning in the v2.6.29 merge window tree as of 2009/1/8. Signed-off-by: Inaky Perez-Gonzalez <inaky@linux.intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * net: convert pegasus driver to net_device_opsOliver Neukum2009-01-081-7/+14
| | | | | | | | | | | | | | This converts the pegasus driver to use of the new net_device_ops structure Signed-off-by: Oliver Neukum <oneukum@suse.de> Signed-off-by: David S. Miller <davem@davemloft.net>
| * bnx2x: Prevent eeprom set when driver is downEilon Greenstein2009-01-081-0/+3
| | | | | | | | | | Signed-off-by: Eilon Greenstein <eilong@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * net: switch kaweth driver to netdevopsOliver Neukum2009-01-081-11/+12
| | | | | | | | | | | | | | This converts the kaweth ethernet USB driver to netdevops. Signed-off-by: Oliver Neukum <oneukum@suse.de> Signed-off-by: David S. Miller <davem@davemloft.net>
| * pcnet32: round off carrier watch timerStephen Hemminger2009-01-081-2/+2
| | | | | | | | | | | | | | | | | | | | The link check watchdog timer on this driver fires every two seconds, but since not aligned it causes extra wakeups. It is more important on this driver than most because it is the hardware that is emulated by default when using network interfaces on VMware. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * i2400m/usb: wrap USB power saving in #ifdef CONFIG_PMInaky Perez-Gonzalez2009-01-081-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | Current code was assuming PM was always enabled, which is not correct. Code which accesses members in the struct usb_device that are dependant on CONFIG_PM must be protected the same. Reported by Randy Dunlap from a build error in the linux-next tree on 07/01/2009. Signed-off-by: Inaky Perez-Gonzalez <inaky@linux.intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * wimax: testing for rfkill support should also test for CONFIG_RFKILL_MODULEInaky Perez-Gonzalez2009-01-081-1/+1
| | | | | | | | | | | | | | | | | | Current WiMAX rfkill code is missing the case where rfkill is compiled in as modules and works only when rfkill is compiled in. This is not correct. Fixed to test for CONFIG_RFKILL or CONFIG_RKILL_MODULE. Signed-off-by: Inaky Perez-Gonzalez <inaky@linux.intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * wimax: fix kconfig interactions with rfkill and input layersInaky Perez-Gonzalez2009-01-081-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WiMAX can work without RFKILL, but it was missing a check to make sure RFKILL is not being made a module with wimax compiled into the kernel. This caused failed builds in s390, where CONFIG_INPUT is always off. When RFKILL is enabled, the code uses the input layer to report hardware switch changes; thus, if RFKILL is enabled, INPUT has to be too. It also needs to display some message when INPUT is disabled that explains why WiMAX is not selectable. (issues found by Randy Dunlap in the linux-next tree). Signed-off-by: Inaky Perez-Gonzalez <inaky@linux.intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * wimax: fix '#ifndef CONFIG_BUG' layout to avoid warningInaky Perez-Gonzalez2009-01-081-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reported by Randy Dunlap: > Also, this warning needs to be fixed: > > linux-next-20090106/net/wimax/id-table.c:133: warning: ISO C90 > forbids mixed declarations and code Move the return on #defined(CONFIG_BUG) below the variable declarations so it doesn't violate ISO C90. On wimax_id_table_release() we want to do a debug check if CONFIG_BUG is enabled. However, we also want the debug code to be always compiled to ensure there is no bitrot. It will be optimized out by the compiler when CONFIG_BUG is disabled. Added a note to the function header stating this. Signed-off-by: Inaky Perez-Gonzalez <inaky@linux.intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * Merge branch 'master' of ↵David S. Miller2009-01-082400-49046/+559448
| |\ | | | | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
| * | r6040: bump release number to 0.20Florian Fainelli2009-01-081-2/+2
| | | | | | | | | | | | | | | | | | | | | This patch bumps release number to 0.20 and 07Jan2009. Signed-off-by: Florian Fainelli <florian@openwrt.org> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | r6040: warn about MAC address being unsetFlorian Fainelli2009-01-081-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Some bootloader/BIOSes do not set the MAC address, warn about that. Signed-off-by: Florian Fainelli <florian@openwrt.org> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | r6040: check PHY status when bringing interface upFlorian Fainelli2009-01-081-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | This patch makes the driver properly initialize the PHY status if not correctly set by the bootloader/BIOS. It prevents some boards to bring up the link on boot. Signed-off-by: Florian Fainelli <florian@openwrt.org> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | r6040: make printks consistent with DRV_NAMEFlorian Fainelli2009-01-081-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes some printks which were not prefixed with DRV_NAME, useful when having multiple cards/drivers on the system. Signed-off-by: Florian Fainelli <florian@openwrt.org> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | gianfar: Fixup use of BUS_ID_SIZEKumar Gala2009-01-081-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit b31a1d8b41513b96e9c7ec2f68c5734cef0b26a4 ("gianfar: Convert gianfar to an of_platform_driver") went back to using BUS_ID_SIZE instead of sizeof() as per the larger patch series that will remove "char bus_id[20]" from struct device. Signed-off-by: Kumar Gala <galak@kernel.crashing.org> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | mlx4_en: Returning real Max in get_ringparamYevgeny Petrilin2009-01-082-2/+8
| | | | | | | | | | | | | | | Signed-off-by: Yevgeny Petrilin <yevgenyp@mellanox.co.il> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | mlx4_en: Consider inline packets on completionYevgeny Petrilin2009-01-082-26/+34
| | | | | | | | | | | | | | | | | | | | | | | | Was trying to unmap work queue entries that had inline packets, so naturally weren't mapped. Signed-off-by: Yevgeny Petrilin <yevgenyp@mellanox.co.il> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | netdev: bfin_mac: enable bfin_mac net dev driver for BF51xSonic Zhang2009-01-081-1/+1
| | | | | | | | | | | | | | | | | | Signed-off-by: Sonic Zhang <sonic.zhang@analog.com> Signed-off-by: Bryan Wu <cooloney@kernel.org> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | qeth: convert to net_device_opsFrank Blaschka2009-01-082-46/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | qeth_l2, qeth_l3 convert to net_device_ops. qeth_l3 remove vlan neigh_setup hack since it does not work any longer with the new net_device_ops. Signed-off-by: Frank Blaschka <frank.blaschka@de.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | vlan: add neigh_setupFrank Blaschka2009-01-081-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | In case the real device has a neigh_setup function, this neigh_setup function should be used for the vlan device. Signed-off-by: Frank Blaschka <frank.blaschka@de.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | dm9601: warn on invalid mac addressWu Fengguang2009-01-081-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | Add warnings on invalid mac address to help disclose/debug problems. Signed-off-by: Wu Fengguang <fengguang.wu@intel.com> Acked-by: Peter Korsgaard <jacmet@sunsite.dk> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | dm9601: tell HW about random generated mac addressWu Fengguang2009-01-081-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | Otherwise unicast RX will only work in promisc mode. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk> Signed-off-by: Wu Fengguang <fengguang.wu@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | tcp6: Add GRO supportHerbert Xu2009-01-082-4/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds GRO support for TCP over IPv6. The code is exactly the same as the IPv4 version except for the pseudo-header checksum computation. Note that I've removed the unused tcphdr argument from tcp_v6_check rather than invent a bogus value for GRO. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | ipv6: Add GRO supportHerbert Xu2009-01-082-5/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds GRO support for IPv6. IPv6 GRO supports extension headers in the same way as GSO (by using the same infrastructure). It's also simpler compared to IPv4 since we no longer have to worry about fragmentation attributes or header checksums. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | hp100: update to net_device_opsStephen Hemminger2009-01-071-8/+24
| | | | | | | | | | | | | | | Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | b44: convert to net_device_opsStephen Hemminger2009-01-071-12/+17
| | | | | | | | | | | | | | | Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | atp: convert to net_device_opsStephen Hemminger2009-01-071-8/+24
| | | | | | | | | | | | | | | Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | amd8111e: convert to net_device_opsStephen Hemminger2009-01-071-14/+21
| | | | | | | | | | | | | | | Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | slip: convert to net_device_opsStephen Hemminger2009-01-071-11/+17
| | | | | | | | | | | | | | | Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | uwb: convert devices to net_device_opsStephen Hemminger2009-01-075-26/+16
| | | | | | | | | | | | | | | | | | Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Acked-by: David Vrabel <david.vrabel@csr.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | gadget: convert devices to new APIStephen Hemminger2009-01-071-6/+10
| | | | | | | | | | | | | | | | | | | | | Convert to net_device_ops Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | xpnet: convert devices to new APIStephen Hemminger2009-01-071-48/+20
| | | | | | | | | | | | | | | | | | | | | Convert to net_device_ops and internal net_device_stats Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | fusion: convert devices to new APIStephen Hemminger2009-01-071-27/+17
| | | | | | | | | | | | | | | | | | | | | Convert to net_device_ops and internal net_device_stats Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | I4l: convert to net_device_opsStephen Hemminger2009-01-071-24/+45
| | | | | | | | | | | | | | | | | | | | | | | | Add net_device_ops and use interal stats Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Acked-by: Karsten Keil <kkeil@suse.de> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | hysdn: convert to net_device_ops and other updatesStephen Hemminger2009-01-071-46/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Several API problems fixed: * use proper allocation * handle renames * convert to net_device_ops * use internal net_device_stats This driver is putrid (as in old and rotten), so I doubt any one uses it. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | dvb: update network device to current APIStephen Hemminger2009-01-071-29/+28
| | | | | | | | | | | | | | | | | | | | | | | | Use internal network_device_stats that exist in network device and net_device_ops. Compile tested only. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | windbond: convert devices to new APIStephen Hemminger2009-01-071-9/+14
| | | | | | | | | | | | | | | | | | | | | Convert to net_device_ops and internal net_device_stats Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | uli526x: convert devices to new APIStephen Hemminger2009-01-071-36/+27
| | | | | | | | | | | | | | | | | | | | | Convert to net_device_ops and internal net_device_stats Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | dmfe: convert to new APIStephen Hemminger2009-01-071-37/+25
| | | | | | | | | | | | | | | | | | | | | Convert to internal net_device-stats and net_device_ops Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | xircom: convert devices to new APIStephen Hemminger2009-01-071-24/+19
| | | | | | | | | | | | | | | | | | | | | Convert to net_device_ops and internal net_device_stats Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | de4x5: convert to net_device_opsStephen Hemminger2009-01-071-7/+13
| | | | | | | | | | | | | | | Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | de2104x: convert to net_device_opsStephen Hemminger2009-01-071-6/+13
| | | | | | | | | | | | | | | Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | tulip: convert devices to new APIStephen Hemminger2009-01-071-10/+17
| | | | | | | | | | | | | | | | | | | | | | | | Convert to net_device_ops and internal net_device_stats Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Acked-by: Grant Grundler <grundler@parisc-linux.org> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | sundance: update to net_device_opsStephen Hemminger2009-01-071-8/+15
| | | | | | | | | | | | | | | Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | starfire: update to net_device_opsStephen Hemminger2009-01-071-12/+22
| | | | | | | | | | | | | | | Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | fealnx: update to net_device_opsStephen Hemminger2009-01-071-8/+13
| | | | | | | | | | | | | | | Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | natsemi: update to net_device_opsStephen Hemminger2009-01-071-12/+17
| | | | | | | | | | | | | | | Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | sb1000: update to net_device_opsStephen Hemminger2009-01-071-5/+11
| | | | | | | | | | | | | | | Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | ns83820: fix net_device_ops supportStephen Hemminger2009-01-071-1/+3
| | | | | | | | | | | | | | | | | | | | | The vlan_rx_register fuction is now in net_device_ops Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
OpenPOWER on IntegriCloud