summaryrefslogtreecommitdiffstats
path: root/drivers/net
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'upstream-fixes' of ↵Linus Torvalds2006-03-012-76/+46
|\ | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
| * Merge branch 'e1000' of ssh://198.78.49.142/srv/git/intel/linux-2.6Jeff Garzik2006-03-012-76/+46
| |\
| | * [PATCH] e1000: revert to single descriptor for legacy receive pathJeff Kirsher2006-02-282-76/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A recent patch attempted to enable more efficient memory usage by using only 2kB descriptors for jumbo frames. The method used to implement this has since been commented upon as "illegal" and in recent kernels even causes a BUG when receiving ip fragments while using jumbo frames. This patch simply goes back to the way things were. We expect some complaints due to order 3 allocations failing to come back due to this change. Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
* | | [PATCH] pcmcia: add id for AMB8110 PC CardJesse Allen2006-03-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The axnet_cs driver can support the AMB8110 PC Card, so add the id for it. In the old pcmcia-cs config file, this card is listed with the comment "not specific enough". The last entry in the axnet_ids has the same comment. They are disabled, and for good reason as it was originally identified by the MANFID, and that is shared with several cards that use both the pcnet_cs driver and axnet_cs driver. I tried my AMB8110 with pcnet_cs, and found that it works fine, and I cannot find a reason for either, except that the old config file recommended axnet_cs. Signed-off-by: Jesse Allen <the3dfxdude@gmail.com> Cc: Jeff Garzik <jgarzik@pobox.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
* | | [PATCH] pcmcia: avoid binding hostap_cs to Orinoco cardsPavel Roskin2006-03-011-1/+4
|/ / | | | | | | | | | | | | | | Don't just use cards with PCMCIA ID 0x0156, 0x0002. Make sure that the vendor string is "Intersil" or "INTERSIL" Signed-off-by: Pavel Roskin <proski@gnu.org> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
* | [PATCH] sky2: remove MSI supportStephen Hemminger2006-02-282-78/+0
| | | | | | | | | | | | | | | | | | | | | | | | Remove Message Signaled Interrupt support (for 2.6.16). MSI is inherently edge-triggered and that is incompatiable (without more work) with NAPI. In future, will replace with smarter lockless-IRQ handling like tg3.c Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
* | Merge branch 'for-jeff' of ↵Jeff Garzik2006-02-282-16/+24
|\ \ | | | | | | | | | git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6
| * | 8139cp: fix broken suspend/resumeFrancois Romieu2006-02-271-16/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - check that the device is up before it is enabled again; - the descriptor ring indexes must be set to zero before cp_init_hw() is issued. Add a nice comment to remember that skb allocation failure is still not handled. Fixes http://bugzilla.kernel.org/show_bug.cgi?id=5681 Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
| * | via-velocity: fix memory corruption when changing the mtuFrancois Romieu2006-02-271-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | velocity_rx_refill() only replenishes the descriptor entries which belong to the CPU. It works great in the Rx path but the driver must ensure that all the descriptors are freed before velocity_rx_refill() is used in velocity_change_mtu(). The patch resets the Rx descriptors in velocity_free_rd_ring(). Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
* | | [TG3]: Fix Sun tg3 variant detection.David S. Miller2006-02-271-0/+9
|/ / | | | | | | | | | | | | | | | | Some Sun parts don't have PCI_VENDOR_ID_SUN in the subsystem vendor ID. So add another fallback test, which is the name of the OBP firmware device tree node. If it's a Sun part we'll get "network", else it will be named "ethernet". Signed-off-by: David S. Miller <davem@davemloft.net>
* | Fix Wake on LAN support in sis900Daniele Venzano2006-02-251-2/+2
| | | | | | | | | | | | | | | | | | | | Fix two bugs in the WoL implementation of sis900. The first causes hangs on some system on driver load, the second causes troubles when disabling WoL support. Both fixes are one liner and really simple. Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org> Signed-off-by: Daniele Venzano <venza@brownhat.org>
* | Merge branch 'upstream-fixes' of ↵Linus Torvalds2006-02-236-153/+370
|\ \ | | | | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
| * | [PATCH] drivers/net/tlan.c: #ifdef CONFIG_PCI the PCI specific codeAdrian Bunk2006-02-241-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | drivers/net/tlan.c compiles with CONFIG_PCI=n only with a warning and due to the dead code elimination of gcc. Additionally, this fixes the only compile error I found with CONFIG_PCI=n and the gcc -Werror-implicit-function-declaration flag on i386. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * | skge: protect interrupt maskStephen Hemminger2006-02-232-7/+15
| | | | | | | | | | | | | | | | | | | | | | | | There is a race between updating the irq mask and setting it which can be triggered on SMP with a bad cable. Similar patch from Ingo Molnar and Thomas Gleixner Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
| * | skge: genesis phy initialzationStephen Hemminger2006-02-231-11/+26
| | | | | | | | | | | | | | | | | | | | | The SysKonnect Genesis based board would fail on initialization with phy_read errors caused by not waiting for last phy write. Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
| * | skge: NAPI/irq race fixStephen Hemminger2006-02-231-12/+5
| | | | | | | | | | | | | | | | | | | | | | | | Fix a race in the receive NAPI, irq handling. The interrupt clear and the start need to be separated. Otherwise there is a window between the last frame received and the NAPI done level handling. Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
| * | r8169: enable wake on lanFrancois Romieu2006-02-231-0/+87
| | | | | | | | | | | | | | | | | | Similar to 8139cp code but more inspired/lucky. Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
| * | r8169: fix broken ring index handling in suspend/resumeFrancois Romieu2006-02-231-43/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rtl8169_hw_start() requires that the descriptor ring indexes be set to zero. Let a deferred invocation of rtl8169_reset_task() handle it. Enabling a few power management bits will not hurt either. suspend/resume is issued with irq on: the spinlock do not need to save the irq flag. Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
| * | [PATCH] sky2: close race on IRQ mask update.Stephen Hemminger2006-02-232-7/+17
| | | | | | | | | | | | | | | | | | | | | | | | Need to avoid race in updating IRQ mask. This can probably be replaced smarter use of the interrupt control registers (if/when chipset docs are available). Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
| * | [PATCH] sky2: use device iomem to access PCI configStephen Hemminger2006-02-232-48/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To avoid problems with PCI config access without ACPI (or busted ACPI tables), use the device's window into PCI config space. I know this probably will upset the purists, but I would rather have users than ACPI testers. It also generates less code. Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
| * | [PATCH] sky2: force early transmit statusStephen Hemminger2006-02-231-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Need to force a transmit coalesce timer restart after processing transmit packets. Otherwise, can get transmit status after last update and chip doesn't send the next one. Can go with the chip defaults for coalescing timers, except for Tx timer which needs to be bigger. Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
| * | [PATCH] sky2: poke coalescing timer to fix hangStephen Hemminger2006-02-231-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | Need to restart the interrupt coalescing timer after clearing the interrupt, to avoid races with interrupt timer and processing. Patch from Carl-Daniel Halfinger Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
| * | [PATCH] sky2: limit coalescing values to ring sizeStephen Hemminger2006-02-231-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Don't allow coalescing values to be bigger than the transmit ring. Since if you set them that big, the interrupt never happens and driver livelocks. Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
| * | [PATCH] sky2: yukon-ec-u chipset initializationStephen Hemminger2006-02-232-19/+90
| | | | | | | | | | | | | | | | | | | | | Add more complete setup code for Yukon EC_U chipset. Based on matching code in 8.31 code in SysKonnect vendor driver. Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
* | | [NET]: Increase default IFB device count.Richard Lucassen2006-02-231-1/+1
|/ / | | | | | | | | | | | | | | The most usable number of ifb devices is 2. Change the default to 2. Signed-off-by: Richard Lucassen <spamtrap@lucassen.org> Signed-off-by: Jamal Hadi Salim <hadi@cyberus.ca> Signed-off-by: David S. Miller <davem@davemloft.net>
* | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2006-02-202-18/+79
|\ \
| * | [IRDA]: irda-usb bug fixesJean Tourrilhes2006-02-192-18/+79
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes 2 bugs in the USB-IrDA code. The first one is a buffer overrun in the RX path. We are now using IRDA_SKB_MAX_MTU when initializing the Rx URB. The second one is a potential stack recursion when unplugging the USB dongle. It seems that first we get the Rx URB with a generic error code, and after a while the Rx URB comes again with a "disconnect" error code. Since we are resubmitting the Rx URB immediately after receiving the first error one, we might enter an endless loop. When getting an error Rx URB, the patch defers the Rx URB resubmitting so that it gives us a chance to catch the disconnect one, in case the dongle has juts been unplugged. Tested against 2.6.16-rc2. Patch from Jean Tourrilhes Signed-off-by: Jean Tourrilhes <jt@hpl.hp.com> Signed-off-by: Samuel Ortiz <samuel.ortiz@nokia.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | [PATCH] ipw2200: Suppress warning messageZhu Yi2006-02-201-3/+3
|/ | | | | | | | | | | | The following message will be only printed if DEBUG_NOTIF is on. "Unknown notification: subtype=40,flags=0xa0,size=40" Signed-off-by: Zhu Yi <yi.zhu@intel.com> Cc: James Ketrenos <jketreno@linux.intel.com> Cc: Jeff Garzik <jgarzik@pobox.com> Cc: "John W. Linville" <linville@tuxdriver.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [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>
* [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>
* [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 '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>
OpenPOWER on IntegriCloud