summaryrefslogtreecommitdiffstats
path: root/drivers/net
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'viro'Jeff Garzik2006-02-0921-116/+191
|\
| * Merge branch 'net.b0' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/birdJeff Garzik2006-02-0916-112/+186
| |\
| | * [PATCH] dead code removed in hp100Al Viro2006-01-281-22/+8
| | | | | | | | | | | | | | | | | | for mode 2 (memory-mapped) we always set ->mem_ptr_virt; dead code removed. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| | * [PATCH] wrong ifdefs in 82596.cAl Viro2006-01-281-1/+1
| | | | | | | | | | | | | | | | | | ifdefs around variable declaration would better match those around its uses... Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| | * [PATCH] bogus include of linux/irq.h in 7990.cAl Viro2006-01-281-1/+1
| | | | | | | | | | | | Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| | * [PATCH] missing include of asm/irq.h in drivers/netAl Viro2006-01-283-0/+5
| | | | | | | | | | | | Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| | * [PATCH] macsonic.c: missed s/driver_unregister/platform_driver_unregister/Al Viro2006-01-281-1/+1
| | | | | | | | | | | | Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| | * [PATCH] appletalk/cops.h: missing const in struct ltfirmwareAl Viro2006-01-281-1/+1
| | | | | | | | | | | | Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| | * [PATCH] ibm_emac sparse annotationsAl Viro2006-01-286-29/+26
| | | | | | | | | | | | Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| | * [PATCH] arcnet probing cleanups and fixesAl Viro2006-01-282-57/+143
| | | | | | | | | | | | | | | | | | | | | make arcnet probing do request_mem_region() for all iomem it's going to access, clean the code up. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| * | [PATCH] type-safe min() in prism54Al Viro2006-02-081-1/+1
| | | | | | | | | | | | | | | | | | we do min() on u8 and small integer constant; cast the latter to u8. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| * | [PATCH] missing includes in drivers/net/mv643xx_eth.cAl Viro2006-02-071-0/+2
| | | | | | | | | | | | Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| * | [PATCH] bogus asm/delay.h includesAl Viro2006-02-072-2/+2
| | | | | | | | | | | | | | | | | | asm/delay.h is non-portable; linux/delay.h should be used in generic code. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| * | [PATCH] remove bogus asm/bug.h includes.Al Viro2006-02-071-1/+0
| | | | | | | | | | | | | | | | | | | | | A bunch of asm/bug.h includes are both not needed (since it will get pulled anyway) and bogus (since they are done too early). Removed. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
* | | Merge branch 'master'Jeff Garzik2006-02-072-7/+2
|\ \ \ | |/ /
| * | [PATCH] Kbuild menu - hide empty NETDEVICES menu when NET is disabledPaolo 'Blaisorblade' Giarrusso2006-02-071-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the whole netdevices menu depend on NET, rather than having an empty submenu when networking is disabled. Indeed, almost the whole body of the menu was surrounded by if NETDEVICES, and what was outside depended on NETCONSOLE which is inside the menu. Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | [PATCH] uli526x warning fixAndrew Morton2006-02-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | drivers/net/tulip/uli526x.c: In function `__check_mode': drivers/net/tulip/uli526x.c:1693: warning: return from incompatible pointer type Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
* | | Merge branch 'upstream-fixes'Jeff Garzik2006-02-0713-109/+220
|\ \ \ | |/ /
| * | Merge branch 'for-jeff' of ↵Jeff Garzik2006-02-072-18/+33
| |\ \ | | | | | | | | | | | | git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6
| | * | 8139too: fix a TX timeout watchdog thread against NAPI softirq raceFrancois Romieu2006-02-011-12/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Ingo's stealth lock validator detected that both thread acquire dev->xmit_lock and tp->rx_lock in reverse order. Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
| | * | dscc4: fix dscc4_init_dummy_skb checkAlexey Dobriyan2006-02-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | It returns a pointer. Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
| | * | r8169: fix forced-mode link settingsAndy Gospodarek2006-01-311-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow the r8169 driver to set devices to be full-duplex only when auto-negotiate is disabled. Signed-off-by: Andy Gospodarek <andy@greyhouse.net> Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
| | * | r8169: prevent excessive busy-waitingFrancois Romieu2006-01-291-6/+4
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The MII registers read/write function blindly busy waits for an amount of 1000 us (1 ms), then up to 200 ms. These functions are called from irq disabled context. Depending on the clock management, it triggers lost ticks events. Since the value is way above the standard delay required for mii register access, it strangely looks like a bandaid against posted writes. Fixes http://bugzilla.kernel.org/show_bug.cgi?id=5947 Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
| * | [PATCH] gianfar: Fix sparse warningsKumar Gala2006-02-074-30/+27
| | | | | | | | | | | | | | | | | | Fixed sparse warnings mainly due to lack of __iomem. Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | [PATCH] dscc4: fix dscc4_init_dummy_skb checkAlexey Dobriyan2006-02-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | It returns a pointer. Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | [PATCH] bonding: Sparse warnings fixLuiz Fernando Capitulino2006-02-071-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | drivers/net/bonding/bond_sysfs.c:263:27: warning: Using plain integer as NULL pointer drivers/net/bonding/bond_sysfs.c:998:26: warning: Using plain integer as NULL pointer drivers/net/bonding/bond_sysfs.c:1126:26: warning: Using plain integer as NULL pointer Signed-off-by: Luiz Capitulino <lcapitulino@mandriva.com.br> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | [PATCH] bonding: allow bond to use TSO if slaves support itJay Vosburgh2006-02-071-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add NETIF_F_TSO (NETIF_F_UFO) to BOND_INTERSECT_FEATURES so that it can be used by a bonding device iff all its slave devices support TSO (UFO). Signed-off-by: Arthur Kepner <akepner@sgi.com> Signed-off-by: Jay Vosburgh <fubar@us.ibm.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | [PATCH] sky2: version 0.15 updateStephen Hemminger2006-02-071-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | Increase version, and get rid of out-dated comment. Speed setting has worked for quite a while. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | [PATCH] sky2: support msi interrupt (revised)Stephen Hemminger2006-02-072-0/+78
| | | | | | | | | | | | | | | | | | | | | | | | This hardware supports Message Signaled interrupts. When setting up, use software interrupt to check for bad hardware. Signed-off-by: Stephen Hemminger <shemminger @osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | [PATCH] sky2: add irq to entropy poolStephen Hemminger2006-02-071-1/+2
| | | | | | | | | | | | | | | | | | | | | The sky2 interrupt can be used to add entropy. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | [PATCH] sky2: clear irq raceStephen Hemminger2006-02-071-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Move the interrupt clear to before processing, this avoids a possible races with status delaying. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | [PATCH] sky2: set mac address fixStephen Hemminger2006-02-071-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using the sky2 driver with bonding can result in oopses related to reinitializing the PHY when the MAC address is changed (which bonding is wont to do). This patch changes sky2_set_mac_address to take less drastic measures. This is analagous to the skge patch here: http://lkml.org/lkml/2005/9/29/399 which fixed the issue here: http://bugzilla.kernel.org/show_bug.cgi?id=5271 Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | [PATCH] sky2: ethtool rx_coalesce settings fixStephen Hemminger2006-02-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes setting rx_coalesce_usecs_irq via ethtool in sky2. The write was directed to the wrong register. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | [PATCH] sky2: pci config space checkingStephen Hemminger2006-02-072-17/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There were bugs in mmconfig access to PCI space, up to and include 2.6.16-rc1. These prevented the sky2 driver from being able to clear PCI express errors. This patch makes the driver check (during probe), for errors in PCI config access and fail. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | [PATCH] sky2: power management fixStephen Hemminger2006-02-071-20/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fix suspend/resume for sky2. The status ring was getting reallocated and a bunch of other mistakes. Also, check return from power_state on resume. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | [PATCH] sis900: remove cfgpmcsr I/O space register defineLennert Buytenhek2006-02-071-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | sis900 defines 'cfgpmcsr' as an I/O space register, but CFGPMCSR is in fact a config space register, and there is no register at offset 0x44 in I/O space, so delete the enum. Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | e100: remove init_hw call to fix panicJesse Brandeburg2006-02-071-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e100 seems to have had a long standing bug where e100_init_hw was being called when it should not have been. This caused a panic due to recent changes that rely on correct set up in the driver, and more robust error paths. Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
* | | Merge branch 'sundance'Jeff Garzik2006-02-071-1/+5
|\ \ \
| * | | sundance: Really read addr 0Arnaldo Carvalho de Melo2006-01-261-1/+5
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make phy 0 actually be read, as it is not being right now as we have: int mii_status = mdio_read(dev, phy, MII_BMSR); int phyx = phy & 0x1f; When we should have instead: int phyx = phy & 0x1f; int mii_status = mdio_read(dev, phyx, MII_BMSR); so that when phy, in the end of the (phy = 1; phy <= 32...) loop gets to 32 phyx gets to 0, i.e. we were reading at 32, when the intended read was for 0. Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
* | | Merge branch 'master'Jeff Garzik2006-02-079-541/+697
|\ \ \ | | |/ | |/|
| * | [PPP]: Fixed hardware RX checksum handlingHerbert Xu2006-02-051-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we pull the PPP protocol off the skb, we forgot to update the hardware RX checksum. This may lead to messages such as dsl0: hw csum failure. Similarly, we need to clear the hardware checksum flag when we use the existing packet to store the decompressed result. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2006-02-032-4/+27
| |\ \
| | * | [TG3]: Update driver version and release date.David S. Miller2006-02-021-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| | * | [TG3]: Flush tg3_reset_task()Michael Chan2006-02-022-2/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure tg3_reset_task() is flushed in the close and suspend paths as noted by Jeff Garzik. In the close path, calling flush_scheduled_work() may cause deadlock if linkwatch_event() is on the workqueue. linkwatch_event() will try to get the rtnl_lock() which is already held by tg3_close(). So instead, we set a flag in tg3_reset_task() and tg3_close() polls the flag until it is cleared. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [PATCH] 3c59x: collision statistic fixSteffen Klassert2006-02-031-10/+23
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Count the total number of packets with collisions during transmission in vp->stats.collisions. Signed-off-by: Steffen Klassert <klassert@mathematik.tu-chemnitz.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] ipw2200: fix ->eeprom[EEPROM_VERSION] checkAlexey Dobriyan2006-02-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | priv->eeprom is a pointer. Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Acked-by: Yi Zhu <yi.zhu@intel.com> Cc: James Ketrenos <jketreno@linux.intel.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] lp486e: remove SLOW_DOWN_IOAlexey Dobriyan2006-02-011-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's not used. Fix the following on alpha-eb66 as a side effect: In file included from drivers/net/lp486e.c:75: include/asm/io.h:20:1: warning: "SLOW_DOWN_IO" redefined drivers/net/lp486e.c:59:1: warning: this is the location of the previous definition Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/bnx2-2.6Linus Torvalds2006-01-313-524/+643
| |\ \
| | * | [BNX2]: Update version and copyright yearMichael Chan2006-01-233-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update version to 1.4.31 and add 2006 copyright. Skip the last digit when reporting the firmware version. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| | * | [BNX2]: Add PHY loopback testMichael Chan2006-01-231-22/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Enhance the ethtool loopback test with PHY loopback test. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
OpenPOWER on IntegriCloud