aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
Commit message (Collapse)AuthorAgeFilesLines
* [PPP]: handle misaligned accessesPhilippe De Muyter2005-11-081-3/+14
| | | | | | | | | | | | | | From: "Philippe De Muyter" <phdm@macqel.be> This patch avoids ppp-generated kernel crashes on machines where unaligned accesses are forbidden (ie: m68000), by fixing ppp alignment setting for reused skb's. Signed-off-by: Philippe De Muyter <phdm@macqel.be> Cc: "David S. Miller" <davem@davemloft.net> Cc: Paul Mackerras <paulus@samba.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: David S. Miller <davem@davemloft.net>
* Merge branch 'upstream-linus' of ↵Linus Torvalds2005-11-0726-1756/+3160
|\ | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
| * Merge branch 'master'Jeff Garzik2005-11-063-62/+17
| |\
| * | [netdrvr s2io] warning fixesJeff Garzik2005-11-051-6/+4
| | | | | | | | | | | | From Andrew Morton.
| * | [netdrvr] fac_8xx build fixJeff Garzik2005-11-051-1/+1
| | |
| * | Remove linux/version.h include from drivers/net/phy/* and net/ieee80211/*.Jeff Garzik2005-11-058-8/+0
| | | | | | | | | | | | Unused, and causes the files to be needlessly rebuilt in some cases.
| * | [PATCH] airo.c/airo_cs.c: correct prototypesAdrian Bunk2005-11-053-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch creates a file airo.h containing prototypes of the global functions in airo.c used by airo_cs.c . If you got strange problems with either airo_cs devices or in any other completely unrelated part of the kernel shortly or long after a airo_cs device was detected by the kernel, this might have been caused by the fact that caller and callee disagreed regarding the size of the first argument to init_airo_card()... Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * | [PATCH] bnx2: update version and minor fixesMichael Chan2005-11-051-4/+4
| | | | | | | | | | | | | | | | | | | | | Some book keeping and a style fix. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * | [PATCH] bnx2: refine bnx2_pollMichael Chan2005-11-052-15/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refine bnx2_poll() logic to write back the most up-to-date status tag when all work has been processed. This eliminates some occasional extra interrupts when a older status tag is written even though all work has been processed. The idea is to read the status tag just before exiting bnx2_poll() and then check again for any new work. If no new work is pending, the status tag written back will not generate any extra interrupt. This logic is similar to the changes David Miller did to tg3_poll(). Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * | [PATCH] bnx2: update firmware handshake for 5708Michael Chan2005-11-052-15/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dynamically determine the shared memory location where eeprom parameters are stored instead of using a fixed location. Add speed reporting to management firmware. This allows management firmware to know the current speed without contending for MII registers. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * | [PATCH] bnx2: update nvram code for 5708Michael Chan2005-11-052-23/+87
| | | | | | | | | | | | | | | | | | | | | Update bnx2 nvram code with support for 5708. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * | [PATCH] bnx2: update firmware for 5708Michael Chan2005-11-051-1527/+2526
| | | | | | | | | | | | | | | | | | | | | Update bnx2 firmware with support for 5708. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * | [PATCH] bnx2: add 5708 supportMichael Chan2005-11-052-28/+252
| | | | | | | | | | | | | | | | | | | | | | | | Add 5708 copper and serdes basic support, including 2.5 Gbps support on 5708 serdes. SPEED_2500 is also added to ethtool.h Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * | [PATCH] prism54: Remove redundant assignmentDaniel Drake2005-11-051-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | The last patch I sent in ("prism54: Free skb after disabling interrupts") included a redundant NULL assignment. Thanks to Herbert Xu for pointing it out. Signed-off-by: Daniel Drake <dsd@gentoo.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * | [PATCH] drivers/net/hamradio/dmascc.c: remove dmascc_setup()Adrian Bunk2005-11-051-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | It seems dmascc_setup() is a leftover time before dmascc_init() was there. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * | [PATCH] drivers/net/e1000/: possible cleanupsAdrian Bunk2005-11-054-89/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch contains the following possible cleanups: - make needlessly global code static - #if 0 the following unused global functions: - e1000_hw.c: e1000_mc_addr_list_update - e1000_hw.c: e1000_read_reg_io - e1000_hw.c: e1000_enable_pciex_master Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * | [PATCH] drivers/net/ixgb/: make some code staticAdrian Bunk2005-11-054-28/+24
| | | | | | | | | | | | | | | | | | | | | This patch makes some needlessly global code static. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>
* | | [PATCH] m68knommu: FEC ethernet support for the ColdFire 5208Greg Ungerer2005-11-071-22/+218
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for the new 5208 ColdFire (Matt Waddel / Mike Lavender) Patch originally from Matt Waddel (from code originally written by Mike Lavender). I also re-ordered the init code to avoid interrupt lockups on some platforms (at least the 5275, but others have reported it on the 5235 as well). Signed-off-by: Greg Ungerer <gerg@uclinux.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | [PATCH] m68knommu: FEC ethernet header support for the ColdFire 5208Greg Ungerer2005-11-071-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for the new 5208 ColdFire in the FEC ethernet header. Patch originally from Matt Waddel (from code originally written by Mike Lavender). Signed-off-by: Greg Ungerer <gerg@uclinux.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | [PATCH] 3c59x: don't enable scatter/gather w/o checksum supportStephen Hemminger2005-11-071-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | It is not valid to enable scatter/gather without hardware checksum support of some kind. (akpm: applies only to the old boomerang cards). Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | [PATCH] 3c59x: enable use of memory-mapped PCI I/OJohn W. Linville2005-11-071-3/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add capability for 3c59x driver to use memory-mapped PCI I/O resources. This may improve performance for those devices so equipped. This will be the default behaviour for IS_CYCLONE and IS_TORNADO devices. Additionally, it can be enabled/disabled individually for up to MAX_UNITS number of devices via the use_mmio module option or for all units via the global_use_mmio option. The use_mmio option overrides the global_use_mmio option for those devices specified. Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | [PATCH] 3c59x: correct rx_dropped countingJohn W. Linville2005-11-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Only increment rx_dropped in case of lack of resources (i.e. not for frames with errors). Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | [PATCH] 3c59x: support ETHTOOL_GPERMADDRJohn W. Linville2005-11-071-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Add support for ETHTOOL_GPERMADDR to 3c59x. Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | [PATCH] 3c59x: fix some grammar in module parameter descriptionsJohn W. Linville2005-11-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct several (apparently cut & paste) grammatical typos in module parameter descriptions. They seem to have originated as copies of the description for "global_options". Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | [PATCH] 3c59x: cleanup init of module parameter arraysJohn W. Linville2005-11-071-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | Beautify the array initilizations for the module parameters. Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | [PATCH] 3c59x: bounds checking for hw_checksumsJohn W. Linville2005-11-071-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | Add bounds checking to usage of hw_checksums module parameter array. Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | [PATCH] 3c59x: avoid blindly reading link status twiceTommy Christensen2005-11-071-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to spare some I/O operations, be more intelligent about when to read from the PHY. Pointed out by Bogdan Costescu. Signed-off-by: Tommy S. Christensen <tommy.christensen@tpack.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | [PATCH] 3c59x: cleanup of mdio_read routines to use MII_* macrosNeil Horman2005-11-071-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up mdio_read routines in 3c59x.c to use the MII_* macros defined in include/linux/mii.h Signed-off-by: Neil Horman <nhorman@tuxdriver.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | [PATCH] 3c59x: convert to use of pci_iomap APIJohn W. Linville2005-11-071-247/+260
| |/ |/| | | | | | | | | | | | | | | Convert 3c59x driver to use pci_iomap API. This makes it easier to enable the use of memory-mapped PCI I/O resources. Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | Merge master.kernel.org:/home/rmk/linux-2.6-drvmodelLinus Torvalds2005-11-063-62/+17
|\ \ | |/ |/|
| * [DRIVER MODEL] Fix macsonicRussell King2005-11-051-22/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | Release code in driver modules is a potential cause of oopsen. The device may be in use by a userspace process, which will keep a reference to the device. If the module is unloaded, the module text will be freed. Subsequently, when the last reference is dropped, the release code will be called, which no longer exists. Use generic platform device allocation/release code in modules. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
| * [DRIVER MODEL] Fix jazzsonicRussell King2005-11-051-23/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | Release code in driver modules is a potential cause of oopsen. The device may be in use by a userspace process, which will keep a reference to the device. If the module is unloaded, the module text will be freed. Subsequently, when the last reference is dropped, the release code will be called, which no longer exists. Use generic platform device allocation/release code in modules. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
| * [DRIVER MODEL] Fix depcaRussell King2005-11-051-17/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | Release code in driver modules is a potential cause of oopsen. The device may be in use by a userspace process, which will keep a reference to the device. If the module is unloaded, the module text will be freed. Subsequently, when the last reference is dropped, the release code will be called, which no longer exists. Use generic platform device allocation/release code in modules. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
* | [PATCH] phy address mask support for generic phy layerMatt Porter2005-11-051-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a phy_mask field to struct mii_bus and uses it. This field indicates each phy address to be ignored when probing the mdio bus. This support is needed for the fs_enet and ibm_emac drivers to be converted to the generic phy layer among other drivers. Many systems lock up on probing certain phy addresses or probing doesn't return 0xffff when nothing is found at the address. A new driver I'm working on also makes use of this mask. Signed-off-by: Matt Porter <mporter@kernel.crashing.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
* | [PATCH] pcnet32: Prevent hang with 79c976Don Fry2005-11-051-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | Some boards using the 79c976 pcnet32 chip will hang the system if the ethtool --register-dump is performed with the device operational. The request to read bcr30 is retried by the PCI device infinitely without returning data, hanging the system. Tested ia32 and ppc64. Signed-off-by: Don Fry <brazilnut@us.ibm.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
* | [PATCH] pcnet32: AT2700/2701 and Bugzilla 2699 & 4551Don Fry2005-11-051-7/+16
| | | | | | | | | | | | | | | | | | | | | | This patch is a better fix for Allied Telesyn 2700/2701 FX boards than the change made in early January this year. It allows the user to select the speed/duplex via module_param, but if no selection is made, forces the speed to 100 FD. It fixes both Bugzilla bugs 2669 and 4551. Tested ia32 and ppc64 by myself, and by the originator of bug 2669. Signed-off-by: Don Fry <brazilnut@us.ibm.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
* | [PATCH] pcnet32: show name of failing deviceDon Fry2005-11-051-21/+41
| | | | | | | | | | | | | | | | | | | | | | Display the name eth%d or pci_name() of device which fails to allocate memory. When changing ring size via ethtool, it also releases the lock before returning on error. Added comment that the caller of pcnet32_alloc_ring must call pcnet32_free_ring on error, to avoid leak. Tested ia32 by forcing allocation errors. Signed-off-by: Don Fry <brazilnut@us.ibm.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
* | [PATCH] S2io: Multi buffer mode supportAnanda Raju2005-11-053-409/+455
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hi, This patch provides dynamic two buffer-mode and 3 buffer-mode options. Previously 2 buffer-mode was compilation option. Now with this patch applied one can load driver in 2 buffer-mode with module-load parameter ie. #insmod s2io.ko rx_ring_mode=2 This patch also provides 3 buffer-mode which provides header separation functionality. In 3 buffer-mode skb->data will have L2/L3/L4 headers and "skb_shinfo(skb)->frag_list->data" will have have L4 payload. one can load driver in 3 buffer-mode with same above module-load parameter ie. #insmod s2io.ko rx_ring_mode=3 Please review the patch. Signed-off-by: Ananda Raju <ananda.raju@neterion.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
* | [PATCH] drivers/net/wireless/airo.c unsigned comparasonGabriel A. Devenyi2005-11-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | fid is declared as a u32 (unsigned int), and then a few lines later, it is checked for a value < 0, which is clearly useless. In the two locations this function is used, in one it is *explicitly* given a negative number, which would be ignored with the current definition. Thanks to LinuxICC (http://linuxicc.sf.net). Signed-off-by: Gabriel A. Devenyi <ace@staticwave.ca> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
* | Merge branch 'master'Jeff Garzik2005-11-0527-136/+202
|\ \ | |/
| * Merge master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc-mergeLinus Torvalds2005-11-041-4/+4
| |\
| | * Merge Paulus' treeStephen Rothwell2005-11-0214-6/+15
| | |\
| | * | merge filename and modify references to iSeries/mf.hKelly Daly2005-11-021-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Kelly Daly <kelly@au.ibm.com>
| | * | merge filename and modify references to iseries/hv_types.hKelly Daly2005-11-021-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Kelly Daly <kelly@au.ibm.com>
| | * | merge filename and modify references to iseries/hv_lp_event.hKelly Daly2005-11-021-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Kelly Daly <kelly@au.ibm.com>
| | * | merge filename and modify reference to iseries/hv_lp_config.hKelly Daly2005-11-021-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Kelly Daly <kelly@au.ibm.com>
| * | | [PATCH] ARM: Reverted 2919/1: CS8900A ethernet driver modifications for the ↵Russell King2005-11-043-15/+3
| | | | | | | | | | | | | | | | | | | | | | | | Comdial MP1000 No longer maintained
| * | | [PATCH] ibmveth fix panic in initial replenish cycleSantiago Leon2005-11-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes a panic in the current tree caused by a race condition between the initial replenish cycle and the rx processing of the first packets trying to replenish the buffers. Signed-off-by: Santiago Leon <santil@us.ibm.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | | Merge master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2005-11-012-11/+32
| |\ \ \ | | |_|/ | |/| |
| | * | [ARM] Convert EBSA110 network driver to a platform driverRussell King2005-10-312-11/+32
| | |/ | | | | | | | | | Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>