aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAge
* Merge branch 'upstream-linus' of ↵Linus Torvalds2007-02-07
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (116 commits) sk98lin: planned removal AT91: MACB support sky2: version 1.12 sky2: add new chip ids sky2: Yukon Extreme support sky2: safer transmit timeout sky2: TSO support for EC_U sky2: use dev_err for error reports sky2: add Wake On Lan support fix unaligned exception in /drivers/net/wireless/orinoco.c Remove unused kernel config option DLCI_COUNT z85230: spinlock logic mips: declance: Driver model for the PMAD-A Spidernet: Rework RX linked list NET: turn local_save_flags() + local_irq_disable() into local_irq_save() NET-3c59x: turn local_save_flags() + local_irq_disable() into local_irq_save() hp100: convert pci_module_init() to pci_register_driver() NetXen: Added ethtool support for user level tools. NetXen: Firmware crb init changes. maintainers: add atl1 maintainers ...
| * sk98lin: planned removalStephen Hemminger2007-02-07
| | | | | | | | | | | | | | Document planned removal of sk98lin driver. Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * AT91: MACB supportAndrew Victor2007-02-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The Atmel MACB Ethernet peripheral is also integrated in the AT91SAM9260 and AT91SAM9263 processors. The differences from the AVR32 version are: * Single peripheral clock. * MII/RMII selection bit is inverted. * Clock enable bit. Original patch from Patrice Vilchez. Signed-off-by: Andrew Victor <andrew@sanpeople.com> Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * sky2: version 1.12Stephen Hemminger2007-02-07
| | | | | | | | | | | | | | Updated version for WOL and new id's Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * sky2: add new chip idsStephen Hemminger2007-02-07
| | | | | | | | | | | | | | More new chip id's from vendor driver version 10.0.4.3 Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * sky2: Yukon Extreme supportStephen Hemminger2007-02-07
| | | | | | | | | | | | | | | | | | | | This is basic support for the new Yukon Extreme chip, extracted from the new vendor driver 10.0.4.3. Since this is untested hardware, it has a big fat warning for now. Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * sky2: safer transmit timeoutStephen Hemminger2007-02-07
| | | | | | | | | | | | | | | | Rather than trying to be "smart" about possible transmit timeout causes. Just clear all pending frames and reset the PHY. Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * sky2: TSO support for EC_UStephen Hemminger2007-02-07
| | | | | | | | | | | | | | | | The Yukon EC_U chipset apparently supports TSO but only for non-Jumbo frame sizes because it lacks a Ram buffer. Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * sky2: use dev_err for error reportsStephen Hemminger2007-02-07
| | | | | | | | | | | | | | | | | | Use the standard dev_xxx functions instead of printk directly for error reports. Fix a bug where the initialization would return 0 if allocation of network device failed. Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * sky2: add Wake On Lan supportStephen Hemminger2007-02-07
| | | | | | | | | | | | | | | | Adds basic magic packet wake on lan support to the sky2 driver. Note: initial WOL value is based on BIOS settings. Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * fix unaligned exception in /drivers/net/wireless/orinoco.cHennerich, Michael2007-02-07
| | | | | | | | | | | | | | | | | | | | | | Prevent an unaligned exception to occur. (GCC 4.1) tmp is defined as char pointer while it is later accessed as short. Cc: Jean Tourrilhes <jt@hpl.hp.com> Cc: John W. Linville <linville@tuxdriver.com> Cc: Jeff Garzik <jeff@garzik.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * Remove unused kernel config option DLCI_COUNTRobert P. J. Day2007-02-07
| | | | | | | | | | | | | | | | | | | | | | Remove the unused kernel config option DLCI_COUNT. Signed-off-by: Robert P. J. Day <rpjday@mindspring.com> Cc: "David S. Miller" <davem@davemloft.net> Cc: Jeff Garzik <jeff@garzik.org> Cc: Krzysztof Halasa {khc@pm.waw.pl> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * z85230: spinlock logicAlan Cox2007-02-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At some point someone added a spin_lock(&dev->lock) to the IRQ handler for the Z85230 driver. This actually correctly fixes a bug but the necessary changes to remove the chan->lock calls in the event handlers were not made (c->lock is the same lock). Simona Dascenzo reported the problem with the driver and this patch should fix the problem he found. Cc: "David S. Miller" <davem@davemloft.net> Cc: Jeff Garzik <jeff@garzik.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * mips: declance: Driver model for the PMAD-AMaciej W. Rozycki2007-02-07
| | | | | | | | | | | | | | | | | | | | This is a set of changes that converts the PMAD-A support to the driver model. Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org> Cc: Ralf Baechle <ralf@linux-mips.org> Cc: Jeff Garzik <jeff@garzik.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * Spidernet: Rework RX linked listLinas Vepstas2007-02-07
| | | | | | | | | | | | | | | | | | | | | | Make the hardware perceive the RX descriptor ring as a null-terminated linked list, instead of a circular ring. Signed-off-by: Linas Vepstas <linas@austin.ibm.com> Cc: James K Lewis <jklewis@us.ibm.com> Cc: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * NET: turn local_save_flags() + local_irq_disable() into local_irq_save()Jiri Kosina2007-02-06
| | | | | | | | | | | | | | | | | | drivers/net/amd8111e.c::amd8111e_poll() contains local_irq_disable() after local_save_flags(). Turn it into local_irq_save(). Signed-off-by: Jiri Kosina <jkosina@suse.cz> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * NET-3c59x: turn local_save_flags() + local_irq_disable() into local_irq_save()Jiri Kosina2007-02-06
| | | | | | | | | | | | | | | | | | drivers/net/3c59x.c::poll_vortex() contains local_irq_disable() after local_save_flags(). Turn it into local_irq_save(). Signed-off-by: Jiri Kosina <jkosina@suse.cz> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * hp100: convert pci_module_init() to pci_register_driver()Richard Knutsson2007-02-06
| | | | | | | | | | | | | | | | | | Convert pci_module_init() to pci_register_driver(). Signed-off-by: Richard Knutsson <ricknu-0@student.ltu.se> Cc: Jeff Garzik <jeff@garzik.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * NetXen: Added ethtool support for user level tools.Amit S. Kale2007-02-06
| | | | | | | | | | | | | | NetXen: Added ethtool support for user level firmware management utilities. Signed-off-by: Amit S. Kale <amitkale@netxen.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * NetXen: Firmware crb init changes.Amit S. Kale2007-02-06
| | | | | | | | | | | | | | NetXen: firmware crb init changes. Signed-off-by: Amit S. Kale <amitkale@netxen.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * maintainers: add atl1 maintainersJay Cliburn2007-02-06
| | | | | | | | | | | | | | | | | | MAINTAINERS: add atl1 maintainers Add a maintainers entry for atl1. Signed-off-by: Jay Cliburn <jacliburn@bellsouth.net> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * skge: version 1.10Stephen Hemminger2007-02-06
| | | | | | | | | | | | | | Mark this as 1.10 because WOL now works Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * skge: WOL supportStephen Hemminger2007-02-06
| | | | | | | | | | | | | | Add WOL support for Yukon chipsets in skge device. Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * skge: use dev_printkStephen Hemminger2007-02-06
| | | | | | | | | | | | | | Use dev_printk related macros for PCI related errors and warnings Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * skge: handle zero address at openStephen Hemminger2007-02-06
| | | | | | | | | | | | | | | | | | | | Some motherboards are broken and have no address set. Failing at probe time prevents the device from ever being used (like to download a fixed BIOS). Instead warn on probe and check again when device is brought up. That way the address can be set. Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * b44 endian annotationsAl Viro2007-02-06
| | | | | | | | | | Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * PA Semi PWRficient Ethernet driverOlof Johansson2007-02-05
| | | | | | | | | | | | | | | | | | | | Driver for the PA Semi PWRficient on-chip Ethernet (1/10G) Basic enablement, will be complemented with performance enhancements over time. PHY support will be added as well. Signed-off-by: Olof Johansson <olof@lixom.net> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * s2io: De-typedef driver.Ralf Baechle2007-02-05
| | | | | | | | | | | | | | Removed namespace collisions due to usage of nic_t as per Ralf's patch Signed-off-by: Sivakumar Subramani <sivakumar.subramani@neterion.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * s2io: Removed enabling of some of the unused interrupts.Sivakumar Subramani2007-02-05
| | | | | | | | | | | | | | | | Removed unused code in en_dis_able_nic_intrs(), TX_DMA_INTR, RX_DMA_INTR, TX_XGXS_INTR, MC_INTR Signed-off-by: Sivakumar Subramani <sivakumar.subramani@neterion.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * s2io: Fixes in updating skb->truesize and code cleanup.Sivakumar Subramani2007-02-05
| | | | | | | | | | | | | | | | | | | | | | 1. Fix for updating skb->truesize properly. 2. Disable NAPI only if more than one ring configured in case of MSI/MSI-X interrupts. Previously we were disabling NAPI irrespective of number of rings when MSI/MSI-X interrupts were used. 3. Code cleanup. Signed-off-by: Sivakumar Subramani <sivakumar.subramani@neterion.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * S2IO: Fixes for reset and link handling.Sivakumar Subramani2007-02-05
| | | | | | | | | | | | | | | | | | | | 1. Fix for reset and link handling. 2. Allow for promiscuos mode and multicast state be maintained through ifconfig up and down. 3. Support to print adapter serial number. Signed-off-by: Sivakumar Subramani <sivakumar.subramani@neterion.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * s2io: Making LRO and UFO as module loadable parameter.Sivakumar Subramani2007-02-05
| | | | | | | | | | | | | | | | | | | | This patch adds two load parameters napi and ufo. Previously NAPI was compilation option with these changes wan enable disable NAPI using load parameter. Also we are introducing ufo load parameter to enable/disable ufo feature Signed-off-by: Sivakumar Subramani <sivakumar.subramani@neterion.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * PC300too alternative WAN driverKrzysztof Halasa2007-02-05
| | | | | | | | | | | | | | | | The attached patch adds an alternative driver "pc300too" for PCI WAN cards PC300/RSV and PC300/X21 made by Cyclades Corp. (now Avocent Corp). Signed-off-by: Krzysztof Halasa <khc@pm.waw.pl> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * cxgb3 - Add dual licensingDivy Le Ray2007-02-05
| | | | | | | | | | | | | | Dual licensing, needed for OFED 1.2 Signed-off-by: Divy Le Ray <divy@chelsio.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * cxgb3 - Add <linux/mutex.h>Divy Le Ray2007-02-05
| | | | | | | | | | | | | | Include <linux/mutex.h> in adapter.h Signed-off-by: Divy Le Ray <divy@chelsio.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * cxgb3 - Remove BUG_ON from t3b_intr_napiDivy Le Ray2007-02-05
| | | | | | | | | | | | | | | | | | | | In some cases, SG_DATA_INTR won't clear on read and the following interrupt may cause us to assert because NAPI is already scheduled. Remove the assertion, NAPI can handle attempts to rearm it while it's already scheduled. Signed-off-by: Divy Le Ray <divy@chelsio.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * cxgb3 - white space to tabsDivy Le Ray2007-02-05
| | | | | | | | | | | | | | Use tabs in comments. Signed-off-by: Divy Le Ray <divy@chelsio.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * cxgb3 - Clean up HW init routineDivy Le Ray2007-02-05
| | | | | | | | | | | | | | Clean up the tp_config() routine. Signed-off-by: Divy Le Ray <divy@chelsio.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * cxgb3 - bogus status error stringDivy Le Ray2007-02-05
| | | | | | | | | | | | | | | | Remove a status error string from the pci-x context and add it where it belongs - the pci-e context. Signed-off-by: Divy Le Ray <divy@chelsio.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * cxgb3 - remove SW Tx credits coalescingDivy Le Ray2007-02-05
| | | | | | | | | | | | | | | | Remove tx credit coalescing done in SW. The HW is caring care of it already. Signed-off-by: Divy Le Ray <divy@chelsio.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * cxgb3 - bind qsets on multiport adapterDivy Le Ray2007-02-05
| | | | | | | | | | | | | | Inform FW about the queue set->interface mapping. Signed-off-by: Divy Le Ray <divy@chelsio.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * cxgb3 - FW versioningDivy Le Ray2007-02-05
| | | | | | | | | | | | | | | | Clean up FW version checking. The supported FW version is now 3.1. Signed-off-by: Divy Le Ray <divy@chelsio.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * git-netdev-all: chelsio fixAndrew Morton2007-02-05
| | | | | | | | | | | | | | Cc: "Sunil Naidu" <akula2.shark@gmail.com> Cc: Jeff Garzik <jeff@garzik.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * remove one remaining "#define BCM_TSO 1"Adrian Bunk2007-02-05
| | | | | | | | | | | | | | | | | | Since it's no longer used, this "#define BCM_TSO 1" can now be removed. Signed-off-by: Adrian Bunk <bunk@stusta.de> Cc: Jeff Garzik <jeff@garzik.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * UCC Ether driver: kmalloc casting cleanupsAhmed S. Darwish2007-02-05
| | | | | | | | | | | | | | | | | | A kmalloc casting cleanup patch. Signed-off-by: Ahmed Darwish <darwish.07@gmail.com> Cc: Jeff Garzik <jeff@garzik.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * sky2: handle network device allocation failureshemminger@linux-foundation.org2007-02-05
| | | | | | | | | | | | | | | | If alloc_etherdev() failed, then sky2_init_netdev will return NULL, and sky2_probe would end up returning 0 instead of -ENOMEM. Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * sky2: software rx/tx statsshemminger@linux-foundation.org2007-02-05
| | | | | | | | | | | | | | | | | | | | Maintain packet statistics in software rather than hardware. This is slightly slower, but allows easier debugging of problems where packets are still being received by PHY but not being handled by hardware. Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * sky2: version 1.11.1shemminger@linux-foundation.org2007-02-05
| | | | | | | | | | | | | | Version update to 1.11.1. Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * PEGASUS: Fix typo in Corega products.YOSHIFUJI Hideaki / 吉藤英明2007-02-05
| | | | | | | | | | | | | | s/FEter/FEther/. Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * ASIX: Add IO-DATA ETG-US2 Support.YOSHIFUJI Hideaki / 吉藤英明2007-02-05
| | | | | | | | | | Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-24 03:07:32 -0500