GIT da8b275fe0a1f02f9810f92343e77120de206e34 git+ssh://master.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git#ALL commit da8b275fe0a1f02f9810f92343e77120de206e34 Author: Scott Feldman Date: Wed Nov 9 02:18:52 2005 -0500 [netdrvr e100] experiment with doing RX in a similar manner to eepro100 I was going to say that eepro100's speedo_rx_link() does the same DMA abuse as e100, but then I noticed one little detail: eepro100 sets both EL (end of list) and S (suspend) bits in the RFD as it chains it to the RFD list. e100 was only setting the EL bit. Hmmm, that's interesting. That means that if HW reads a RFD with the S-bit set, it'll process that RFD and then suspend the receive unit. The receive unit will resume when SW clears the S-bit. There is no need for SW to restart the receive unit. Which means a lot of the receive unit state tracking code in the driver goes away. So here's a patch against 2.6.14. (Sorry for inlining it; the mailer I'm using now will mess with the word wrap). I can't test this on XScale (unless someone has an e100 module for Gumstix :) . It should be doing exactly what eepro100 does with RFDs. I don't believe this change will introduce a performance hit because the S-bit and EL-bit go hand-in-hand meaning if we're going to suspend because of the S- bit, we're on the last resource anyway, so we'll have to wait for SW to replenish. commit c5c6c7f28a8fa65fc9152a9c18fa0742b5d49371 Author: Jeff Garzik Date: Tue Nov 7 05:12:16 2006 -0500 [netdrvr] netxen: build fixes Most contributed and Signed-off-by: Andrew Morton with some from me as well. Signed-off-by: Jeff Garzik commit 16c8dd379c4847198620dc5240c89bbc382e1578 Author: Jesse Huang Date: Fri Oct 20 14:42:13 2006 -0700 [PATCH] sundance: correct initial and close hardware step. Correct initial and close hardware step. In some embedded system down and up IP100A will cause DMA crash. We add some for safe down and up IP100A. Signed-off-by: Jesse Huang Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit afafdbc4a16c25c3d407c2ff51ee91adbe3d76d1 Author: Andy Fleming Date: Mon Oct 16 16:19:17 2006 -0500 [PATCH] Fixed a number of bugs in the PHY Layer * genphy_update_link is now exported * Added a fix from ncase@xes-inc.com which changes forcing so it only updates the link. Otherwise, it never tries the lower values, since it is always overwriting the speed/duplex values with the current ones, rather than the intended ones. * Fixed a bug where bringing up a PHY with no link caused it to timeout, and enter forcing mode. Once in forcing mode, plugging in the link didn't autonegotiate. Now the AN state detects the lack of link, and enters the NO_LINK state. AN only times out if the link is up and AN fails * Cleaned up the PHY_AN case, reducing one level of indentation for the timeout code. Signed-off-by: Jeff Garzik commit 264bba4a67f127be3b810b55d8467d3da9982be6 Author: Jesse Huang Date: Fri Oct 20 14:42:11 2006 -0700 [PATCH] subdance: fix TX Pause bug (reset_tx, intr_handler) Fix TX Pause bug (reset_tx, intr_handler). When MaxCollisions occurred, need to re-enable Tx. But just after re-enable, MaxCollisions maybe occurred again and with TxStatusOverflow. This will cause driver can't check new MaxCollisions to re-enable Tx again, because TxStatusOverflow. For this reason, after re-enable Tx, we need to make sure Tx was actually enabled. Signed-off-by: Jesse Huang Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit c10b77bbee3958b93150bb5516ff1abe2d1d4d86 Author: Jesse Huang Date: Fri Oct 20 14:42:05 2006 -0700 [PATCH] sundance: remove TxStartThresh and RxEarlyThresh For patent issue need to remove TxStartThresh and RxEarlyThresh. This patent is cut-through patent. If use this function, Tx will start to transmit after few data be move in to Tx FIFO. We are not allow to use those function in DFE530/DFE550/DFE580/DL10050/IP100/IP100A. It will decrease a little performance. Signed-off-by: Jesse Huang Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 0b1ac7acb635ccdf2d8c1740e62e4da26770c953 Author: Komuro Date: Sun Oct 15 10:08:00 2006 +0900 [PATCH] network: pcnet_cs: remove the code to change the E8390_CMD register from ei_watchdog() Remove the code to change the E8390_CMD register from ei_watchdog(). The 8390-page is always 0 outside the spin_lock. Signed-off-by: komurojun-mbn@nifty.com Signed-off-by: Jeff Garzik commit 59724448a4ba7f5d5c5e7dbc58492153bbc9ddc2 Author: Ayaz Abdulla Date: Mon Nov 6 00:43:40 2006 -0800 [PATCH] forcedeth: add support for new mcp67 device Add support for the new mcp67 device into forcedeth. Signed-off-by: Ayaz Abdulla Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 2edaded71ee9a7c2572941a8ecef5575b8c111c7 Author: Ayaz Abdulla Date: Mon Nov 6 00:43:39 2006 -0800 [PATCH] forcedeth: add new NVIDIA pci ids Add pci device ids for the NVIDIA MCP67 chip. Signed-off-by: Ayaz Abdulla Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 81efd7c0c75fe02d5708bd1aa9d7ceae4d5bb55f Author: Ayaz Abdulla Date: Mon Oct 30 17:32:01 2006 -0500 [PATCH] forcedeth: add recoverable error support This patch adds support to recover from a previously fatal MAC error. In the past the MAC would be hung on an internal fatal error. On new chipsets, the MAC has the ability to enter a non-fatal state and allow the driver to re-init it. Signed-Off-By: Ayaz Abdulla Signed-off-by: Jeff Garzik commit 6f56fd294417e76718aec6bc490dfb7f390279d9 Author: Ayaz Abdulla Date: Mon Oct 30 17:31:51 2006 -0500 [PATCH] forcedeth: add mgmt unit support This patch adds support for the mgmt unit in certain chipsets. The MAC and the mgmt unit share the PHY and therefore proper intialization procedures are needed for them to maintain coexistense. Signed-Off-By: Ayaz Abdulla Signed-off-by: Jeff Garzik commit c234a3a5f9deea9769f27dd7133f666fe5e6b2f8 Author: Maciej W. Rozycki Date: Mon Oct 23 13:53:17 2006 +0100 [PATCH] defxx: Big-endian hosts support The PDQ DMA engine requires a different byte-swapping mode for big-endian hosts; also the MAC address which is read from a register through PIO has to be byte-swapped. These changes have been verified with DEFPA-DC (PCI) boards and a Broadcom BCM91250A (MIPS CPU based) host. Signed-off-by: Maciej W. Rozycki Signed-off-by: Jeff Garzik commit 24f014fb3b7d3c43b90349681432592470e0ea3e Author: Eric Sesterhenn Date: Mon Oct 23 22:20:15 2006 +0200 [PATCH] kmemdup() cleanup in drivers/net hi, replace open coded kmemdup() to save some screen space, and allow inlining/not inlining to be triggered by gcc. Signed-off-by: Eric Sesterhenn Signed-off-by: Jeff Garzik commit 17fddc34b36fc26aa8b5f130fe32b446d9d88fa2 Author: Francois Romieu Date: Wed Nov 1 00:53:05 2006 +0100 r8169: perform a PHY reset before any other operation at boot time Realtek's 8139/810x (0x8136) PCI-E comes with a touchy PHY. A big heavy reset seems to calm it down. Fix for http://bugzilla.kernel.org/show_bug.cgi?id=7378. Signed-off-by: Francois Romieu Signed-off-by: Darren Salt commit 2ae87de7c68046cb77e1556ca9dd519010d2050a Author: Auke Kok Date: Wed Nov 1 08:48:18 2006 -0800 e1000: update README for e1000 Signed-off-by: Auke Kok commit 4ed7e9f6be52d6c48617465b423e918227090d17 Author: Auke Kok Date: Wed Nov 1 08:48:15 2006 -0800 e1000: increment version to 7.3.15-k2 Signed-off-by: Auke Kok commit 8454e5c6565c961e0568c6a899cf440234e5df28 Author: Jesse Brandeburg Date: Wed Nov 1 08:48:13 2006 -0800 e1000: add dynamic itr modes Add a new dynamic itr algorithm, with 2 modes, and make it the default operation mode. This greatly reduces latency and increases small packet performance, at the "cost" of some CPU utilization. Bulk traffic throughput is unaffected. The driver can limit the amount of interrupts per second that the adapter will generate for incoming packets. It does this by writing a value to the adapter that is based on the maximum amount of interrupts that the adapter will generate per second. Setting InterruptThrottleRate to a value greater or equal to 100 will program the adapter to send out a maximum of that many interrupts per second, even if more packets have come in. This reduces interrupt load on the system and can lower CPU utilization under heavy load, but will increase latency as packets are not processed as quickly. The default behaviour of the driver previously assumed a static InterruptThrottleRate value of 8000, providing a good fallback value for all traffic types,but lacking in small packet performance and latency. The hardware can handle many more small packets per second however, and for this reason an adaptive interrupt moderation algorithm was implemented. Since 7.3.x, the driver has two adaptive modes (setting 1 or 3) in which it dynamically adjusts the InterruptThrottleRate value based on the traffic that it receives. After determining the type of incoming traffic in the last timeframe, it will adjust the InterruptThrottleRate to an appropriate value for that traffic. The algorithm classifies the incoming traffic every interval into classes. Once the class is determined, the InterruptThrottleRate value is adjusted to suit that traffic type the best. There are three classes defined: "Bulk traffic", for large amounts of packets of normal size; "Low latency", for small amounts of traffic and/or a significant percentage of small packets; and "Lowest latency", for almost completely small packets or minimal traffic. In dynamic conservative mode, the InterruptThrottleRate value is set to 4000 for traffic that falls in class "Bulk traffic". If traffic falls in the "Low latency" or "Lowest latency" class, the InterruptThrottleRate is increased stepwise to 20000. This default mode is suitable for most applications. For situations where low latency is vital such as cluster or grid computing, the algorithm can reduce latency even more when InterruptThrottleRate is set to mode 1. In this mode, which operates the same as mode 3, the InterruptThrottleRate will be increased stepwise to 70000 for traffic in class "Lowest latency". Setting InterruptThrottleRate to 0 turns off any interrupt moderation and may improve small packet latency, but is generally not suitable for bulk throughput traffic. Signed-off-by: Jesse Brandeburg Cc: Rick Jones Signed-off-by: Auke Kok commit bfe750768d115f1512ba48a8e2cebc2c5cb4ef40 Author: Jesse Brandeburg Date: Wed Nov 1 08:48:10 2006 -0800 e1000: add dynamic generic MSI interrupt routine Add a generic MSI interrupt routine that is IO read-free, speeding up MSI interrupt handling. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit 7da64c14727bea0b76f27ce284a4e8224289f24d Author: Auke Kok Date: Wed Nov 1 08:48:07 2006 -0800 e1000: reorder e1000_param.c This file needs some cleanups and reordering - logically order it so that relevant defines and code are together with properly quoted defaults. Signed-off-by: Auke Kok commit b0dd31f1d38c388c1805d7a18d77441cb680f5de Author: Jesse Brandeburg Date: Wed Nov 1 08:48:04 2006 -0800 e1000: Only set IDE for tx when we are using TIDV/TADV Spec fix: don't set IDE unless we are actually setting the tx int delay time. Signed-off-by: Auke Kok Signed-off-by: Jesse Brandeburg commit 64c9f7298bb454535d7a97faff7d578414d74764 Author: Jeff Kirsher Date: Wed Nov 1 08:48:02 2006 -0800 e1000: rename ICH8 flash macros ICH8 will soon be followed by newer chipsets bearing the same acronym, thus we remove the '8' and make it independent of the version number in the platform name. Signed-off-by: Jeff Kirsher Signed-off-by: Auke Kok commit a6b341b983206fe734432ca202dc7bece66284fb Author: Jesse Brandeburg Date: Wed Nov 1 08:47:59 2006 -0800 e1000: add queue restart counter Add a netif_wake/start_queue counter to the ethtool statistics to indicated to the user that their transmit ring could be too small for their workload. Signed-off-by: Jesse brandeburg Cc: Jamal Hadi Signed-off-by: Auke Kok commit 6c4fe249db1a317aa3c03265010b9c73c4b05df1 Author: Auke Kok Date: Wed Nov 1 08:47:56 2006 -0800 e1000: New hardware support Add support for a Low Profile quad-port PCI-E adapter and 2 variants of the ICH8 systems' onboard NIC's. Signed-off-by: Auke Kok commit 770b2c42bc3ba5e24e7babcd53b661ae3118cb31 Author: Jesse Brandeburg Date: Wed Nov 1 08:47:53 2006 -0800 e1000: Remove unneeded and unwanted memsets This memsetting was added in a paranoid rage debugging TX hangs, but are no longer of importance. We can beef up the performance quite a bit removing them. Make sure to fill in next_to_watch to allow this. Signed-off-by: Auke Kok Signed-off-by: Jesse Brandeburg commit 627f343609fe299b152cb77cd736d551e8613ec8 Author: Auke Kok Date: Wed Nov 1 08:47:50 2006 -0800 e1000: simplify skb_put call. Simplify two calls to skb_put by removing one call to it. Signed-off-by: Auke Kok commit 3cba1837d95f587c2683cee1201bcb7fbf68f765 Author: Jeff Kirsher Date: Wed Nov 1 08:47:47 2006 -0800 e1000: reorder pci-e infor struct Order pci-e capability struct according to bus/pci bus width ordering preserving the hard pci spec numbers. Signed-off-by: Auke Kok Signed-off-by: Jeff Kirsher commit 4a379471a0ff843bec9b5306ebe179220f8aa8f7 Author: Jeff Kirsher Date: Wed Nov 1 08:47:44 2006 -0800 e1000: fix VR powerdown code On ich systems during PHY power down to D3, the voltage regulators were left on. Signed-off-by: Auke Kok Signed-off-by: Jeff Kirsher commit b42a0157ce0b03b6dae7436de1d9c3e97721684c Author: Jesse Brandeburg Date: Wed Nov 1 08:47:42 2006 -0800 e1000: add mmiowb() for IA64 to sync tail writes IA64 SMP systems were seeing TX issues with multiple cpu's attempting to write tail registers unordered. This mmiowb() fixes the issue. Signed-off-by: Auke Kok Signed-off-by: Jesse Brandeburg commit 4366bcaa60931d146f0248c7945526b61542468a Author: Auke Kok Date: Wed Nov 1 08:47:39 2006 -0800 e1000: Enble early receive (ERT) on 82573 Enable early receives on 82573 for jumbo frame performance. Jumbo's are only supported on 82573L with ASPM disabled. Signed-off-by: Auke Kok commit 29ad1e110de7c6ff4a7b82ea4dd3c21798af255a Author: Auke Kok Date: Wed Nov 1 08:47:36 2006 -0800 e1000: FIX: enable hw TSO for IPV6 Enable TSO for IPV6. All e1000 hardware supports it. This reduces CPU utilizations by 50% when transmitting IPv6 frames. Fix symbol naming enabling ipv6 TSO. Turn off TSO6 for 10/100. Signed-off-by: Auke Kok commit 3ff9b7ee2628f9d2289f709f59102fa734cb845b Author: Auke Kok Date: Wed Nov 1 08:47:33 2006 -0800 e1000: Remove DISABLE_MULR debug code Remove debugging code disabling MULR (multiple reads). It's not usable for a wide audience and there are no known problems with MULR right now. Signed-off-by: Auke Kok commit 0d18f92fb166e77352b5615e6304e137b365c2b3 Author: Auke Kok Date: Wed Nov 1 08:47:30 2006 -0800 e1000: whitespace changes, comments, typos Small whitespace changes, comment changes, typo fixes. Signed-off-by: Auke Kok commit 37c015a535bb16773aafa938d27dafbd7b60452f Author: Daniel Drake Date: Wed Oct 18 00:17:02 2006 +0100 [PATCH] zd1211rw: Add ID for ZyXEL G-220 Tested by Newsome on IRC zd1211 chip 0586:3401 v4330 high 00-13-49 AL2230_RF pa0 g--- Signed-off-by: Daniel Drake Signed-off-by: John W. Linville commit 6b5b8a2067520740069e3e5798478c3a5e1c9f4b Author: Christian Lamparter Date: Mon Oct 2 19:55:22 2006 +0200 [PATCH] wext: extend MLME support This patch adds two new defines for the SIOCSIWMLME to cover all kinds MLMEs (well, except REASSOC) through a ioctl. Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit d1aa7defbd2eea7a06b4463a7eea80196be40418 Author: Amit S. Kale Date: Sat Oct 21 15:33:03 2006 -0400 Add NetXen 1G/10G ethernet driver. Signed-off-by: Amit S. Kale Signed-off-by: Jeff Garzik commit 76f5837d3f87211855f2f08a1821e888fd371225 Author: Stefano Brivio Date: Sun Oct 15 23:18:11 2006 -0500 [PATCH] bcm43xx: add PCI-E code The current bcm43xx driver does not contain code to handle PCI-E interfaces such as the BCM4311 and BCM4312. This patch, originally written by Stefano Brivio adds the necessary code to enable these interfaces. Signed-off-by: Stefano Brivio Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit f18e087fb72b02ba849d57e6d435831a4d4d670c Author: Alexey Dobriyan Date: Tue Oct 10 14:45:47 2006 -0700 [PATCH] prism54: use BUILD_BUG_ON Signed-off-by: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: John W. Linville commit 6457390fbabe04abc250b3269b609d97cf2dbbaa Author: Holden Karau Date: Tue Oct 10 14:45:33 2006 -0700 [PATCH] atmel: output signal strength information Output signal strength information as part of iwlist scan - before it did not output any signal strength related information. Signed-off-by: Holden Karau Cc: Jean Tourrilhes Signed-off-by: Andrew Morton Signed-off-by: John W. Linville commit a642331c2f7cbaf7e66520a9bd493a28b978c041 Author: Dmitry Torokhov Date: Sun Oct 8 00:38:15 2006 -0400 [PATCH] prism54: whitespace cleanup NET: prism54 - whitespace cleanup Signed-off-by: Dmitry Torokhov Signed-off-by: John W. Linville commit 3c9bb8e47c075591d93252f991429231f2865525 Author: Dmitry Torokhov Date: Sun Oct 8 00:38:14 2006 -0400 [PATCH] prism54: fix potential race in reset scheduling NET: prism54 - fix potential race in reset scheduling There appears to be a race in reset scheduling logic - thread responsible for reseting the interface should clear "reset pending" flag before restarting the queue, otherwise timeout handler might not schedule another reset even if it is needed. This race is mostly theoretical as far as I can see but a race nonetheless. Signed-off-by: Dmitry Torokhov Signed-off-by: John W. Linville commit d873580cf689766a9ef242433f37befd36b99bce Author: Dmitry Torokhov Date: Sun Oct 8 00:14:30 2006 -0400 [PATCH] atmel: whitespace cleanup NET: atmel: whitespace cleanup Signed-off-by: Dmitry Torokhov Signed-off-by: John W. Linville commit e582a4155fb3ee613ced6dbe79dc3932ef11b240 Author: Dmitry Torokhov Date: Sun Oct 8 00:14:29 2006 -0400 [PATCH] atmel: use ARRAY_SIZE() NET: atmel - switch to using ARRAY_SIZE() Signed-off-by: Dmitry Torokhov Signed-off-by: John W. Linville commit ed719910321fd1941dc903d6b5b15cecd270cfc5 Author: Dmitry Torokhov Date: Sun Oct 8 00:14:28 2006 -0400 [PATCH] atmel: save on array initialization NET: atmel - do not initialize array over and over again Signed-off-by: Dmitry Torokhov Signed-off-by: John W. Linville commit 6243ebf2f4fb4d780782b3613f5ae94aac0fea0a Author: Larry Finger Date: Tue Oct 3 18:49:32 2006 -0500 [PATCH] ieee80211: Drop and count duplicate data frames to remove 'replay detected' log messages In the SoftMAC version of the IEEE 802.11 stack, not all duplicate messages are detected. For the most part, there is no difficulty; however for TKIP and CCMP encryption, the duplicates result in a "replay detected" log message where the received and previous values of the TSC are identical. This change adds a new variable to the ieee80211_device structure that holds the 'seq_ctl' value for the previous frame. When a new frame repeats the value, the frame is dropped and the appropriate counter is incremented. Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit 5869bbcf6bb9ac009c0662a615491fbeea29df46 Author: matthieu castet Date: Thu Sep 28 19:57:25 2006 +0200 [PATCH] ieee80211: allow mtu bigger than 1500 Hi this patch allow to set the mtu between 1500 and 2304 (max octets in an MSDU) for devices using ieee80211 linux stack. Signed-off-by: Matthieu CASTET Signed-off-by: John W. Linville commit f2c325c0250783eb77bc0d9d583a427dc850b8ef Author: Daniel Drake Date: Wed Sep 27 03:50:31 2006 +0100 [PATCH] ieee80211: Move IV/ICV stripping into ieee80211_rx This patch adds a host_strip_iv_icv flag to ieee80211 which indicates that ieee80211_rx should strip the IV/ICV/other security features from the payload. This saves on some memmove() calls in the driver and seems like something that belongs in the stack as it can be used by bcm43xx, ipw2200, and zd1211rw I will submit the ipw2200 patch separately as it needs testing. This patch also adds some sensible variable reuse (idx vs keyidx) in ieee80211_rx Signed-off-by: Daniel Drake Acked-by: Johannes Berg Signed-off-by: John W. Linville commit 787eac0751f3d7b7ae3cfa46f5852d0693444e6e Author: Daniel Drake Date: Tue Sep 26 04:04:38 2006 +0100 [PATCH] zd1211rw: Add 3 more device IDs iNexQ UR055g: Tested by Todor T Zviskov zd1211 chip 1435:0711 v4330 high 00-10-a7 AL2230_RF pa0 g-- ZyXEL AG-225, FCC ID SI5WUB410: Tested by Nathan zd1211 chip 0586:3409 v4810 full 00-13-49 AL7230B_RF pa0 g--- Yakumo QuickWLAN USB: Tested by EdB zd1211 chip 0b3b:1630 v4330 high 00-01-36 RF2959_RF pa0 --- Signed-off-by: Daniel Drake Signed-off-by: John W. Linville commit 6dca65902b63e626d6e0ac0b90ad8be9a493328f Author: Larry Finger Date: Mon Sep 25 15:33:20 2006 -0500 [PATCH] bcm43xx: output proper link quality with scans The bcm43xx-softmac driver fails to set two quantities needed for iwlist to compute wireless quality when scanning. As a result, userland programs using the quality to determine the best connection fail. Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit cea2976943229e3b5c7290a9661a60921d438be3 Author: Al Viro Date: Tue Oct 10 00:19:36 2006 +0100 [PATCH] 8390 fixes - the final chunk (h8300) The rest of 8390 conversions; ifdef cascade in 8390.h is gone now. Signed-off-by: Al Viro Signed-off-by: Jeff Garzik commit f759945ebd40816552daa058987be552178e77e4 Author: Al Viro Date: Tue Oct 10 00:19:36 2006 +0100 [PATCH] 8390 cleanup - etherh iomem annotations Signed-off-by: Al Viro Signed-off-by: Jeff Garzik commit b0789e47b9a3ec0cd03e7318c5edd0baba55863c Author: Al Viro Date: Tue Oct 10 00:19:36 2006 +0100 [PATCH] 8390 fixes - m68k oddballs more 8390 conversions - mac8390, zorro8390 and hydra got the same treatment as arm etherh; one more case in 8390.h ifdef cascade is gone. Signed-off-by: Al Viro Signed-off-by: Jeff Garzik commit 84bfb80e36a86cddab9f36d89979bd7b2580b6d0 Author: Al Viro Date: Tue Oct 10 00:19:36 2006 +0100 [PATCH] beginning of 8390 fixes - generic and arm/etherh etherh and a handful of other odd drivers use different macros when building 8390.c. Since we generate a single 8390.o and then link with it, in any config with both oddball and normal 8390-based driver we will end up with breakage in at least one of them. Solution: take most of 8390.c into lib8390.c and have 8390.c, etherh.c and the rest of oddballs #include it. Helper macros are taken from 8390.h to whoever includes lib8390.c. That way odd drivers get separate instances of compiled 8390 stuff and stop stepping on each other's toes. 8390.h gets cleaned up - we don't have the cascade of ifdefs in there and are left with the stuff that can be used by any 8390-based driver. Current problems are exactly because of that cascade - we attempt to choose the set of helpers by looking at config and that, of course, doesn't work well when we have several sets needed by various drivers in our config. Signed-off-by: Al Viro Signed-off-by: Jeff Garzik commit 85c17839e09f0a328218a8b30549ddd617aa0887 Author: Stephen Hemminger Date: Thu Oct 5 10:21:26 2006 -0700 [PATCH] sk98lin: MII ioctl support Add MII ioctl support to the deprecated sk98lin driver. This allows comparison with skge driver's PHY settings. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 3c76fcd48b2975e02e7558dd47381a85097a03bd Author: Stephen Hemminger Date: Thu Oct 5 10:16:23 2006 -0700 [PATCH] sk98lin: ethtool register dump Add support for dumping the registers in the deprecated sk98lin driver. This is allows for easier comparison with settings in new skge driver. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 3e63650a9468b1b59b0e70b19bc60525c7c33d90 Author: Henrik Kretzschmar Date: Tue Oct 10 14:33:29 2006 -0700 [PATCH] pci_module_init() convertion in olympic.c pci_module_init() convertion in olympic.c Signed-off-by: Henrik Kretzschmar Acked-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 4a00aad0ae5dbd97f8d0c80b6b30c0c088e459b6 Author: Eric Sesterhenn Date: Tue Oct 10 14:33:28 2006 -0700 [PATCH] Remove unnecessary check in drivers/net/depca.c This was spotted by coverity (cid #793). All callers dereference dev before calling this functions, and we dereference it earlier in the function, when initializing lp. Signed-off-by: Eric Sesterhenn Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit b13919ec39d33ddc55939508042bfec568afa04e Author: Francois Romieu Date: Tue Oct 10 14:33:27 2006 -0700 [PATCH] forcedeth: power management support Tobias Diedrich sayeth: Vanilla forcedeth doesn't seem to support suspend and an ifdown/up-cycle is needed to get it working again after suspend. Francois Romieu's "Awfully experimental" patch is working just fine for me (with message signalled interrupts disabled) and has survived quite a few suspend/resume cycles. So I'd very much like to see (at least partial, with msi disabled) suspend support for forcedeth in mainline. (Addresses http://bugzilla.kernel.org/show_bug.cgi?id=6398) Cc: Francois Romieu Cc; Jeff Garzik Cc: Manfred Spraul Cc: Ayaz Abdulla Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 30424fc12b03e3cd985b92ffb8475c005f9c43cf Author: Maciej W. Rozycki Date: Tue Oct 3 16:18:35 2006 +0100 [PATCH] 2.6.18: sb1250-mac: Phylib IRQ handling fixes This patch fixes a couple of problems discovered with interrupt handling in the phylib core, namely: 1. The driver uses timer and workqueue calls, but does not include nor . 2. The driver uses schedule_work() for handling interrupts, but does not make sure any pending work scheduled thus has been completed before driver's structures get freed from memory. This is especially important as interrupts may keep arriving if the line is shared with another PHY. The solution is to ignore phy_interrupt() calls if the reported device has already been halted and calling flush_scheduled_work() from phy_stop_interrupts() (but guarded with current_is_keventd() in case the function has been called through keventd from the MAC device's close call to avoid a deadlock on the netlink lock). Signed-off-by: Maciej W. Rozycki patch-mips-2.6.18-20060920-phy-irq-16 Signed-off-by: Jeff Garzik commit 22ebe1225a74ad51e9068976bc865144e849504d Author: Maciej W. Rozycki Date: Tue Oct 3 16:18:28 2006 +0100 [PATCH] 2.6.18: sb1250-mac: Missing inclusions from The uses some types and macros defined in , , and , but fails to include these headers. Signed-off-by: Maciej W. Rozycki patch-mips-2.6.18-20060920-include-phy-16 Signed-off-by: Jeff Garzik commit 6e854664fe9757ac9b3578a948ea0317a5e9ca68 Author: Maciej W. Rozycki Date: Tue Oct 3 16:18:13 2006 +0100 [PATCH] 2.6.18: sb1250-mac: Broadcom PHY support This patch adds support for interrupt-driven operation of the Broadcom Gigabit Ethernet PHYs. I have included device IDs for the parts used on Broadcom SiByte evaluation boards; more can be added as a need arises. They are apparently generally software-compatible with one another. Signed-off-by: Maciej W. Rozycki patch-mips-2.6.18-20060920-broadcom-phy-15 Signed-off-by: Jeff Garzik Signed-off-by: Andrew Morton --- Documentation/networking/e1000.txt | 451 +++--- MAINTAINERS | 7 drivers/net/8390.c | 1080 --------------- drivers/net/8390.h | 37 drivers/net/Kconfig | 5 drivers/net/Makefile | 10 drivers/net/arm/etherh.c | 39 drivers/net/defxx.c | 39 drivers/net/defxx.h | 15 drivers/net/depca.c | 28 drivers/net/e100.c | 72 - drivers/net/e1000/e1000.h | 17 drivers/net/e1000/e1000_ethtool.c | 36 drivers/net/e1000/e1000_hw.c | 137 - drivers/net/e1000/e1000_hw.h | 90 - drivers/net/e1000/e1000_main.c | 487 +++++- drivers/net/e1000/e1000_osdep.h | 9 drivers/net/e1000/e1000_param.c | 98 - drivers/net/forcedeth.c | 290 +++- drivers/net/hydra.c | 23 drivers/net/lib8390.c | 1097 +++++++++++++++ drivers/net/mac8390.c | 26 drivers/net/ne-h8300.c | 23 drivers/net/netxen/Makefile | 35 drivers/net/netxen/netxen_nic.h | 909 ++++++++++++ drivers/net/netxen/netxen_nic_ethtool.c | 715 ++++++++++ drivers/net/netxen/netxen_nic_hdr.h | 617 ++++++++ drivers/net/netxen/netxen_nic_hw.c | 936 +++++++++++++ drivers/net/netxen/netxen_nic_hw.h | 480 ++++++ drivers/net/netxen/netxen_nic_init.c | 1143 ++++++++++++++++ drivers/net/netxen/netxen_nic_ioctl.h | 75 + drivers/net/netxen/netxen_nic_isr.c | 221 +++ drivers/net/netxen/netxen_nic_main.c | 1119 +++++++++++++++ drivers/net/netxen/netxen_nic_niu.c | 800 +++++++++++ drivers/net/netxen/netxen_nic_phan_reg.h | 195 ++ drivers/net/pcmcia/pcnet_cs.c | 1 drivers/net/phy/Kconfig | 6 drivers/net/phy/Makefile | 1 drivers/net/phy/broadcom.c | 175 ++ drivers/net/phy/phy.c | 115 - drivers/net/phy/phy_device.c | 1 drivers/net/r8169.c | 22 drivers/net/sk98lin/skethtool.c | 26 drivers/net/sk98lin/skge.c | 54 drivers/net/sundance.c | 32 drivers/net/tokenring/olympic.c | 2 drivers/net/tulip/de2104x.c | 4 drivers/net/wireless/atmel.c | 36 drivers/net/wireless/atmel_cs.c | 74 - drivers/net/wireless/atmel_pci.c | 10 drivers/net/wireless/bcm43xx/bcm43xx.h | 32 drivers/net/wireless/bcm43xx/bcm43xx_main.c | 145 +- drivers/net/wireless/bcm43xx/bcm43xx_power.c | 28 drivers/net/wireless/bcm43xx/bcm43xx_wx.c | 4 drivers/net/wireless/bcm43xx/bcm43xx_xmit.c | 19 drivers/net/wireless/ipw2100.c | 3 drivers/net/wireless/prism54/isl_38xx.c | 17 drivers/net/wireless/prism54/isl_38xx.h | 7 drivers/net/wireless/prism54/isl_ioctl.c | 61 drivers/net/wireless/prism54/isl_ioctl.h | 1 drivers/net/wireless/prism54/isl_oid.h | 48 drivers/net/wireless/prism54/islpci_dev.c | 13 drivers/net/wireless/prism54/islpci_dev.h | 11 drivers/net/wireless/prism54/islpci_eth.c | 30 drivers/net/wireless/prism54/islpci_eth.h | 1 drivers/net/wireless/prism54/islpci_hotplug.c | 23 drivers/net/wireless/prism54/islpci_mgt.c | 3 drivers/net/wireless/prism54/islpci_mgt.h | 5 drivers/net/wireless/prism54/oid_mgt.c | 6 drivers/net/wireless/prism54/prismcompat.h | 4 drivers/net/wireless/zd1211rw/zd_usb.c | 4 drivers/net/zorro8390.c | 24 include/linux/pci_ids.h | 4 include/linux/phy.h | 2 include/linux/wireless.h | 2 include/net/ieee80211.h | 6 net/ieee80211/ieee80211_module.c | 9 net/ieee80211/ieee80211_rx.c | 61 78 files changed, 10423 insertions(+), 2070 deletions(-) diff -puN Documentation/networking/e1000.txt~git-netdev-all Documentation/networking/e1000.txt --- a/Documentation/networking/e1000.txt~git-netdev-all +++ a/Documentation/networking/e1000.txt @@ -1,7 +1,7 @@ Linux* Base Driver for the Intel(R) PRO/1000 Family of Adapters =============================================================== -November 15, 2005 +September 26, 2006 Contents @@ -9,6 +9,7 @@ Contents - In This Release - Identifying Your Adapter +- Building and Installation - Command Line Parameters - Speed and Duplex Configuration - Additional Configurations @@ -41,6 +42,9 @@ or later), lspci, and ifconfig to obtain Instructions on updating ethtool can be found in the section "Additional Configurations" later in this document. +NOTE: The Intel(R) 82562v 10/100 Network Connection only provides 10/100 +support. + Identifying Your Adapter ======================== @@ -51,28 +55,27 @@ Driver ID Guide at: http://support.intel.com/support/network/adapter/pro100/21397.htm For the latest Intel network drivers for Linux, refer to the following -website. In the search field, enter your adapter name or type, or use the +website. In the search field, enter your adapter name or type, or use the networking link on the left to search for your adapter: http://downloadfinder.intel.com/scripts-df/support_intel.asp -Command Line Parameters ======================= +Command Line Parameters +======================= If the driver is built as a module, the following optional parameters -are used by entering them on the command line with the modprobe or insmod -command using this syntax: +are used by entering them on the command line with the modprobe command +using this syntax: modprobe e1000 [