summaryrefslogtreecommitdiffstats
path: root/drivers/net
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'upstream-fixes'Jeff Garzik2006-02-1711-61/+111
|\
| * [PATCH] bonding: fix a locking bug in bond_releaseJay Vosburgh2006-02-171-0/+1
| | | | | | | | | | | | | | | | | | | | bond_release returns EINVAL without releasing the bond lock if the slave device is not being bonded by the bond. The following patch ensures that the lock is released in this case. Signed-off-by: Stephen J. Bevan <stephen@dino.dnsalias.com> Acked-by: Jay Vosburgh <fubar@us.ibm.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * [PATCH] smctr warning fixAndrew Morton2006-02-171-1/+1
| | | | | | | | | | | | | | | | drivers/net/tokenring/smctr.c: In function `smctr_load_firmware': drivers/net/tokenring/smctr.c:2981: warning: assignment discards qualifiers from pointer target type Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * [PATCH] sky2: speed setting fixStephen Hemminger2006-02-171-1/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Users report problems w/ auto-negotiation disabled and the link set to 100/Half or 10/Half. Problems range from poor performance to no link at all. The current sky2 code does not set things properly on link up if autonegotiation is disabled. Plus it does not contemplate a 10Mbit setting at all. This patch corrects that. 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] skge: speed settingStephen Hemminger2006-02-171-1/+9
| | | | | | | | | | | | | | | | | | This is a clone of John Linville's fixed for speed setting on sky2 driver. The skge driver has the same code (and bug). It would not allow manually forcing 100 and 10 mbit. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * [PATCH] skge: no longer experimentalStephen Hemminger2006-02-171-2/+2
| | | | | | | | | | | | | | | | Take the experimental dependency of skge driver, it is as stable as the others. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * [PATCH] sk98lin: no d-link support (kconfig)Stephen Hemminger2006-02-171-1/+0
| | | | | | | | | | | | | | | | | | The sk98lin driver was changed a while ago to remove support for the D-Link 530T card because that hardware has no working VPD data. The help text for Kconfig was not updated. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * [PATCH] Wavelan_cs bitfield fixesJean Tourrilhes2006-02-171-12/+4
| | | | | | | | | | | | | | | | | | Some bitfields were incorrectly initialised in wavelan_cs, causing some compiler warning. Also killed a error message that should not be there... Signed-off-by: Jean Tourrilhes <jt@hpl.hp.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * Merge branch 'for-jeff' of ↵Jeff Garzik2006-02-171-2/+2
| |\ | | | | | | | | | git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6
| | * sis190: early setting of the pci driver private dataFrancois Romieu2006-02-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Below this point, the error path will proceed through sis190_release_board(). It will happily oops if pci_set_drvdata() has not been issued. Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
| * | [PATCH] wireless/atmel: fix Open System authentication process bugsDan Williams2006-02-171-10/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes a number of bugs in the authentication process: 1) When falling back to Shared Key authentication mode from Open System, a missing 'return' would cause the auth request to be sent, but would drop the card into Management Error state. When falling back, the driver should also indicate that it is switching to Shared Key mode by setting exclude_unencrypted. 2) Initial authentication modes were apparently wrong in some cases, causing the driver to attempt Shared Key authentication mode when in fact the access point didn't support that mode or even had WEP disabled. The driver should set the correct initial authentication mode based on wep_is_on and exclude_unencrypted. 3) Authentication response packets from the access point in Open System mode were getting ignored because the driver was expecting the sequence number of a Shared Key mode response. The patch separates the OS and SK mode handling to provide the correct behavior. Signed-off-by: Dan Williams <dcbw@redhat.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * | [PATCH] wireless/atmel: fix setting TX key only in ENCODEEXTDan Williams2006-02-171-29/+32
| |/ | | | | | | | | | | | | | | | | | | The previous patch that added ENCODEEXT and AUTH support to the atmel driver contained a slight error which would cause just setting the TX key index to also set the encryption key again. This patch allows any combination of setting the TX key index and setting an encryption key. Signed-off-by: Dan Williams <dcbw@redhat.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * [APPLETALK]: warning fixAndrew Morton2006-02-131-1/+1
| | | | | | | | | | | | | | | | | | drivers/net/appletalk/cops.c: In function `cops_load': drivers/net/appletalk/cops.c:539: warning: assignment discards qualifiers from pointer target type drivers/net/appletalk/cops.c:547: warning: assignment discards qualifiers from pointer target type Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: David S. Miller <davem@davemloft.net>
| * [PATCH] orinoco: support smc2532wJesse Allen2006-02-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | The orinoco wireless driver can support the SMC 2532W-B PC Card, so add the id for it. Signed-off-by: Jesse Allen <the3dfxdude@gmail.com> Cc: Pavel Roskin <proski@gnu.org> Cc: David Gibson <david@gibson.dropbear.id.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * [PATCH] wrong firmware location in IPW2100 Kconfig entryJesper Juhl2006-02-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Firmware should go into /lib/firmware, not /etc/firmware. Found by Alejandro Bonilla. Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com> Signed-off-by: Adrian Bunk <bunk@stusta.de> Acked-by: Zhu Yi <yi.zhu@intel.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | 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>
OpenPOWER on IntegriCloud