summaryrefslogtreecommitdiffstats
path: root/drivers/net (follow)
Commit message (Collapse)AuthorAgeFilesLines
* [PATCH] e1000 disable device on PCI errorLinas Vepstas2006-09-191-0/+1
| | | | | | | | | | | | | | | | | | A recent patch in -mm3 titled "gregkh-pci-pci-don-t-enable-device-if-already-enabled.patch" causes pci_enable_device() to be a no-op if the kernel thinks that the device is already enabled. This change breaks the PCI error recovery mechanism in the e1000 device driver, since, after PCI slot reset, the card is no longer enabled. This is a trivial fix for this problem. Tested. Signed-off-by: Linas Vepstas <linas@austin.ibm.com> Cc: John Ronciak <john.ronciak@intel.com> Cc: Jesse Brandeburg <jesse.brandeburg@intel.com> Cc: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Acked-by: Auke Kok <auke-jan.h.kok@intel.com> Cc: Jeff Garzik <jeff@garzik.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
* drivers/net/phy/fixed: #if 0 some incomplete codeJeff Garzik2006-09-131-0/+4
| | | | Signed-off-by: Jeff Garzik <jeff@garzik.org>
* drivers/net: const-ify ethtool_ops declarationsJeff Garzik2006-09-13106-178/+163
| | | | Signed-off-by: Jeff Garzik <jeff@garzik.org>
* [PATCH] sky2: big endianStephen Hemminger2006-09-132-37/+25
| | | | | | | | Fix support for big endian platforms like PPC. Still not sure about VLAN acceleration (does it need swapping)? Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
* [PATCH] sky2: fiber supportStephen Hemminger2006-09-132-33/+63
| | | | | | | | Fix the support for fiber connected gigabit boards. Allow half duplex gigabit to be configured. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
* [PATCH] sky2: tx pause bug fixStephen Hemminger2006-09-132-82/+43
| | | | | | | | | | | | | | Fix problems with transmit pause frames. The driver was telling the GMAC to flush (not process) pause frames. Manually disabling pause wasn't working because of problems in the setup. This maybe the cause of the lockup under load. http://bugzilla.kernel.org/show_bug.cgi?id=6839 Patch against netdev-2.6 git tree Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
* drivers/net: Trim trailing whitespaceJeff Garzik2006-09-13178-22399/+22399
| | | | Signed-off-by: Jeff Garzik <jeff@garzik.org>
* [PATCH] ehea: IBM eHEA Ethernet Device DriverJan-Bernd Themann2006-09-1312-0/+5849
| | | | | | | | | | | | | | | | | | | | | | | | | | Hi Jeff, I fixed the __iomem issue and tested the driver with sparse. Looks good so far. Thanks for your effort. Jan-Bernd Themann Signed-off-by: Jan-Bernd Themann <themann@de.ibm.com> drivers/net/Kconfig | 9 drivers/net/Makefile | 1 drivers/net/ehea/Makefile | 6 drivers/net/ehea/ehea.h | 447 ++++++ drivers/net/ehea/ehea_ethtool.c | 294 ++++ drivers/net/ehea/ehea_hcall.h | 51 drivers/net/ehea/ehea_hw.h | 287 ++++ drivers/net/ehea/ehea_main.c | 2654 ++++++++++++++++++++++++++++++++++++++++ drivers/net/ehea/ehea_phyp.c | 705 ++++++++++ drivers/net/ehea/ehea_phyp.h | 455 ++++++ drivers/net/ehea/ehea_qmr.c | 582 ++++++++ drivers/net/ehea/ehea_qmr.h | 358 +++++ 12 files changed, 5849 insertions(+) Signed-off-by: Jeff Garzik <jeff@garzik.org>
* [PATCH] pcnet32: NAPI implementationDon Fry2006-09-132-28/+121
| | | | | | | | | | | | | | | | | | | | | | Implement NAPI changes to pcnet32 driver. Compile default is off. Listed as experimental. Len and Don both worked on a NAPI implementation and have both tested these changes. An e1000 blasting short packets to the pcnet32 will lockup Don's system until the receive storm stops. Without NAPI Len's system watchdog would expire causing the system to reboot. With NAPI the system will stay operational. Tested ia32 and ppc64. Tested '970A, '971, '972, '973, '975, '976, and '978. The Kconfig changes came from Len. Don is to blame for all the others. Signed-off-by: Len Sorensen <lsorense@csclub.uwaterloo.ca> Signed-off-by: Don Fry <brazilnut@us.ibm.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
* [PATCH] pcnet32: break receive routine into two pieces.Don Fry2006-09-131-161/+141
| | | | | | | | | Breaking the receive frame processing into two routines for greater clarity. Tested ia32 and ppc64. Signed-off-by: Don Fry <brazilnut@us.ibm.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
* [PATCH] pcnet32: move/create receive and transmit routinesDon Fry2006-09-131-256/+259
| | | | | | | | | Move the receive routine and create the transmit routine. Tested ia32 and ppc64. Signed-off-by: Don Fry <brazilnut@us.ibm.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
* [PATCH] pcnet32: magic number cleanupDon Fry2006-09-131-30/+30
| | | | | | | | | Change some magic numbers to clearer names. A few whitespace changes. Tested ia32 and ppc64. Signed-off-by: Don Fry <brazilnut@us.ibm.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
* [PATCH] pcnet32: remove unnecessary save/restore register accesses.Don Fry2006-09-131-6/+1
| | | | | | | | | Delete unnecessary save/restore of rap in interrupt handler and statistics. tested ia32 and ppc64. Signed-off-by: Don Fry <brazilnut@us.ibm.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
* Merge branch 'upstream-fixes' into upstreamJeff Garzik2006-09-131-0/+2
|\
| * [PATCH] mv643xx_eth: Unmap DMA buffers in receive pathDale Farnsworth2006-09-131-0/+2
| | | | | | | | | | | | | | | | | | Fix a missing call to dma_unmap_single() in the receive path. Without this call, errors have been observed on non-cache-coherent systems. Signed-off-by Dale Farnsworth <dale@farnsworth.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
* | [PATCH] e1000: revert 'e1000: Remove 0x1000 as supported device'Auke-Jan H Kok2006-09-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | The commit 'e1000: Remove 0x1000 as supported device' (Jeff Kirsher, 673a052fde79ab5e9dce569b0336358812ddba2d) Removes PIC device ID 8086:1000 from the list of supported devices. A fix was submitted for the original issue (commit 6a9516989f94df10d9a27ba543c6b53b3e69c84a). This commit reverts commit 673a052fde79ab5e9dce569b0336358812ddba2d and re-enables 82542rev3 chips completely. Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
* | Merge tag 'r8169-20060912-00' of ↵Jeff Garzik2006-09-131-276/+380
|\ \ | | | | | | | | | git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6 into tmp
| * | r8169: quirk for the 8110sb on arm platformFrancois Romieu2006-09-111-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Inverting the write ordering of the TxDescAddr{High/Low} registers suffices to trigger a sabbat of PCI errors which make the device completely dysfunctional. The issue has not been reported on a different platform. Switching from MMIO accesses to I/O ones as done in Realtek's own driver fixes (papers over ?) the bug as well but I am not thrilled to see everyone pay the I/O price for an obscure bug. This is the minimal change to handle the issue. Signed-off-by: Francois Romieu <romieu@fr.zoreil.com> Reported-by: Lennert Buytenhek <buytenh@wantstofly.org>
| * | r8169: the 0x8136 needs a 8 bytes alignmentFrancois Romieu2006-08-311-1/+1
| | | | | | | | | | | | | | | | | | Reported by Darren Salt. Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
| * | r8169: add basic MII ioctl supportFrancois Romieu2006-08-311-0/+28
| | | | | | | | | | | | Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
| * | r8169: use standard #defines from mii.h instead of declaring private onesFrancois Romieu2006-08-311-62/+31
| | | | | | | | | | | | | | | | | | Some unused stuff goes away btw. Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
| * | r8169: trim trailing whitespaces and convert whitespaces to tabsFrancois Romieu2006-08-311-33/+32
| | | | | | | | | | | | Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
| * | r8169: udelay() removalFrancois Romieu2006-08-311-5/+7
| | | | | | | | | | | | | | | | | | | | | No need to chew CPU cycles as there is no heavy timing requirement and the delays are always requested from a sleepable context. Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
| * | r8169: use NETDEV_TX_{BUSY/OK}Francois Romieu2006-08-311-2/+2
| | | | | | | | | | | | Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
| * | r8169: sync with vendor's driverFrancois Romieu2006-07-261-74/+144
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - add several PCI ID for the PCI-E adapters ; - new identification strings ; - the RTL_GIGA_MAC_VER_ defines have been renamed to closely match the out-of-tree driver. It makes the comparison less hairy ; - various magic ; - the PCI region for the device with PCI ID 0x8136 is guessed. Explanation: the in-kernel Linux driver is written to allow MM register accesses and avoid the IO tax. The relevant BAR register was found at base address 1 for the plain-old PCI 8169. User reported lspci show that it is found at base address 2 for the new Gigabit PCI-E 816{8/9}. Typically: 01:00.0 Ethernet controller: Realtek Semiconductor Co., Ltd.: Unknown device 8168 (rev 01) Subsystem: Unknown device 1631:e015 Control: I/O+ Mem+ BusMaster+ SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR- FastB2B- Status: Cap+ 66Mhz- UDF- FastB2B- ParErr- DEVSEL=fast >TAbort- <TAbort- <MAbort- >SERR- <PERR- Latency: 0, cache line size 20 Interrupt: pin A routed to IRQ 16 Region 0: I/O ports at b800 [size=256] Region 2: Memory at ff7ff000 (64-bit, non-prefetchable) [size=4K] ^^^^^^^^ So far I have not received any lspci report for the 0x8136 and Realtek's driver do not help: be it under BSD or Linux, their r1000 driver include a USE_IO_SPACE #define but the bar address is always hardcoded to 1 in the MM case. :o/ - the 8168 has been reported to require an extra alignment for its receive buffers. The status of the 8167 and 8136 is not known in this regard. Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
| * | r8169: remove rtl8169_init_boardFrancois Romieu2006-07-261-105/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | Rationale: - its signature is not exactly pretty; - it has no knowledge of pci_device_id; - kiss 23 lines good bye. Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
| * | r8169: hardware flow controlFrancois Romieu2006-07-261-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | The datasheet suggests that the device handles the hardware flow control almost automagically. User report a different story, so let's try to twiddle the mii registers. Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
| * | r8169: RX fifo overflow recoveryFrancois Romieu2006-07-261-4/+9
| | | | | | | | | | | | Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
| * | r8169: mac address change supportFrancois Romieu2006-07-261-0/+38
| | | | | | | | | | | | | | | | | | | | | Fix for http://bugzilla.kernel.org/show_bug.cgi?id=6032. Cc: Tim Mattox <tmattox@gmail.com> Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
* | | Merge tag '8139cp-20060912-00' of ↵Jeff Garzik2006-09-131-63/+51
|\ \ \ | | | | | | | | | | | | git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6 into tmp
| * | | 8139cp: ring_info removal for the transmit pathFrancois Romieu2006-09-121-19/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As long as the descriptor fits on a single cacheline, the change should be almost free. Now ring_info is not used at all. Remove it. Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
| * | | 8139cp: use PCI_DEVICE() to shorten the PCI device tableFrancois Romieu2006-08-311-4/+2
| | | | | | | | | | | | | | | | Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
| * | | 8139cp: pci_get_drvdata(pdev) can not be NULL in suspend handlerFrançois Romieu2006-08-311-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1) pci_set_drvdata() is used in cp_{init/remove}_one to initialize/reset driver_data to the relevant value (resp. net_device * and NULL). 2) each of the 3 relevant functions is issued under (device *)->sem: 2.1) pci_unregister_driver -> driver_unregister -> bus_remove_driver -> driver_detach (takes (device *)->sem) -> __device_release_driver(dev) -> dev->bus-remove(dev) (== pci_device_remove) -> drv->remove(pdev) (== cp_remove_one) [...] pci_dev->driver = NULL; 2.2) pci_register_driver -> __pci_register_driver -> driver_register -> bus_add_driver -> driver_attach -> __driver_attach (takes (device *)->sem) -> driver_probe_device(drv, dev) -> dev->bus->probe(dev) (== pci_device_probe) -> _pci_device_probe(drv, pci_dev) -> pci_call_probe(drv, pci_dev, id) -> drv->probe(dev, id) (== cp_init_one) [...] pci_dev->driver = drv; 2.3) suspend_device (takes (device *)->sem) -> dev->bus->suspend(dev) (== pci_device_suspend) checking for drv = pci_dev->driver != NULL [...] -> drv->suspend(pci_dev, state) (== cp_suspend) dev->sem and the state of pci_dev->driver provide the expected result. St Mary's day was a bit rainy here. Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
| * | | 8139cp: removal of useless BUG_ON() checkFrancois Romieu2006-08-311-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | netdev_priv() will provide a nice oops a few lines before the BUG_ON() check. Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
| * | | 8139cp: sync the device private data with its r8169 counterpartFrancois Romieu2006-08-311-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | struct cp_private is reorganized to be more easily compared between the r8169 and the 8139cp drivers. The alignment should not be impacted. Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
| * | | 8139cp: ring_info removal for the receive pathFrancois Romieu2006-08-311-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The ring_info.len field is not used at all. cp_private.rx_skb is turned into an array of sk_buff *. Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
| * | | 8139cp: remove gratuitous indirectionFrancois Romieu2006-08-311-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | dev is an argument of the current function. Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
| * | | 8139cp: trim ring_infoFrancois Romieu2006-08-311-17/+16
| | | | | | | | | | | | | | | | | | | | | | | | Fat removal: the mapping address is available from the Rx/Tx descriptors. Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
* | | | Merge branch 'upstream-fixes' into upstreamJeff Garzik2006-09-121-4/+4
|\ \ \ \ | | |_|/ | |/| |
| * | | [PATCH] e1000: fix TX timout hang regression for 82542rev3Auke Kok2006-09-121-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 581d708eb47cccb5f41bc0817e50c9b004011ba8 (oct. 5 2005) introduced partial Multiqueue support for e1000 which broke macro smartness in setting up head/tail registers for 82542 rev3 chipsets, making these adapters completely non-working since 2.6.15. This commit sets the proper head and tail registers for read and write descriptor rings. Ths fix was tested on an 82542 rev3 NIC and newer NICs. Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
* | | | Merge branch 'tmp' into upstreamJeff Garzik2006-09-1232-102/+38
|\ \ \ \
| * | | | [PATCH] Remove more unnecessary driver printk'sAndy Gospodarek2006-09-1232-102/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As I promised last week, here is the first pass at removing all unnecessary printk's that exist in network device drivers currently in promiscuous mode. The duplicate messages are not needed so they have been removed. Some of these drivers are quite old and might not need an update, but I did them all anyway. I am currently auditing the remaining conditional printk's and will send out a patch for those soon. Signed-off-by: Andy Gospodarek <andy@greyhouse.net> Signed-off-by: Jeff Garzik <jeff@garzik.org>
* | | | | Merge branch 'upstream' of ↵Jeff Garzik2006-09-1211-48/+169
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream
| * | | | | [PATCH] hostap_cs: added support for Proxim Harmony PCI W-Lan cardChristian Steineck2006-09-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hostap_cs driver - added support for Proxim Harmony PCI W-Lan Card (uses pd6729 based pcmcia2pci bridge) Signed-off-by: Christian Steineck <memphis@machzwo.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * | | | | [PATCH] bcm43xx: remove dead code in bcm43xx_sysfs.cLarry Finger2006-09-121-9/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Coverity CID 1160 & 1161 Remove some dead code from bcm43xx_sysfs.c in 2.6.18-rc6 Signed-off-by: Darren Jenkins <darrenrjenkins@gmail.com> Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * | | | | [PATCH] bcm43xx: ucode debug status via sysfsLarry Finger2006-09-122-4/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch prints out the ucode debug status to sysfs. So, users can watch the microcode status of their hardware. Signed-off-by: Martin Langer <martin-langer@gmx.de> Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * | | | | [PATCH] bcm43xx: Add firmware version printoutLarry Finger2006-09-122-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch prints microcode revision, patchlevel, date and time to KERN_INFO. Also, version 4.xx microcodes (rev>0x128) will be rejected by the driver, because they still do not work. Signed-off-by: Martin Langer <martin-langer@gmx.de> Acked-by: Michael Buesch <mb@bu3sch.de> Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * | | | | [PATCH] bcm43xx: remove dead statistics codeLarry Finger2006-09-121-11/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch removes code that was make obsolete when the wireless statistics in bcm43xx-softmac were changed, but was overlooked at that time. The value of bcm->stats.link_quality computed here is never used. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * | | | | [PATCH] Prism54 : add bitrates to scan resultJean Tourrilhes2006-09-121-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds bitrate information to the scan result in the Prism54 driver, like some/most other driver do. Signed-off-by: Jean Tourrilhes <jt@hpl.hp.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * | | | | [PATCH] zd1211rw: Removed unneeded packed attributesUlrich Kunitz2006-09-124-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Inspired by an e-mail by Stephen Hemminger I decided to remove all unneeded packed attributes from the code where the member variables are already aligned. This avoids horrible code being generated on some architectures. Signed-off-by: Ulrich Kunitz <kune@deine-taler.de> Signed-off-by: Daniel Drake <dsd@gentoo.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>