aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
Commit message (Collapse)AuthorAgeFilesLines
* Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6Linus Torvalds2005-06-282-14/+6
|\
| * Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6Greg KH2005-06-2756-2459/+3231
| |\
| * | [PATCH] PCI: make drivers use the pci shutdown callback instead of the ↵Greg Kroah-Hartman2005-06-272-14/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | driver core callback. Now we can change the pci core to always set this pointer, as pci drivers should use it, not the driver core callback. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* | | Merge /spare/repo/linux-2.6/Jeff Garzik2005-06-2817-2/+478
|\ \ \ | | |/ | |/|
| * | [PATCH] pcmcia: more IDs for TDK multifunction cardsJun Komuro2005-06-271-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new pcmcia id_table for fmvj18x_cs and serial_cs. (TDK multi-function card (NetPartner9610 and MobileNetworker3200)) Signed-off-by: Jun Komuro <komurojun-mbn@nifty.com> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] pcmcia: id_table for wl3501_cs.cDominik Brodowski2005-06-271-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | Add pcmcia_device_id table. Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] pcmcia: id_table for com20020_cs.cDominik Brodowski2005-06-271-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | Add pcmcia_device_id table. Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] pcmcia: id_table for atmel_cs.cDominik Brodowski2005-06-271-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | Add pcmcia_device_id table. Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] pcmcia: add a few more IDs for pcnet_csJun Komuro2005-06-271-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new pcmcia id_table for pcnet_cs. (Allied, Laneed, NextCom and Telecom Device) Signed-off-by: Jun Komuro <komurojun-mbn@nifty.com> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] pcmcia: id_table for pcnet_cs.cDominik Brodowski2005-06-271-0/+198
| | | | | | | | | | | | | | | | | | | | | | | | Add pcmcia_device_id table. Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] pcmcia: id_table for xirc2ps_cs.cDominik Brodowski2005-06-271-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | Add pcmcia_device_id table. Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] pcmcia: id_table for orinoco_csDominik Brodowski2005-06-271-0/+51
| | | | | | | | | | | | | | | | | | | | | | | | Add pcmcia_device_id table. Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] pcmcia: id_table for smc91c92_cs.cDominik Brodowski2005-06-271-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | Add pcmcia_device_id table. Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] pcmcia: id_table for wavelan_csDominik Brodowski2005-06-271-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | Add pcmcia_device_id table. Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] pcmcia: id_table for ray_csDominik Brodowski2005-06-271-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | Add pcmcia_device_id table. Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] pcmcia: id_table for nmclan_csDominik Brodowski2005-06-271-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | Add pcmcia_device_id table. Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] pcmcia: id_table for netwave_csDominik Brodowski2005-06-271-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | Add pcmcia_device_id table. Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] pcmcia: id_table for ibmtr_csDominik Brodowski2005-06-271-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | Add pcmcia_device_id table. Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] pcmcia: id_table for fmvj18x_csDominik Brodowski2005-06-271-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | Add pcmcia_device_id table. Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] pcmcia: id_table for axnet_csDominik Brodowski2005-06-271-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | Add pcmcia_device_id table. Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] pcmcia: id_table for airo_csDominik Brodowski2005-06-271-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | Add pcmcia_device_id table. Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] pcmcia: id_table for 3c589_csDominik Brodowski2005-06-271-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | Add pcmcia_device_id table. Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] pcmcia: id_table for 3c574_csDominik Brodowski2005-06-271-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | Add pcmcia_device_id table. Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | drivers/net/at1700: remove incorrect commentKomuro2005-06-271-4/+0
| | | | | | | | | | | | | | | | | | | | | "Allied Telesis RE1000 Plus" is not supported at all by kernel 2.6.12. Signed-off-by: komurojun-mbn@nifty.com
* | | [PATCH] Use pci_set_dma_mask() instead of direct assignment of DMA maskTobias Klauser2005-06-271-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The amd8111e driver directly assigns the DMA mask to the dma_mask member of the struct pci_dev instead of using pci_set_dma_mask(). This makes the call to pci_dma_supported() redundant as pci_set_dma_mask() does this check. I do not own this device so I only compile-tested this patch. Signed-off-by: Tobias Klauser <tklauser@nuerscht.ch>
* | | [PATCH] smc91x needs settable IRQ trigger typeDavid Brownell2005-06-272-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | For boards that invert the SMC91x IRQ line (maybe an FPGA inverts it), the set_irq_type() call can't assume IRQT_RISING. These particular boards currently use OMAP-specific calls to change the trigger type, but the boards break when set_irq_type() stops being a NOP. Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
* | | Merge /spare/repo/linux-2.6/Jeff Garzik2005-06-2739-2457/+2753
|\ \ \ | |/ /
| * | [PATCH] b44: check link state during openJohn W. Linville2005-06-271-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Check the link state during b44_open. This closes a 1 HZ window that existed after b44_open ran but before the b44_timer handler ran, during which ethtool would report "Link detected: yes" no matter what the link state actually was. Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * | [PATCH] fix tulip suspend/resume #2Adam Belay2005-06-271-12/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | This patch allows the tulip driver to suspend and resume properly. It was originally written by Karsten Keil and then modified by Adam Belay. Signed-off-by: Karsten Keil <kkeil@suse.de> Signed-off-by: Adam Belay <abelay@novell.com> Signed-off-by: Andrew Morton <akpm@osdl.org>
| * | [PATCH] uninitialized variable in prism54 isl38xx_trigger_deviceOlaf Hering2005-06-271-2/+4
| | | | | | | | | | | | | | | | | | | | | drivers/net/wireless/prism54/isl_38xx.c:131: warning: 'current_time.tv_sec' is used uninitialized in this function drivers/net/wireless/prism54/isl_38xx.c:131: warning: 'current_time.tv_usec' is used uninitialized in this function Signed-off-by: Olaf Hering <olh@suse.de>
| * | [PATCH] 3c523: needs a licenseRandy Dunlap2005-06-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Module needs a license to prevent kernel tainting. Signed-off-by: Randy Dunlap <rdunlap@xenotime.net> diffstat:= drivers/net/3c523.c | 1 + 1 files changed, 1 insertion(+)
| * | [PATCH] gianfar: Add support enhanced TSEC features on the MPC 8548Kumar Gala2005-06-273-390/+902
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Jeff, Just incase this got lost in the recent netdev mailing list transition here is a nicer version of Andy's patch for gianfar. - kumar * TCP/IP/UDP checksumming and verification * VLAN tag insertion/extraction * Larger multicast hash-table * Padding to align IP headers Also added: * msg lvl support * Some whitespace cleanup Signed-off-by: Andy Fleming <afleming@freescale.com> Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
| * | [PATCH] smc91x: plug race between TX tasklet and driver resetNicolas Pitre2005-06-271-19/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | The race causes a kernel oops when smc_hardware_send_pkt() tries to dereference pending_tx_skb which would have been freed from one of the driver reset paths just after the tx_task tasklet has been scheduled. This race is possible on SMP but was uncovered by the kernel RT work. Signed-off-by: Nicolas Pitre <nico@cam.org>
| * | [PATCH] via-rhine trivial whitespace patchDenis Vlasenko2005-06-271-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | --Boundary-00=_F5lsC5eH1wGW5o9 Content-Type: text/plain; charset="koi8-r" Content-Transfer-Encoding: 7bit Content-Disposition: inline Hi Jeff, In some messages in via-rhine.c there is a leading space for no apparent reason. This patch removes it. -- vda --Boundary-00=_F5lsC5eH1wGW5o9 Content-Type: text/x-diff; charset="koi8-r"; name="via-rhine.c.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="via-rhine.c.diff"
| * | [PATCH] e1000: Driver version, white space, comments & otherMalli Chilakala2005-06-272-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | Driver version, white space, comments & other Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com> Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com> Signed-off-by: John Ronciak <john.ronciak@intel.com>
| * | [PATCH] e1000: Included proposals to false late collisions due to H/W latenciesMalli Chilakala2005-06-272-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | Included proposals to false late collisions due to H/W latencies Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com> Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com> Signed-off-by: John Ronciak <john.ronciak@intel.com>
| * | [PATCH] e1000: Ethtool set speed/duplex validates parameters for consistencyMalli Chilakala2005-06-271-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | Ethtool set speed/duplex validates parameters for consistency Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com> Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com> Signed-off-by: John Ronciak <john.ronciak@intel.com>
| * | [PATCH] e1000: Enable ethtool phys_id feature for 82573 controllersMalli Chilakala2005-06-271-9/+18
| | | | | | | | | | | | | | | | | | | | | | | | Enable ethtool phys_id feature for 82573 controllers Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com> Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com> Signed-off-by: John Ronciak <john.ronciak@intel.com>
| * | [PATCH] e1000: Fixed VLAN tag processing error for big-endian architecturesMalli Chilakala2005-06-271-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | Fixed VLAN tag processing error for big-endian architectures Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com> Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com> Signed-off-by: John Ronciak <john.ronciak@intel.com>
| * | [PATCH] e1000: Ethtool cleanup patch from Stephen HemmingerMalli Chilakala2005-06-271-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ethtool cleanup patch from Stephen Hemminger * use ADVERTISED_xxx fields when setting advertised fields * don't hardcode constant for advertised field Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com> Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com> Signed-off-by: John Ronciak <john.ronciak@intel.com>
| * | [PATCH] e1000: Fixed the loopback test failure for 82573 based adaptersMalli Chilakala2005-06-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fixed the loopback test failure for 82573 based adapters Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com> Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com> Signed-off-by: John Ronciak <john.ronciak@intel.com>
| * | [PATCH] e1000: Fixed register and loopback test failures with 82573 controllersMalli Chilakala2005-06-271-6/+26
| | | | | | | | | | | | | | | | | | | | | | | | Fixed register and loopback test failures with 82573 controllers Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com> Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com> Signed-off-by: John Ronciak <john.ronciak@intel.com>
| * | [PATCH] e1000: Cleanup debug message printed when Tx Unit hang is detectedMalli Chilakala2005-06-272-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Cleanup debug message printed when Tx Unit hang is detected Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com> Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com> Signed-off-by: John Ronciak <john.ronciak@intel.com>
| * | [PATCH] e1000: Use netdev_priv() to get to netdev->privMalli Chilakala2005-06-272-45/+45
| | | | | | | | | | | | | | | | | | | | | | | | Use netdev_priv() to get to netdev->priv - from shemminger@osdl.org Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com> Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com> Signed-off-by: John Ronciak <john.ronciak@intel.com>
| * | [PATCH] e1000: Use correct WOL settings for 82544 adaptersMalli Chilakala2005-06-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Use correct WOL settings for 82544 adapters Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com> Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com> Signed-off-by: John Ronciak <john.ronciak@intel.com>
| * | [PATCH] e1000: Synchronize phy access between stats update and MII_IOCTLMalli Chilakala2005-06-271-10/+26
| | | | | | | | | | | | | | | | | | | | | | | | Synchronize phy access between stats update and MII_IOCTL Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com> Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com> Signed-off-by: John Ronciak <john.ronciak@intel.com>
| * | [PATCH] e100: NAPI performance enhancementsMalli Chilakala2005-06-271-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | NAPI performance enhancements - Fixed issues with shared interrupts and NAPI resulting in bad performance. Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com> Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com> Signed-off-by: John Ronciak <john.ronciak@intel.com>
| * | [PATCH] e100: e100_eeprom_load was called after e100_phy_initMalli Chilakala2005-06-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | e100_eeprom_load was called after e100_phy_init causing phy_init not to use values set in EEPROM - from emann@mrv.com Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com> Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com> Signed-off-by: John Ronciak <john.ronciak@intel.com>
| * | [PATCH] e100: fixed e100 MDI/MDI-X issuesMalli Chilakala2005-06-271-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added patch from Eran Mann to fix following e100 MDI/MDI-X issues * MDI/MDI-X autodetection should never be enabled for 82551ER/QM chips * enabling this feature based on eeprom settings Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com> Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com> Signed-off-by: John Ronciak <john.ronciak@intel.com>
| * | Merge /spare/repo/netdev-2.6/ branch 'orinoco'Jeff Garzik2005-06-272-1010/+1485
| |\ \