326 files changed, 10554 insertions, 2970 deletions
diff --git a/drivers/net/3c501.c b/drivers/net/3c501.c
index bb44509fd404..07136ec423bd 100644
--- a/drivers/net/3c501.c
+++ b/drivers/net/3c501.c
@@ -508,11 +508,11 @@ static int el_start_xmit(struct sk_buff *skb, struct net_device *dev)
 * speak of. We simply pull the packet out of its PIO buffer (which is slow)
 * and queue it for the kernel. Then we reset the card for the next packet.
 *
- * We sometimes get suprise interrupts late both because the SMP IRQ delivery
+ * We sometimes get surprise interrupts late both because the SMP IRQ delivery
 * is message passing and because the card sometimes seems to deliver late. I
 * think if it is part way through a receive and the mode is changed it carries
 * on receiving and sends us an interrupt. We have to band aid all these cases
- * to get a sensible 150kbytes/second performance. Even then you want a small
+ * to get a sensible 150kBytes/second performance. Even then you want a small
 * TCP window.
 */
diff --git a/drivers/net/3c509.c b/drivers/net/3c509.c
index dc845f36fe49..cbdae54f715f 100644
--- a/drivers/net/3c509.c
+++ b/drivers/net/3c509.c
@@ -68,7 +68,6 @@
 /* Maximum events (Rx packets, etc.) to handle at each interrupt. */
 static int max_interrupt_work = 10;
-#include <linux/config.h>
 #include <linux/module.h>
 #ifdef CONFIG_MCA
 #include <linux/mca.h>
diff --git a/drivers/net/3c515.c b/drivers/net/3c515.c
index 91d1c4c24d9b..4532b17e40ea 100644
--- a/drivers/net/3c515.c
+++ b/drivers/net/3c515.c
@@ -57,7 +57,6 @@ static int max_interrupt_work = 20;
 #define RX_RING_SIZE    16
 #define PKT_BUF_SZ              1536    /* Size of each temporary Rx buffer. */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/isapnp.h>
 #include <linux/kernel.h>
@@ -761,7 +760,7 @@ static int corkscrew_open(struct net_device *dev)
                                   vp->product_name, dev)) return -EAGAIN;
                enable_dma(dev->dma);
                set_dma_mode(dev->dma, DMA_MODE_CASCADE);
-        } else if (request_irq(dev->irq, &corkscrew_interrupt, SA_SHIRQ,
+        } else if (request_irq(dev->irq, &corkscrew_interrupt, IRQF_SHARED,
                               vp->product_name, dev)) {
                return -EAGAIN;
        }
diff --git a/drivers/net/3c523.c b/drivers/net/3c523.c
index 4bf8510655c5..5dfd97f0ba9e 100644
--- a/drivers/net/3c523.c
+++ b/drivers/net/3c523.c
@@ -289,7 +289,7 @@ static int elmc_open(struct net_device *dev)
        elmc_id_attn586();      /* disable interrupts */
-        ret = request_irq(dev->irq, &elmc_interrupt, SA_SHIRQ | SA_SAMPLE_RANDOM,
+        ret = request_irq(dev->irq, &elmc_interrupt, IRQF_SHARED | IRQF_SAMPLE_RANDOM,
                          dev->name, dev);
        if (ret) {
                printk(KERN_ERR "%s: couldn't get irq %d\n", dev->name, dev->irq);
diff --git a/drivers/net/3c527.c b/drivers/net/3c527.c
index 1b1cb0026072..03c0f7176fc9 100644
--- a/drivers/net/3c527.c
+++ b/drivers/net/3c527.c
@@ -435,7 +435,7 @@ static int __init mc32_probe1(struct net_device *dev, int slot)
         *      Grab the IRQ
         */
-        err = request_irq(dev->irq, &mc32_interrupt, SA_SHIRQ | SA_SAMPLE_RANDOM, DRV_NAME, dev);
+        err = request_irq(dev->irq, &mc32_interrupt, IRQF_SHARED | IRQF_SAMPLE_RANDOM, DRV_NAME, dev);
        if (err) {
                release_region(dev->base_addr, MC32_IO_EXTENT);
                printk(KERN_ERR "%s: unable to get IRQ %d.\n", DRV_NAME, dev->irq);
@@ -1031,8 +1031,7 @@ static int mc32_send_packet(struct sk_buff *skb, struct net_device *dev)
                return 1;
        }
-        skb = skb_padto(skb, ETH_ZLEN);
+        if (skb_padto(skb, ETH_ZLEN)) {
-        if (skb == NULL) {
                netif_wake_queue(dev);
                return 0;
        }
diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c
index 274b0138d442..80e8ca013e44 100644
--- a/drivers/net/3c59x.c
+++ b/drivers/net/3c59x.c
@@ -17,172 +17,6 @@
        410 Severn Ave., Suite 210
        Annapolis MD 21403
-        Linux Kernel Additions:
-        
-        0.99H+lk0.9 - David S. Miller - softnet, PCI DMA updates
-        0.99H+lk1.0 - Jeff Garzik <jgarzik@pobox.com>
-                Remove compatibility defines for kernel versions < 2.2.x.
-                Update for new 2.3.x module interface
-        LK1.1.2 (March 19, 2000)
-        * New PCI interface (jgarzik)
-    LK1.1.3 25 April 2000, Andrew Morton <andrewm@uow.edu.au>
-    - Merged with 3c575_cb.c
-    - Don't set RxComplete in boomerang interrupt enable reg
-    - spinlock in vortex_timer to protect mdio functions
-    - disable local interrupts around call to vortex_interrupt in
-      vortex_tx_timeout() (So vortex_interrupt can use spin_lock())
-    - Select window 3 in vortex_timer()'s write to Wn3_MAC_Ctrl
-    - In vortex_start_xmit(), move the lock to _after_ we've altered
-      vp->cur_tx and vp->tx_full.  This defeats the race between
-      vortex_start_xmit() and vortex_interrupt which was identified
-      by Bogdan Costescu.
-    - Merged back support for six new cards from various sources
-    - Set vortex_have_pci if pci_module_init returns zero (fixes cardbus
-      insertion oops)
-    - Tell it that 3c905C has NWAY for 100bT autoneg
-    - Fix handling of SetStatusEnd in 'Too much work..' code, as
-      per 2.3.99's 3c575_cb (Dave Hinds).
-    - Split ISR into two for vortex & boomerang
-    - Fix MOD_INC/DEC races
-    - Handle resource allocation failures.
-    - Fix 3CCFE575CT LED polarity
-    - Make tx_interrupt_mitigation the default
-    LK1.1.4 25 April 2000, Andrew Morton <andrewm@uow.edu.au>    
-    - Add extra TxReset to vortex_up() to fix 575_cb hotplug initialisation probs.
-    - Put vortex_info_tbl into __devinitdata
-    - In the vortex_error StatsFull HACK, disable stats in vp->intr_enable as well
-      as in the hardware.
-    - Increased the loop counter in issue_and_wait from 2,000 to 4,000.
-    LK1.1.5 28 April 2000, andrewm
-    - Added powerpc defines (John Daniel <jdaniel@etresoft.com> said these work...)
-    - Some extra diagnostics
-    - In vortex_error(), reset the Tx on maxCollisions.  Otherwise most
-      chips usually get a Tx timeout.
-    - Added extra_reset module parm
-    - Replaced some inline timer manip with mod_timer
-      (Franois romieu <Francois.Romieu@nic.fr>)
-    - In vortex_up(), don't make Wn3_config initialisation dependent upon has_nway
-      (this came across from 3c575_cb).
-    LK1.1.6 06 Jun 2000, andrewm
-    - Backed out the PPC defines.
-    - Use del_timer_sync(), mod_timer().
-    - Fix wrapped ulong comparison in boomerang_rx()
-    - Add IS_TORNADO, use it to suppress 3c905C checksum error msg
-      (Donald Becker, I Lee Hetherington <ilh@sls.lcs.mit.edu>)
-    - Replace union wn3_config with BFINS/BFEXT manipulation for
-      sparc64 (Pete Zaitcev, Peter Jones)
-    - In vortex_error, do_tx_reset and vortex_tx_timeout(Vortex):
-      do a netif_wake_queue() to better recover from errors. (Anders Pedersen,
-      Donald Becker)
-    - Print a warning on out-of-memory (rate limited to 1 per 10 secs)
-    - Added two more Cardbus 575 NICs: 5b57 and 6564 (Paul Wagland)
-    LK1.1.7 2 Jul 2000 andrewm
-    - Better handling of shared IRQs
-    - Reset the transmitter on a Tx reclaim error
-    - Fixed crash under OOM during vortex_open() (Mark Hemment)
-    - Fix Rx cessation problem during OOM (help from Mark Hemment)
-    - The spinlocks around the mdio access were blocking interrupts for 300uS.
-      Fix all this to use spin_lock_bh() within mdio_read/write
-    - Only write to TxFreeThreshold if it's a boomerang - other NICs don't
-      have one.
-    - Added 802.3x MAC-layer flow control support
-   LK1.1.8 13 Aug 2000 andrewm
-    - Ignore request_region() return value - already reserved if Cardbus.
-    - Merged some additional Cardbus flags from Don's 0.99Qk
-    - Some fixes for 3c556 (Fred Maciel)
-    - Fix for EISA initialisation (Jan Rekorajski)
-    - Renamed MII_XCVR_PWR and EEPROM_230 to align with 3c575_cb and D. Becker's drivers
-    - Fixed MII_XCVR_PWR for 3CCFE575CT
-    - Added INVERT_LED_PWR, used it.
-    - Backed out the extra_reset stuff
-   LK1.1.9 12 Sep 2000 andrewm
-    - Backed out the tx_reset_resume flags.  It was a no-op.
-    - In vortex_error, don't reset the Tx on txReclaim errors
-    - In vortex_error, don't reset the Tx on maxCollisions errors.
-      Hence backed out all the DownListPtr logic here.
-    - In vortex_error, give Tornado cards a partial TxReset on
-      maxCollisions (David Hinds).  Defined MAX_COLLISION_RESET for this.
-    - Redid some driver flags and device names based on pcmcia_cs-3.1.20.
-    - Fixed a bug where, if vp->tx_full is set when the interface
-      is downed, it remains set when the interface is upped.  Bad
-      things happen.
-   LK1.1.10 17 Sep 2000 andrewm
-    - Added EEPROM_8BIT for 3c555 (Fred Maciel)
-    - Added experimental support for the 3c556B Laptop Hurricane (Louis Gerbarg)
-    - Add HAS_NWAY to "3c900 Cyclone 10Mbps TPO"
-   LK1.1.11 13 Nov 2000 andrewm
-    - Dump MOD_INC/DEC_USE_COUNT, use SET_MODULE_OWNER
-   LK1.1.12 1 Jan 2001 andrewm (2.4.0-pre1)
-    - Call pci_enable_device before we request our IRQ (Tobias Ringstrom)
-    - Add 3c590 PCI latency timer hack to vortex_probe1 (from 0.99Ra)
-    - Added extended issue_and_wait for the 3c905CX.
-    - Look for an MII on PHY index 24 first (3c905CX oddity).
-    - Add HAS_NWAY to 3cSOHO100-TX (Brett Frankenberger)
-    - Don't free skbs we don't own on oom path in vortex_open().
-   LK1.1.13 27 Jan 2001
-    - Added explicit `medialock' flag so we can truly
-      lock the media type down with `options'.
-    - "check ioremap return and some tidbits" (Arnaldo Carvalho de Melo <acme@conectiva.com.br>)
-    - Added and used EEPROM_NORESET for 3c556B PM resumes.
-    - Fixed leakage of vp->rx_ring.
-    - Break out separate HAS_HWCKSM device capability flag.
-    - Kill vp->tx_full (ANK)
-    - Merge zerocopy fragment handling (ANK?)
-   LK1.1.14 15 Feb 2001
-    - Enable WOL.  Can be turned on with `enable_wol' module option.
-    - EISA and PCI initialisation fixes (jgarzik, Manfred Spraul)
-    - If a device's internalconfig register reports it has NWAY,
-      use it, even if autoselect is enabled.
-   LK1.1.15 6 June 2001 akpm
-    - Prevent double counting of received bytes (Lars Christensen)
-    - Add ethtool support (jgarzik)
-    - Add module parm descriptions (Andrzej M. Krzysztofowicz)
-    - Implemented alloc_etherdev() API
-    - Special-case the 'Tx error 82' message.
-   LK1.1.16 18 July 2001 akpm
-    - Make NETIF_F_SG dependent upon nr_free_highpages(), not on CONFIG_HIGHMEM
-    - Lessen verbosity of bootup messages
-    - Fix WOL - use new PM API functions.
-    - Use netif_running() instead of vp->open in suspend/resume.
-    - Don't reset the interface logic on open/close/rmmod.  It upsets
-      autonegotiation, and hence DHCP (from 0.99T).
-    - Back out EEPROM_NORESET flag because of the above (we do it for all
-      NICs).
-    - Correct 3c982 identification string
-    - Rename wait_for_completion() to issue_and_wait() to avoid completion.h
-      clash.
-   LK1.1.17 18Dec01 akpm
-    - PCI ID 9805 is a Python-T, not a dual-port Cyclone.  Apparently.
-      And it has NWAY.
-    - Mask our advertised modes (vp->advertising) with our capabilities
-          (MII reg5) when deciding which duplex mode to use.
-    - Add `global_options' as default for options[].  Ditto global_enable_wol,
-      global_full_duplex.
-   LK1.1.18 01Jul02 akpm
-    - Fix for undocumented transceiver power-up bit on some 3c566B's
-      (Donald Becker, Rahul Karnik)
-    - See http://www.zip.com.au/~akpm/linux/#3c59x-2.3 for more details.
-    - Also see Documentation/networking/vortex.txt
-   LK1.1.19 10Nov02 Marc Zyngier <maz@wild-wind.fr.eu.org>
-    - EISA sysfs integration.
 */
 /*
@@ -236,7 +70,6 @@ static int vortex_debug = VORTEX_DEBUG;
 static int vortex_debug = 1;
 #endif
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
@@ -375,8 +208,7 @@ limit of 4K.
   of the drivers, and will likely be provided by some future kernel.
 */
 enum pci_flags_bit {
-        PCI_USES_IO=1, PCI_USES_MEM=2, PCI_USES_MASTER=4,
+        PCI_USES_MASTER=4,
-        PCI_ADDR0=0x10<<0, PCI_ADDR1=0x10<<1, PCI_ADDR2=0x10<<2, PCI_ADDR3=0x10<<3,
 };
 enum {  IS_VORTEX=1, IS_BOOMERANG=2, IS_CYCLONE=4, IS_TORNADO=8,
@@ -446,95 +278,95 @@ static struct vortex_chip_info {
        int io_size;
 } vortex_info_tbl[] __devinitdata = {
        {"3c590 Vortex 10Mbps",
-         PCI_USES_IO|PCI_USES_MASTER, IS_VORTEX, 32, },
+         PCI_USES_MASTER, IS_VORTEX, 32, },
        {"3c592 EISA 10Mbps Demon/Vortex",                                      /* AKPM: from Don's 3c59x_cb.c 0.49H */
-         PCI_USES_IO|PCI_USES_MASTER, IS_VORTEX, 32, },
+         PCI_USES_MASTER, IS_VORTEX, 32, },
        {"3c597 EISA Fast Demon/Vortex",                                        /* AKPM: from Don's 3c59x_cb.c 0.49H */
-         PCI_USES_IO|PCI_USES_MASTER, IS_VORTEX, 32, },
+         PCI_USES_MASTER, IS_VORTEX, 32, },
        {"3c595 Vortex 100baseTx",
-         PCI_USES_IO|PCI_USES_MASTER, IS_VORTEX, 32, },
+         PCI_USES_MASTER, IS_VORTEX, 32, },
        {"3c595 Vortex 100baseT4",
-         PCI_USES_IO|PCI_USES_MASTER, IS_VORTEX, 32, },
+         PCI_USES_MASTER, IS_VORTEX, 32, },
        {"3c595 Vortex 100base-MII",
-         PCI_USES_IO|PCI_USES_MASTER, IS_VORTEX, 32, },
+         PCI_USES_MASTER, IS_VORTEX, 32, },
        {"3c900 Boomerang 10baseT",
-         PCI_USES_IO|PCI_USES_MASTER, IS_BOOMERANG|EEPROM_RESET, 64, },
+         PCI_USES_MASTER, IS_BOOMERANG|EEPROM_RESET, 64, },
        {"3c900 Boomerang 10Mbps Combo",
-         PCI_USES_IO|PCI_USES_MASTER, IS_BOOMERANG|EEPROM_RESET, 64, },
+         PCI_USES_MASTER, IS_BOOMERANG|EEPROM_RESET, 64, },
        {"3c900 Cyclone 10Mbps TPO",                                            /* AKPM: from Don's 0.99M */
-         PCI_USES_IO|PCI_USES_MASTER, IS_CYCLONE|HAS_HWCKSM, 128, },
+         PCI_USES_MASTER, IS_CYCLONE|HAS_HWCKSM, 128, },
        {"3c900 Cyclone 10Mbps Combo",
-         PCI_USES_IO|PCI_USES_MASTER, IS_CYCLONE|HAS_HWCKSM, 128, },
+         PCI_USES_MASTER, IS_CYCLONE|HAS_HWCKSM, 128, },
        {"3c900 Cyclone 10Mbps TPC",                                            /* AKPM: from Don's 0.99M */
-         PCI_USES_IO|PCI_USES_MASTER, IS_CYCLONE|HAS_HWCKSM, 128, },
+         PCI_USES_MASTER, IS_CYCLONE|HAS_HWCKSM, 128, },
        {"3c900B-FL Cyclone 10base-FL",
-         PCI_USES_IO|PCI_USES_MASTER, IS_CYCLONE|HAS_HWCKSM, 128, },
+         PCI_USES_MASTER, IS_CYCLONE|HAS_HWCKSM, 128, },
        {"3c905 Boomerang 100baseTx",
-         PCI_USES_IO|PCI_USES_MASTER, IS_BOOMERANG|HAS_MII|EEPROM_RESET, 64, },
+         PCI_USES_MASTER, IS_BOOMERANG|HAS_MII|EEPROM_RESET, 64, },
        {"3c905 Boomerang 100baseT4",
-         PCI_USES_IO|PCI_USES_MASTER, IS_BOOMERANG|HAS_MII|EEPROM_RESET, 64, },
+         PCI_USES_MASTER, IS_BOOMERANG|HAS_MII|EEPROM_RESET, 64, },
        {"3c905B Cyclone 100baseTx",
-         PCI_USES_IO|PCI_USES_MASTER, IS_CYCLONE|HAS_NWAY|HAS_HWCKSM|EXTRA_PREAMBLE, 128, },
+         PCI_USES_MASTER, IS_CYCLONE|HAS_NWAY|HAS_HWCKSM|EXTRA_PREAMBLE, 128, },
        {"3c905B Cyclone 10/100/BNC",
-         PCI_USES_IO|PCI_USES_MASTER, IS_CYCLONE|HAS_NWAY|HAS_HWCKSM, 128, },
+         PCI_USES_MASTER, IS_CYCLONE|HAS_NWAY|HAS_HWCKSM, 128, },
        {"3c905B-FX Cyclone 100baseFx",
-         PCI_USES_IO|PCI_USES_MASTER, IS_CYCLONE|HAS_HWCKSM, 128, },
+         PCI_USES_MASTER, IS_CYCLONE|HAS_HWCKSM, 128, },
        {"3c905C Tornado",
-        PCI_USES_IO|PCI_USES_MASTER, IS_TORNADO|HAS_NWAY|HAS_HWCKSM|EXTRA_PREAMBLE, 128, },
+        PCI_USES_MASTER, IS_TORNADO|HAS_NWAY|HAS_HWCKSM|EXTRA_PREAMBLE, 128, },
        {"3c920B-EMB-WNM (ATI Radeon 9100 IGP)",
-         PCI_USES_IO|PCI_USES_MASTER, IS_TORNADO|HAS_MII|HAS_HWCKSM, 128, },
+         PCI_USES_MASTER, IS_TORNADO|HAS_MII|HAS_HWCKSM, 128, },
        {"3c980 Cyclone",
-         PCI_USES_IO|PCI_USES_MASTER, IS_CYCLONE|HAS_HWCKSM, 128, },
+         PCI_USES_MASTER, IS_CYCLONE|HAS_HWCKSM, 128, },
        {"3c980C Python-T",
-         PCI_USES_IO|PCI_USES_MASTER, IS_CYCLONE|HAS_NWAY|HAS_HWCKSM, 128, },
+         PCI_USES_MASTER, IS_CYCLONE|HAS_NWAY|HAS_HWCKSM, 128, },
        {"3cSOHO100-TX Hurricane",
-         PCI_USES_IO|PCI_USES_MASTER, IS_CYCLONE|HAS_NWAY|HAS_HWCKSM, 128, },
+         PCI_USES_MASTER, IS_CYCLONE|HAS_NWAY|HAS_HWCKSM, 128, },
        {"3c555 Laptop Hurricane",
-         PCI_USES_IO|PCI_USES_MASTER, IS_CYCLONE|EEPROM_8BIT|HAS_HWCKSM, 128, },
+         PCI_USES_MASTER, IS_CYCLONE|EEPROM_8BIT|HAS_HWCKSM, 128, },
        {"3c556 Laptop Tornado",
-         PCI_USES_IO|PCI_USES_MASTER, IS_TORNADO|HAS_NWAY|EEPROM_8BIT|HAS_CB_FNS|INVERT_MII_PWR|
+         PCI_USES_MASTER, IS_TORNADO|HAS_NWAY|EEPROM_8BIT|HAS_CB_FNS|INVERT_MII_PWR|
                                                                        HAS_HWCKSM, 128, },
        {"3c556B Laptop Hurricane",
-         PCI_USES_IO|PCI_USES_MASTER, IS_TORNADO|HAS_NWAY|EEPROM_OFFSET|HAS_CB_FNS|INVERT_MII_PWR|
+         PCI_USES_MASTER, IS_TORNADO|HAS_NWAY|EEPROM_OFFSET|HAS_CB_FNS|INVERT_MII_PWR|
                                        WNO_XCVR_PWR|HAS_HWCKSM, 128, },
        {"3c575 [Megahertz] 10/100 LAN  CardBus",
-        PCI_USES_IO|PCI_USES_MASTER, IS_BOOMERANG|HAS_MII|EEPROM_8BIT, 128, },
+        PCI_USES_MASTER, IS_BOOMERANG|HAS_MII|EEPROM_8BIT, 128, },
        {"3c575 Boomerang CardBus",
-         PCI_USES_IO|PCI_USES_MASTER, IS_BOOMERANG|HAS_MII|EEPROM_8BIT, 128, },
+         PCI_USES_MASTER, IS_BOOMERANG|HAS_MII|EEPROM_8BIT, 128, },
        {"3CCFE575BT Cyclone CardBus",
-         PCI_USES_IO|PCI_USES_MASTER, IS_CYCLONE|HAS_NWAY|HAS_CB_FNS|EEPROM_8BIT|
+         PCI_USES_MASTER, IS_CYCLONE|HAS_NWAY|HAS_CB_FNS|EEPROM_8BIT|
                                                                        INVERT_LED_PWR|HAS_HWCKSM, 128, },
        {"3CCFE575CT Tornado CardBus",
-         PCI_USES_IO|PCI_USES_MASTER, IS_TORNADO|HAS_NWAY|HAS_CB_FNS|EEPROM_8BIT|INVERT_MII_PWR|
+         PCI_USES_MASTER, IS_TORNADO|HAS_NWAY|HAS_CB_FNS|EEPROM_8BIT|INVERT_MII_PWR|
                                                                        MAX_COLLISION_RESET|HAS_HWCKSM, 128, },
        {"3CCFE656 Cyclone CardBus",
-         PCI_USES_IO|PCI_USES_MASTER, IS_CYCLONE|HAS_NWAY|HAS_CB_FNS|EEPROM_8BIT|INVERT_MII_PWR|
+         PCI_USES_MASTER, IS_CYCLONE|HAS_NWAY|HAS_CB_FNS|EEPROM_8BIT|INVERT_MII_PWR|
                                                                        INVERT_LED_PWR|HAS_HWCKSM, 128, },
        {"3CCFEM656B Cyclone+Winmodem CardBus",
-         PCI_USES_IO|PCI_USES_MASTER, IS_CYCLONE|HAS_NWAY|HAS_CB_FNS|EEPROM_8BIT|INVERT_MII_PWR|
+         PCI_USES_MASTER, IS_CYCLONE|HAS_NWAY|HAS_CB_FNS|EEPROM_8BIT|INVERT_MII_PWR|
                                                                        INVERT_LED_PWR|HAS_HWCKSM, 128, },
        {"3CXFEM656C Tornado+Winmodem CardBus",                 /* From pcmcia-cs-3.1.5 */
-         PCI_USES_IO|PCI_USES_MASTER, IS_TORNADO|HAS_NWAY|HAS_CB_FNS|EEPROM_8BIT|INVERT_MII_PWR|
+         PCI_USES_MASTER, IS_TORNADO|HAS_NWAY|HAS_CB_FNS|EEPROM_8BIT|INVERT_MII_PWR|
                                                                        MAX_COLLISION_RESET|HAS_HWCKSM, 128, },
        {"3c450 HomePNA Tornado",                                               /* AKPM: from Don's 0.99Q */
-         PCI_USES_IO|PCI_USES_MASTER, IS_TORNADO|HAS_NWAY|HAS_HWCKSM, 128, },
+         PCI_USES_MASTER, IS_TORNADO|HAS_NWAY|HAS_HWCKSM, 128, },
        {"3c920 Tornado",
-         PCI_USES_IO|PCI_USES_MASTER, IS_TORNADO|HAS_NWAY|HAS_HWCKSM, 128, },
+         PCI_USES_MASTER, IS_TORNADO|HAS_NWAY|HAS_HWCKSM, 128, },
        {"3c982 Hydra Dual Port A",
-         PCI_USES_IO|PCI_USES_MASTER, IS_TORNADO|HAS_HWCKSM|HAS_NWAY, 128, },
+         PCI_USES_MASTER, IS_TORNADO|HAS_HWCKSM|HAS_NWAY, 128, },
        {"3c982 Hydra Dual Port B",
-         PCI_USES_IO|PCI_USES_MASTER, IS_TORNADO|HAS_HWCKSM|HAS_NWAY, 128, },
+         PCI_USES_MASTER, IS_TORNADO|HAS_HWCKSM|HAS_NWAY, 128, },
        {"3c905B-T4",
-         PCI_USES_IO|PCI_USES_MASTER, IS_CYCLONE|HAS_NWAY|HAS_HWCKSM|EXTRA_PREAMBLE, 128, },
+         PCI_USES_MASTER, IS_CYCLONE|HAS_NWAY|HAS_HWCKSM|EXTRA_PREAMBLE, 128, },
        {"3c920B-EMB-WNM Tornado",
-         PCI_USES_IO|PCI_USES_MASTER, IS_TORNADO|HAS_NWAY|HAS_HWCKSM, 128, },
+         PCI_USES_MASTER, IS_TORNADO|HAS_NWAY|HAS_HWCKSM, 128, },
        {NULL,}, /* NULL terminated list. */
 };
@@ -998,7 +830,7 @@ static int vortex_resume(struct pci_dev *pdev)
                pci_enable_device(pdev);
                pci_set_master(pdev);
                if (request_irq(dev->irq, vp->full_bus_master_rx ?
-                                &boomerang_interrupt : &vortex_interrupt, SA_SHIRQ, dev->name, dev)) {
+                                &boomerang_interrupt : &vortex_interrupt, IRQF_SHARED, dev->name, dev)) {
                        printk(KERN_WARNING "%s: Could not reserve IRQ %d\n", dev->name, dev->irq);
                        pci_disable_device(pdev);
                        return -EBUSY;
@@ -1382,17 +1214,12 @@ static int __devinit vortex_probe1(struct device *gendev,
        for (i = 0; i < 6; i++)
                iowrite8(dev->dev_addr[i], ioaddr + i);
-#ifdef __sparc__
-        if (print_info)
-                printk(", IRQ %s\n", __irq_itoa(dev->irq));
-#else
        if (print_info)
                printk(", IRQ %d\n", dev->irq);
        /* Tell them about an invalid IRQ. */
        if (dev->irq <= 0 || dev->irq >= NR_IRQS)
                printk(KERN_WARNING " *** Warning: IRQ %d is unlikely to work! ***\n",
                           dev->irq);
-#endif
        EL3WINDOW(4);
        step = (ioread8(ioaddr + Wn4_NetDiag) & 0x1e) >> 1;
@@ -1413,8 +1240,10 @@ static int __devinit vortex_probe1(struct device *gendev,
                }
                if (print_info) {
-                        printk(KERN_INFO "%s: CardBus functions mapped %8.8lx->%p\n",
+                        printk(KERN_INFO "%s: CardBus functions mapped "
-                                print_name, pci_resource_start(pdev, 2),
+                                "%16.16llx->%p\n",
+                                print_name,
+                                (unsigned long long)pci_resource_start(pdev, 2),
                                vp->cb_fn_base);
                }
                EL3WINDOW(2);
@@ -1838,7 +1667,7 @@ vortex_open(struct net_device *dev)
        /* Use the now-standard shared IRQ implementation. */
        if ((retval = request_irq(dev->irq, vp->full_bus_master_rx ?
-                                &boomerang_interrupt : &vortex_interrupt, SA_SHIRQ, dev->name, dev))) {
+                                &boomerang_interrupt : &vortex_interrupt, IRQF_SHARED, dev->name, dev))) {
                printk(KERN_ERR "%s: Could not reserve IRQ %d\n", dev->name, dev->irq);
                goto out;
        }
@@ -1902,7 +1731,7 @@ vortex_timer(unsigned long data)
                printk(KERN_DEBUG "dev->watchdog_timeo=%d\n", dev->watchdog_timeo);
        }
-        disable_irq(dev->irq);
+        disable_irq_lockdep(dev->irq);
        old_window = ioread16(ioaddr + EL3_CMD) >> 13;
        EL3WINDOW(4);
        media_status = ioread16(ioaddr + Wn4_Media);
@@ -1983,7 +1812,7 @@ leave_media_alone:
                         dev->name, media_tbl[dev->if_port].name);
        EL3WINDOW(old_window);
-        enable_irq(dev->irq);
+        enable_irq_lockdep(dev->irq);
        mod_timer(&vp->timer, RUN_AT(next_tick));
        if (vp->deferred)
                iowrite16(FakeIntr, ioaddr + EL3_CMD);
diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c
index 46d8c01437e9..d2150baa7e35 100644
--- a/drivers/net/8139cp.c
+++ b/drivers/net/8139cp.c
@@ -52,7 +52,6 @@
 #define DRV_RELDATE             "Mar 22, 2004"
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/kernel.h>
@@ -401,6 +400,11 @@ static void cp_clean_rings (struct cp_private *cp);
 #ifdef CONFIG_NET_POLL_CONTROLLER
 static void cp_poll_controller(struct net_device *dev);
 #endif
+static int cp_get_eeprom_len(struct net_device *dev);
+static int cp_get_eeprom(struct net_device *dev,
+                         struct ethtool_eeprom *eeprom, u8 *data);
+static int cp_set_eeprom(struct net_device *dev,
+                         struct ethtool_eeprom *eeprom, u8 *data);
 static struct pci_device_id cp_pci_tbl[] = {
        { PCI_VENDOR_ID_REALTEK, PCI_DEVICE_ID_REALTEK_8139,
@@ -792,7 +796,7 @@ static int cp_start_xmit (struct sk_buff *skb, struct net_device *dev)
        entry = cp->tx_head;
        eor = (entry == (CP_TX_RING_SIZE - 1)) ? RingEnd : 0;
        if (dev->features & NETIF_F_TSO)
-                mss = skb_shinfo(skb)->tso_size;
+                mss = skb_shinfo(skb)->gso_size;
        if (skb_shinfo(skb)->nr_frags == 0) {
                struct cp_desc *txd = &cp->tx_ring[entry];
@@ -1199,7 +1203,7 @@ static int cp_open (struct net_device *dev)
        cp_init_hw(cp);
-        rc = request_irq(dev->irq, cp_interrupt, SA_SHIRQ, dev->name, dev);
+        rc = request_irq(dev->irq, cp_interrupt, IRQF_SHARED, dev->name, dev);
        if (rc)
                goto err_out_hw;
@@ -1577,6 +1581,9 @@ static struct ethtool_ops cp_ethtool_ops = {
        .get_strings            = cp_get_strings,
        .get_ethtool_stats      = cp_get_ethtool_stats,
        .get_perm_addr          = ethtool_op_get_perm_addr,
+        .get_eeprom_len         = cp_get_eeprom_len,
+        .get_eeprom             = cp_get_eeprom,
+        .set_eeprom             = cp_set_eeprom,
 };
 static int cp_ioctl (struct net_device *dev, struct ifreq *rq, int cmd)
@@ -1612,24 +1619,32 @@ static int cp_ioctl (struct net_device *dev, struct ifreq *rq, int cmd)
 #define eeprom_delay()  readl(ee_addr)
 /* The EEPROM commands include the alway-set leading bit. */
+#define EE_EXTEND_CMD   (4)
 #define EE_WRITE_CMD    (5)
 #define EE_READ_CMD             (6)
 #define EE_ERASE_CMD    (7)
-static int read_eeprom (void __iomem *ioaddr, int location, int addr_len)
+#define EE_EWDS_ADDR    (0)
-{
+#define EE_WRAL_ADDR    (1)
-        int i;
+#define EE_ERAL_ADDR    (2)
-        unsigned retval = 0;
+#define EE_EWEN_ADDR    (3)
-        void __iomem *ee_addr = ioaddr + Cfg9346;
-        int read_cmd = location | (EE_READ_CMD << addr_len);
+#define CP_EEPROM_MAGIC PCI_DEVICE_ID_REALTEK_8139
+static void eeprom_cmd_start(void __iomem *ee_addr)
+{
        writeb (EE_ENB & ~EE_CS, ee_addr);
        writeb (EE_ENB, ee_addr);
        eeprom_delay ();
+}
-        /* Shift the read command bits out. */
+static void eeprom_cmd(void __iomem *ee_addr, int cmd, int cmd_len)
-        for (i = 4 + addr_len; i >= 0; i--) {
+{
-                int dataval = (read_cmd & (1 << i)) ? EE_DATA_WRITE : 0;
+        int i;
+        /* Shift the command bits out. */
+        for (i = cmd_len - 1; i >= 0; i--) {
+                int dataval = (cmd & (1 << i)) ? EE_DATA_WRITE : 0;
                writeb (EE_ENB | dataval, ee_addr);
                eeprom_delay ();
                writeb (EE_ENB | dataval | EE_SHIFT_CLK, ee_addr);
@@ -1637,6 +1652,33 @@ static int read_eeprom (void __iomem *ioaddr, int location, int addr_len)
        }
        writeb (EE_ENB, ee_addr);
        eeprom_delay ();
+}
+static void eeprom_cmd_end(void __iomem *ee_addr)
+{
+        writeb (~EE_CS, ee_addr);
+        eeprom_delay ();
+}
+static void eeprom_extend_cmd(void __iomem *ee_addr, int extend_cmd,
+                              int addr_len)
+{
+        int cmd = (EE_EXTEND_CMD << addr_len) | (extend_cmd << (addr_len - 2));
+        eeprom_cmd_start(ee_addr);
+        eeprom_cmd(ee_addr, cmd, 3 + addr_len);
+        eeprom_cmd_end(ee_addr);
+}
+static u16 read_eeprom (void __iomem *ioaddr, int location, int addr_len)
+{
+        int i;
+        u16 retval = 0;
+        void __iomem *ee_addr = ioaddr + Cfg9346;
+        int read_cmd = location | (EE_READ_CMD << addr_len);
+        eeprom_cmd_start(ee_addr);
+        eeprom_cmd(ee_addr, read_cmd, 3 + addr_len);
        for (i = 16; i > 0; i--) {
                writeb (EE_ENB | EE_SHIFT_CLK, ee_addr);
@@ -1648,13 +1690,125 @@ static int read_eeprom (void __iomem *ioaddr, int location, int addr_len)
                eeprom_delay ();
        }
-        /* Terminate the EEPROM access. */
+        eeprom_cmd_end(ee_addr);
-        writeb (~EE_CS, ee_addr);
-        eeprom_delay ();
        return retval;
 }
+static void write_eeprom(void __iomem *ioaddr, int location, u16 val,
+                         int addr_len)
+{
+        int i;
+        void __iomem *ee_addr = ioaddr + Cfg9346;
+        int write_cmd = location | (EE_WRITE_CMD << addr_len);
+        eeprom_extend_cmd(ee_addr, EE_EWEN_ADDR, addr_len);
+        eeprom_cmd_start(ee_addr);
+        eeprom_cmd(ee_addr, write_cmd, 3 + addr_len);
+        eeprom_cmd(ee_addr, val, 16);
+        eeprom_cmd_end(ee_addr);
+        eeprom_cmd_start(ee_addr);
+        for (i = 0; i < 20000; i++)
+                if (readb(ee_addr) & EE_DATA_READ)
+                        break;
+        eeprom_cmd_end(ee_addr);
+        eeprom_extend_cmd(ee_addr, EE_EWDS_ADDR, addr_len);
+}
+static int cp_get_eeprom_len(struct net_device *dev)
+{
+        struct cp_private *cp = netdev_priv(dev);
+        int size;
+        spin_lock_irq(&cp->lock);
+        size = read_eeprom(cp->regs, 0, 8) == 0x8129 ? 256 : 128;
+        spin_unlock_irq(&cp->lock);
+        return size;
+}
+static int cp_get_eeprom(struct net_device *dev,
+                         struct ethtool_eeprom *eeprom, u8 *data)
+{
+        struct cp_private *cp = netdev_priv(dev);
+        unsigned int addr_len;
+        u16 val;
+        u32 offset = eeprom->offset >> 1;
+        u32 len = eeprom->len;
+        u32 i = 0;
+        eeprom->magic = CP_EEPROM_MAGIC;
+        spin_lock_irq(&cp->lock);
+        addr_len = read_eeprom(cp->regs, 0, 8) == 0x8129 ? 8 : 6;
+        if (eeprom->offset & 1) {
+                val = read_eeprom(cp->regs, offset, addr_len);
+                data[i++] = (u8)(val >> 8);
+                offset++;
+        }
+        while (i < len - 1) {
+                val = read_eeprom(cp->regs, offset, addr_len);
+                data[i++] = (u8)val;
+                data[i++] = (u8)(val >> 8);
+                offset++;
+        }
+        if (i < len) {
+                val = read_eeprom(cp->regs, offset, addr_len);
+                data[i] = (u8)val;
+        }
+        spin_unlock_irq(&cp->lock);
+        return 0;
+}
+static int cp_set_eeprom(struct net_device *dev,
+                         struct ethtool_eeprom *eeprom, u8 *data)
+{
+        struct cp_private *cp = netdev_priv(dev);
+        unsigned int addr_len;
+        u16 val;
+        u32 offset = eeprom->offset >> 1;
+        u32 len = eeprom->len;
+        u32 i = 0;
+        if (eeprom->magic != CP_EEPROM_MAGIC)
+                return -EINVAL;
+        spin_lock_irq(&cp->lock);
+        addr_len = read_eeprom(cp->regs, 0, 8) == 0x8129 ? 8 : 6;
+        if (eeprom->offset & 1) {
+                val = read_eeprom(cp->regs, offset, addr_len) & 0xff;
+                val |= (u16)data[i++] << 8;
+                write_eeprom(cp->regs, offset, val, addr_len);
+                offset++;
+        }
+        while (i < len - 1) {
+                val = (u16)data[i++];
+                val |= (u16)data[i++] << 8;
+                write_eeprom(cp->regs, offset, val, addr_len);
+                offset++;
+        }
+        if (i < len) {
+                val = read_eeprom(cp->regs, offset, addr_len) & 0xff00;
+                val |= (u16)data[i];
+                write_eeprom(cp->regs, offset, val, addr_len);
+        }
+        spin_unlock_irq(&cp->lock);
+        return 0;
+}
 /* Put the board into D3cold state and wait for WakeUp signal */
 static void cp_set_d3_state (struct cp_private *cp)
 {
@@ -1668,7 +1822,7 @@ static int cp_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
        struct cp_private *cp;
        int rc;
        void __iomem *regs;
-        long pciaddr;
+        resource_size_t pciaddr;
        unsigned int addr_len, i, pci_using_dac;
        u8 pci_rev;
@@ -1682,9 +1836,10 @@ static int cp_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
        if (pdev->vendor == PCI_VENDOR_ID_REALTEK &&
            pdev->device == PCI_DEVICE_ID_REALTEK_8139 && pci_rev < 0x20) {
-                printk(KERN_ERR PFX "pci dev %s (id %04x:%04x rev %02x) is not an 8139C+ compatible chip\n",
+                dev_err(&pdev->dev,
-                       pci_name(pdev), pdev->vendor, pdev->device, pci_rev);
+                           "This (id %04x:%04x rev %02x) is not an 8139C+ compatible chip\n",
-                printk(KERN_ERR PFX "Try the \"8139too\" driver instead.\n");
+                           pdev->vendor, pdev->device, pci_rev);
+                dev_err(&pdev->dev, "Try the \"8139too\" driver instead.\n");
                return -ENODEV;
        }
@@ -1722,14 +1877,13 @@ static int cp_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
        pciaddr = pci_resource_start(pdev, 1);
        if (!pciaddr) {
                rc = -EIO;
-                printk(KERN_ERR PFX "no MMIO resource for pci dev %s\n",
+                dev_err(&pdev->dev, "no MMIO resource\n");
-                       pci_name(pdev));
                goto err_out_res;
        }
        if (pci_resource_len(pdev, 1) < CP_REGS_SIZE) {
                rc = -EIO;
-                printk(KERN_ERR PFX "MMIO resource (%lx) too small on pci dev %s\n",
+                dev_err(&pdev->dev, "MMIO resource (%llx) too small\n",
-                       pci_resource_len(pdev, 1), pci_name(pdev));
+                       (unsigned long long)pci_resource_len(pdev, 1));
                goto err_out_res;
        }
@@ -1743,14 +1897,15 @@ static int cp_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
                rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
                if (rc) {
-                        printk(KERN_ERR PFX "No usable DMA configuration, "
+                        dev_err(&pdev->dev,
-                               "aborting.\n");
+                                   "No usable DMA configuration, aborting.\n");
                        goto err_out_res;
                }
                rc = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);
                if (rc) {
-                        printk(KERN_ERR PFX "No usable consistent DMA configuration, "
+                        dev_err(&pdev->dev,
-                               "aborting.\n");
+                                   "No usable consistent DMA configuration, "
+                                   "aborting.\n");
                        goto err_out_res;
                }
        }
@@ -1761,8 +1916,9 @@ static int cp_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
        regs = ioremap(pciaddr, CP_REGS_SIZE);
        if (!regs) {
                rc = -EIO;
-                printk(KERN_ERR PFX "Cannot map PCI MMIO (%lx@%lx) on pci dev %s\n",
+                dev_err(&pdev->dev, "Cannot map PCI MMIO (%lx@%lx)\n",
-                       pci_resource_len(pdev, 1), pciaddr, pci_name(pdev));
+                       (unsigned long long)pci_resource_len(pdev, 1),
+                       (unsigned long long)pciaddr);
                goto err_out_res;
        }
        dev->base_addr = (unsigned long) regs;
@@ -1831,7 +1987,8 @@ static int cp_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
        /* enable busmastering and memory-write-invalidate */
        pci_set_master(pdev);
-        if (cp->wol_enabled) cp_set_d3_state (cp);
+        if (cp->wol_enabled)
+                cp_set_d3_state (cp);
        return 0;
@@ -1856,7 +2013,8 @@ static void cp_remove_one (struct pci_dev *pdev)
        BUG_ON(!dev);
        unregister_netdev(dev);
        iounmap(cp->regs);
-        if (cp->wol_enabled) pci_set_power_state (pdev, PCI_D0);
+        if (cp->wol_enabled)
+                pci_set_power_state (pdev, PCI_D0);
        pci_release_regions(pdev);
        pci_clear_mwi(pdev);
        pci_disable_device(pdev);
diff --git a/drivers/net/8139too.c b/drivers/net/8139too.c
index abd6261465f1..e4f4eaff7679 100644
--- a/drivers/net/8139too.c
+++ b/drivers/net/8139too.c
@@ -93,7 +93,6 @@
 #define DRV_VERSION     "0.9.27"
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/compiler.h>
@@ -769,7 +768,7 @@ static int __devinit rtl8139_init_board (struct pci_dev *pdev,
        /* dev and priv zeroed in alloc_etherdev */
        dev = alloc_etherdev (sizeof (*tp));
        if (dev == NULL) {
-                printk (KERN_ERR PFX "%s: Unable to alloc new net device\n", pci_name(pdev));
+                dev_err(&pdev->dev, "Unable to alloc new net device\n");
                return -ENOMEM;
        }
        SET_MODULE_OWNER(dev);
@@ -801,31 +800,31 @@ static int __devinit rtl8139_init_board (struct pci_dev *pdev,
 #ifdef USE_IO_OPS
        /* make sure PCI base addr 0 is PIO */
        if (!(pio_flags & IORESOURCE_IO)) {
-                printk (KERN_ERR PFX "%s: region #0 not a PIO resource, aborting\n", pci_name(pdev));
+                dev_err(&pdev->dev, "region #0 not a PIO resource, aborting\n");
                rc = -ENODEV;
                goto err_out;
        }
        /* check for weird/broken PCI region reporting */
        if (pio_len < RTL_MIN_IO_SIZE) {
-                printk (KERN_ERR PFX "%s: Invalid PCI I/O region size(s), aborting\n", pci_name(pdev));
+                dev_err(&pdev->dev, "Invalid PCI I/O region size(s), aborting\n");
                rc = -ENODEV;
                goto err_out;
        }
 #else
        /* make sure PCI base addr 1 is MMIO */
        if (!(mmio_flags & IORESOURCE_MEM)) {
-                printk (KERN_ERR PFX "%s: region #1 not an MMIO resource, aborting\n", pci_name(pdev));
+                dev_err(&pdev->dev, "region #1 not an MMIO resource, aborting\n");
                rc = -ENODEV;
                goto err_out;
        }
        if (mmio_len < RTL_MIN_IO_SIZE) {
-                printk (KERN_ERR PFX "%s: Invalid PCI mem region size(s), aborting\n", pci_name(pdev));
+                dev_err(&pdev->dev, "Invalid PCI mem region size(s), aborting\n");
                rc = -ENODEV;
                goto err_out;
        }
 #endif
-        rc = pci_request_regions (pdev, "8139too");
+        rc = pci_request_regions (pdev, DRV_NAME);
        if (rc)
                goto err_out;
        disable_dev_on_err = 1;
@@ -836,7 +835,7 @@ static int __devinit rtl8139_init_board (struct pci_dev *pdev,
 #ifdef USE_IO_OPS
        ioaddr = ioport_map(pio_start, pio_len);
        if (!ioaddr) {
-                printk (KERN_ERR PFX "%s: cannot map PIO, aborting\n", pci_name(pdev));
+                dev_err(&pdev->dev, "cannot map PIO, aborting\n");
                rc = -EIO;
                goto err_out;
        }
@@ -847,7 +846,7 @@ static int __devinit rtl8139_init_board (struct pci_dev *pdev,
        /* ioremap MMIO region */
        ioaddr = pci_iomap(pdev, 1, 0);
        if (ioaddr == NULL) {
-                printk (KERN_ERR PFX "%s: cannot remap MMIO, aborting\n", pci_name(pdev));
+                dev_err(&pdev->dev, "cannot remap MMIO, aborting\n");
                rc = -EIO;
                goto err_out;
        }
@@ -861,8 +860,7 @@ static int __devinit rtl8139_init_board (struct pci_dev *pdev,
        /* check for missing/broken hardware */
        if (RTL_R32 (TxConfig) == 0xFFFFFFFF) {
-                printk (KERN_ERR PFX "%s: Chip not responding, ignoring board\n",
+                dev_err(&pdev->dev, "Chip not responding, ignoring board\n");
-                        pci_name(pdev));
                rc = -EIO;
                goto err_out;
        }
@@ -876,9 +874,10 @@ static int __devinit rtl8139_init_board (struct pci_dev *pdev,
                }
        /* if unknown chip, assume array element #0, original RTL-8139 in this case */
-        printk (KERN_DEBUG PFX "%s: unknown chip version, assuming RTL-8139\n",
+        dev_printk (KERN_DEBUG, &pdev->dev,
-                pci_name(pdev));
+                    "unknown chip version, assuming RTL-8139\n");
-        printk (KERN_DEBUG PFX "%s: TxConfig = 0x%lx\n", pci_name(pdev), RTL_R32 (TxConfig));
+        dev_printk (KERN_DEBUG, &pdev->dev,
+                    "TxConfig = 0x%lx\n", RTL_R32 (TxConfig));
        tp->chipset = 0;
 match:
@@ -955,9 +954,11 @@ static int __devinit rtl8139_init_one (struct pci_dev *pdev,
        if (pdev->vendor == PCI_VENDOR_ID_REALTEK &&
            pdev->device == PCI_DEVICE_ID_REALTEK_8139 && pci_rev >= 0x20) {
-                printk(KERN_INFO PFX "pci dev %s (id %04x:%04x rev %02x) is an enhanced 8139C+ chip\n",
+                dev_info(&pdev->dev,
-                       pci_name(pdev), pdev->vendor, pdev->device, pci_rev);
+                           "This (id %04x:%04x rev %02x) is an enhanced 8139C+ chip\n",
-                printk(KERN_INFO PFX "Use the \"8139cp\" driver for improved performance and stability.\n");
+                           pdev->vendor, pdev->device, pci_rev);
+                dev_info(&pdev->dev,
+                           "Use the \"8139cp\" driver for improved performance and stability.\n");
        }
        i = rtl8139_init_board (pdev, &dev);
@@ -1311,7 +1312,7 @@ static int rtl8139_open (struct net_device *dev)
        int retval;
        void __iomem *ioaddr = tp->mmio_addr;
-        retval = request_irq (dev->irq, rtl8139_interrupt, SA_SHIRQ, dev->name, dev);
+        retval = request_irq (dev->irq, rtl8139_interrupt, IRQF_SHARED, dev->name, dev);
        if (retval)
                return retval;
@@ -1341,9 +1342,9 @@ static int rtl8139_open (struct net_device *dev)
        netif_start_queue (dev);
        if (netif_msg_ifup(tp))
-                printk(KERN_DEBUG "%s: rtl8139_open() ioaddr %#lx IRQ %d"
+                printk(KERN_DEBUG "%s: rtl8139_open() ioaddr %#llx IRQ %d"
-                        " GP Pins %2.2x %s-duplex.\n",
+                        " GP Pins %2.2x %s-duplex.\n", dev->name,
-                        dev->name, pci_resource_start (tp->pci_dev, 1),
+                        (unsigned long long)pci_resource_start (tp->pci_dev, 1),
                        dev->irq, RTL_R8 (MediaStatus),
                        tp->mii.full_duplex ? "full" : "half");
@@ -1708,6 +1709,7 @@ static int rtl8139_start_xmit (struct sk_buff *skb, struct net_device *dev)
        void __iomem *ioaddr = tp->mmio_addr;
        unsigned int entry;
        unsigned int len = skb->len;
+        unsigned long flags;
        /* Calculate the next Tx descriptor entry. */
        entry = tp->cur_tx % NUM_TX_DESC;
@@ -1724,7 +1726,7 @@ static int rtl8139_start_xmit (struct sk_buff *skb, struct net_device *dev)
                return 0;
        }
-        spin_lock_irq(&tp->lock);
+        spin_lock_irqsave(&tp->lock, flags);
        RTL_W32_F (TxStatus0 + (entry * sizeof (u32)),
                   tp->tx_flag | max(len, (unsigned int)ETH_ZLEN));
@@ -1735,7 +1737,7 @@ static int rtl8139_start_xmit (struct sk_buff *skb, struct net_device *dev)
        if ((tp->cur_tx - NUM_TX_DESC) == tp->dirty_tx)
                netif_stop_queue (dev);
-        spin_unlock_irq(&tp->lock);
+        spin_unlock_irqrestore(&tp->lock, flags);
        if (netif_msg_tx_queued(tp))
                printk (KERN_DEBUG "%s: Queued Tx packet size %u to slot %d.\n",
diff --git a/drivers/net/82596.c b/drivers/net/82596.c
index da0c878dcba8..7e2ca9571467 100644
--- a/drivers/net/82596.c
+++ b/drivers/net/82596.c
@@ -40,7 +40,6 @@
 */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
@@ -1070,8 +1069,7 @@ static int i596_start_xmit(struct sk_buff *skb, struct net_device *dev)
                                skb->len, (unsigned int)skb->data));
        if (skb->len < ETH_ZLEN) {
-                skb = skb_padto(skb, ETH_ZLEN);
+                if (skb_padto(skb, ETH_ZLEN))
-                if (skb == NULL)
                        return 0;
                length = ETH_ZLEN;
        }
diff --git a/drivers/net/8390.c b/drivers/net/8390.c
index f87027420081..d2935ae39814 100644
--- a/drivers/net/8390.c
+++ b/drivers/net/8390.c
@@ -249,7 +249,7 @@ void ei_tx_timeout(struct net_device *dev)
        /* Ugly but a reset can be slow, yet must be protected */
                
-        disable_irq_nosync(dev->irq);
+        disable_irq_nosync_lockdep(dev->irq);
        spin_lock(&ei_local->page_lock);
                
        /* Try to restart the card.  Perhaps the user has fixed something. */
@@ -257,7 +257,7 @@ void ei_tx_timeout(struct net_device *dev)
        NS8390_init(dev, 1);
                
        spin_unlock(&ei_local->page_lock);
-        enable_irq(dev->irq);
+        enable_irq_lockdep(dev->irq);
        netif_wake_queue(dev);
 }
    
@@ -275,12 +275,14 @@ static int ei_start_xmit(struct sk_buff *skb, struct net_device *dev)
        struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev);
        int send_length = skb->len, output_page;
        unsigned long flags;
+        char buf[ETH_ZLEN];
+        char *data = skb->data;
        if (skb->len < ETH_ZLEN) {
-                skb = skb_padto(skb, ETH_ZLEN);
+                memset(buf, 0, ETH_ZLEN);       /* more efficient than doing just the needed bits */
-                if (skb == NULL)
+                memcpy(buf, data, skb->len);
-                        return 0;
                send_length = ETH_ZLEN;
+                data = buf;
        }
        /* Mask interrupts from the ethercard. 
@@ -347,7 +349,7 @@ static int ei_start_xmit(struct sk_buff *skb, struct net_device *dev)
         * trigger the send later, upon receiving a Tx done interrupt.
         */
         
-        ei_block_output(dev, send_length, skb->data, output_page);
+        ei_block_output(dev, send_length, data, output_page);
                
        if (! ei_local->txing) 
        {
diff --git a/drivers/net/8390.h b/drivers/net/8390.h
index 51e39dcd0603..a9a58f518f45 100644
--- a/drivers/net/8390.h
+++ b/drivers/net/8390.h
@@ -7,7 +7,6 @@
 #ifndef _8390_h
 #define _8390_h
-#include <linux/config.h>
 #include <linux/if_ether.h>
 #include <linux/ioport.h>
 #include <linux/skbuff.h>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 0c6b45a11d15..39189903e355 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -854,6 +854,17 @@ config SMC9194
          <file:Documentation/networking/net-modules.txt>. The module
          will be called smc9194.
+config NET_NETX
+        tristate "NetX Ethernet support"
+        select MII
+        depends on NET_ETHERNET && ARCH_NETX
+        help
+          This is support for the Hilscher netX builtin Ethernet ports
+          To compile this driver as a module, choose M here and read
+          <file:Documentation/networking/net-modules.txt>. The module
+          will be called netx-eth.
 config DM9000
        tristate "DM9000 support"
        depends on (ARM || MIPS) && NET_ETHERNET
@@ -1376,8 +1387,8 @@ config APRICOT
          called apricot.
 config B44
-        tristate "Broadcom 4400 ethernet support (EXPERIMENTAL)"
+        tristate "Broadcom 4400 ethernet support"
-        depends on NET_PCI && PCI && EXPERIMENTAL
+        depends on NET_PCI && PCI
        select MII
        help
          If you have a network (Ethernet) controller of this type, say Y and
@@ -2190,7 +2201,7 @@ config BNX2
 config SPIDER_NET
        tristate "Spider Gigabit Ethernet driver"
-        depends on PCI && PPC_CELL
+        depends on PCI && PPC_IBM_CELL_BLADE
        select FW_LOADER
        help
          This driver supports the Gigabit Ethernet chips present on the
@@ -2198,11 +2209,11 @@ config SPIDER_NET
 config GIANFAR
        tristate "Gianfar Ethernet"
-        depends on 85xx || 83xx
+        depends on 85xx || 83xx || PPC_86xx
        select PHYLIB
        help
-          This driver supports the Gigabit TSEC on the MPC85xx 
+          This driver supports the Gigabit TSEC on the MPC83xx, MPC85xx,
-          family of chips, and the FEC on the 8540
+          and MPC86xx family of chips, and the FEC on the 8540.
 config GFAR_NAPI
        bool "NAPI Support"
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 1eced3287507..c91e95126f78 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -187,6 +187,7 @@ obj-$(CONFIG_MACSONIC) += macsonic.o
 obj-$(CONFIG_MACMACE) += macmace.o
 obj-$(CONFIG_MAC89x0) += mac89x0.o
 obj-$(CONFIG_TUN) += tun.o
+obj-$(CONFIG_NET_NETX) += netx-eth.o
 obj-$(CONFIG_DL2K) += dl2k.o
 obj-$(CONFIG_R8169) += r8169.o
 obj-$(CONFIG_AMD8111_ETH) += amd8111e.o
diff --git a/drivers/net/Space.c b/drivers/net/Space.c
index 60304f7e7e5b..a8c245a82261 100644
--- a/drivers/net/Space.c
+++ b/drivers/net/Space.c
@@ -27,7 +27,6 @@
 *              as published by the Free Software Foundation; either version
 *              2 of the License, or (at your option) any later version.
 */
-#include <linux/config.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/trdevice.h>
diff --git a/drivers/net/a2065.c b/drivers/net/a2065.c
index 79bb56b8dcef..f4ea62641acd 100644
--- a/drivers/net/a2065.c
+++ b/drivers/net/a2065.c
@@ -48,7 +48,6 @@
 #include <linux/skbuff.h>
 #include <linux/slab.h>
 #include <linux/string.h>
-#include <linux/config.h>
 #include <linux/init.h>
 #include <linux/crc32.h>
 #include <linux/zorro.h>
@@ -496,7 +495,7 @@ static int lance_open (struct net_device *dev)
        ll->rdp = LE_C0_STOP;
        /* Install the Interrupt handler */
-        ret = request_irq(IRQ_AMIGA_PORTS, lance_interrupt, SA_SHIRQ,
+        ret = request_irq(IRQ_AMIGA_PORTS, lance_interrupt, IRQF_SHARED,
                          dev->name, dev);
        if (ret) return ret;
@@ -573,8 +572,7 @@ static int lance_start_xmit (struct sk_buff *skb, struct net_device *dev)
        
        if (len < ETH_ZLEN) {
                len = ETH_ZLEN;
-                skb = skb_padto(skb, ETH_ZLEN);
+                if (skb_padto(skb, ETH_ZLEN))
-                if (skb == NULL)
                        return 0;
        }
diff --git a/drivers/net/acenic.c b/drivers/net/acenic.c
index b508812e97ac..1c01e9b3d07c 100644
--- a/drivers/net/acenic.c
+++ b/drivers/net/acenic.c
@@ -50,7 +50,6 @@
 *   Grant Grundler <grundler@cup.hp.com>: PCI write posting fixes.
 */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/version.h>
@@ -579,11 +578,7 @@ static int __devinit acenic_probe_one(struct pci_dev *pdev,
        }
        printk("Gigabit Ethernet at 0x%08lx, ", dev->base_addr);
-#ifdef __sparc__
+        printk("irq %d\n", pdev->irq);
-        printk("irq %s\n", __irq_itoa(pdev->irq));
-#else
-        printk("irq %i\n", pdev->irq);
-#endif
 #ifdef CONFIG_ACENIC_OMIT_TIGON_I
        if ((readl(&ap->regs->HostCtrl) >> 28) == 4) {
@@ -1199,7 +1194,7 @@ static int __devinit ace_init(struct net_device *dev)
                goto init_error;
        }
-        ecode = request_irq(pdev->irq, ace_interrupt, SA_SHIRQ,
+        ecode = request_irq(pdev->irq, ace_interrupt, IRQF_SHARED,
                            DRV_NAME, dev);
        if (ecode) {
                printk(KERN_WARNING "%s: Requested IRQ %d is busy\n",
diff --git a/drivers/net/acenic.h b/drivers/net/acenic.h
index a97107023495..62ec8ceee698 100644
--- a/drivers/net/acenic.h
+++ b/drivers/net/acenic.h
@@ -1,7 +1,6 @@
 #ifndef _ACENIC_H_
 #define _ACENIC_H_
-#include <linux/config.h>
 /*
 * Generate TX index update each time, when TX ring is closed.
diff --git a/drivers/net/acenic_firmware.h b/drivers/net/acenic_firmware.h
index d7882dd783c8..ec146f60d77b 100644
--- a/drivers/net/acenic_firmware.h
+++ b/drivers/net/acenic_firmware.h
@@ -1,4 +1,3 @@
-#include <linux/config.h>
 /*
 * Declare these here even if Tigon I support is disabled to avoid
 * the compiler complaining about undefined symbols.
diff --git a/drivers/net/amd8111e.c b/drivers/net/amd8111e.c
index d9ba8be72af8..ed322a76980d 100644
--- a/drivers/net/amd8111e.c
+++ b/drivers/net/amd8111e.c
@@ -69,7 +69,6 @@ Revision History:
 */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
@@ -1377,7 +1376,7 @@ static int amd8111e_open(struct net_device * dev )
 {
        struct amd8111e_priv *lp = netdev_priv(dev);
-        if(dev->irq ==0 || request_irq(dev->irq, amd8111e_interrupt, SA_SHIRQ,
+        if(dev->irq ==0 || request_irq(dev->irq, amd8111e_interrupt, IRQF_SHARED,
                                         dev->name, dev)) 
                return -EAGAIN;
diff --git a/drivers/net/apne.c b/drivers/net/apne.c
index b9820b86cdcc..9cc13a0250d6 100644
--- a/drivers/net/apne.c
+++ b/drivers/net/apne.c
@@ -313,7 +313,7 @@ static int __init apne_probe1(struct net_device *dev, int ioaddr)
    dev->base_addr = ioaddr;
    /* Install the Interrupt handler */
-    i = request_irq(IRQ_AMIGA_PORTS, apne_interrupt, SA_SHIRQ, DRV_NAME, dev);
+    i = request_irq(IRQ_AMIGA_PORTS, apne_interrupt, IRQF_SHARED, DRV_NAME, dev);
    if (i) return i;
    for(i = 0; i < ETHER_ADDR_LEN; i++) {
diff --git a/drivers/net/appletalk/cops.c b/drivers/net/appletalk/cops.c
index 9edaa183227a..1d01ac0000e4 100644
--- a/drivers/net/appletalk/cops.c
+++ b/drivers/net/appletalk/cops.c
@@ -48,7 +48,6 @@ static const char *version =
 *        the driver figure it out.
 */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
diff --git a/drivers/net/appletalk/cops_ffdrv.h b/drivers/net/appletalk/cops_ffdrv.h
index 31cf8c9c947f..b02005087c1b 100644
--- a/drivers/net/appletalk/cops_ffdrv.h
+++ b/drivers/net/appletalk/cops_ffdrv.h
@@ -24,7 +24,6 @@
 *      - Jay Schulist <jschlst@samba.org>
 */
-#include <linux/config.h>
 #ifdef CONFIG_COPS_DAYNA
diff --git a/drivers/net/appletalk/cops_ltdrv.h b/drivers/net/appletalk/cops_ltdrv.h
index 4afb8e18ba65..c699b1ad31da 100644
--- a/drivers/net/appletalk/cops_ltdrv.h
+++ b/drivers/net/appletalk/cops_ltdrv.h
@@ -23,7 +23,6 @@
 *      - Jay Schulist <jschlst@samba.org>
 */
 
-#include <linux/config.h>
 #ifdef CONFIG_COPS_TANGENT
diff --git a/drivers/net/appletalk/ipddp.c b/drivers/net/appletalk/ipddp.c
index 1a44a79ed064..7f7dd450226a 100644
--- a/drivers/net/appletalk/ipddp.c
+++ b/drivers/net/appletalk/ipddp.c
@@ -23,7 +23,6 @@
 *      of the GNU General Public License, incorporated herein by reference.
 */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
diff --git a/drivers/net/arcnet/arcnet.c b/drivers/net/arcnet/arcnet.c
index fabc0607b0f1..5a95005253fa 100644
--- a/drivers/net/arcnet/arcnet.c
+++ b/drivers/net/arcnet/arcnet.c
@@ -44,7 +44,6 @@
 #define VERSION "arcnet: v3.93 BETA 2000/04/29 - by Avery Pennarun et al.\n"
 #include <linux/module.h>
-#include <linux/config.h>
 #include <linux/types.h>
 #include <linux/delay.h>
 #include <linux/netdevice.h>
diff --git a/drivers/net/arcnet/com20020-pci.c b/drivers/net/arcnet/com20020-pci.c
index 96636ca8754e..979a33df0a8c 100644
--- a/drivers/net/arcnet/com20020-pci.c
+++ b/drivers/net/arcnet/com20020-pci.c
@@ -120,7 +120,7 @@ static int __devinit com20020pci_probe(struct pci_dev *pdev, const struct pci_de
                goto out_port;
        }
-        if ((err = com20020_found(dev, SA_SHIRQ)) != 0)
+        if ((err = com20020_found(dev, IRQF_SHARED)) != 0)
                goto out_port;
        return 0;
diff --git a/drivers/net/ariadne.c b/drivers/net/ariadne.c
index d1b6b1f794e2..cc721addd576 100644
--- a/drivers/net/ariadne.c
+++ b/drivers/net/ariadne.c
@@ -320,7 +320,7 @@ static int ariadne_open(struct net_device *dev)
    netif_start_queue(dev);
-    i = request_irq(IRQ_AMIGA_PORTS, ariadne_interrupt, SA_SHIRQ,
+    i = request_irq(IRQ_AMIGA_PORTS, ariadne_interrupt, IRQF_SHARED,
                    dev->name, dev);
    if (i) return i;
@@ -607,8 +607,7 @@ static int ariadne_start_xmit(struct sk_buff *skb, struct net_device *dev)
    /* FIXME: is the 79C960 new enough to do its own padding right ? */
    if (skb->len < ETH_ZLEN)
    {
-        skb = skb_padto(skb, ETH_ZLEN);
+        if (skb_padto(skb, ETH_ZLEN))
-        if (skb == NULL)
            return 0;
        len = ETH_ZLEN;
    }
diff --git a/drivers/net/arm/at91_ether.c b/drivers/net/arm/at91_ether.c
index 5503dc8a66e4..85493b7b924f 100644
--- a/drivers/net/arm/at91_ether.c
+++ b/drivers/net/arm/at91_ether.c
@@ -19,7 +19,6 @@
 #include <linux/module.h>
 #include <linux/init.h>
-#include <linux/config.h>
 #include <linux/mii.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
@@ -43,7 +42,9 @@
 #define DRV_VERSION     "1.0"
 static struct net_device *at91_dev;
-static struct clk *ether_clk;
+static struct timer_list check_timer;
+#define LINK_POLL_INTERVAL      (HZ)
 /* ..................................................................... */
@@ -143,7 +144,7 @@ static void read_phy(unsigned char phy_addr, unsigned char address, unsigned int
 * MAC accordingly.
 * If no link or auto-negotiation is busy, then no changes are made.
 */
-static void update_linkspeed(struct net_device *dev)
+static void update_linkspeed(struct net_device *dev, int silent)
 {
        struct at91_private *lp = (struct at91_private *) dev->priv;
        unsigned int bmsr, bmcr, lpa, mac_cfg;
@@ -151,7 +152,8 @@ static void update_linkspeed(struct net_device *dev)
        if (!mii_link_ok(&lp->mii)) {           /* no link */
                netif_carrier_off(dev);
-                printk(KERN_INFO "%s: Link down.\n", dev->name);
+                if (!silent)
+                        printk(KERN_INFO "%s: Link down.\n", dev->name);
                return;
        }
@@ -186,7 +188,8 @@ static void update_linkspeed(struct net_device *dev)
        }
        at91_emac_write(AT91_EMAC_CFG, mac_cfg);
-        printk(KERN_INFO "%s: Link now %i-%s\n", dev->name, speed, (duplex == DUPLEX_FULL) ? "FullDuplex" : "HalfDuplex");
+        if (!silent)
+                printk(KERN_INFO "%s: Link now %i-%s\n", dev->name, speed, (duplex == DUPLEX_FULL) ? "FullDuplex" : "HalfDuplex");
        netif_carrier_on(dev);
 }
@@ -226,7 +229,7 @@ static irqreturn_t at91ether_phy_interrupt(int irq, void *dev_id, struct pt_regs
                        goto done;
        }
-        update_linkspeed(dev);
+        update_linkspeed(dev, 0);
 done:
        disable_mdi();
@@ -243,14 +246,17 @@ static void enable_phyirq(struct net_device *dev)
        unsigned int dsintr, irq_number;
        int status;
-        if (lp->phy_type == MII_RTL8201_ID)     /* RTL8201 does not have an interrupt */
+        irq_number = lp->board_data.phy_irq_pin;
-                return;
+        if (!irq_number) {
-        if (lp->phy_type == MII_DP83847_ID)     /* DP83847 does not have an interrupt */
+                /*
-                return;
+                 * PHY doesn't have an IRQ pin (RTL8201, DP83847, AC101L),
-        if (lp->phy_type == MII_AC101L_ID)      /* AC101L interrupt not supported yet */
+                 * or board does not have it connected.
+                 */
+                check_timer.expires = jiffies + LINK_POLL_INTERVAL;
+                add_timer(&check_timer);
                return;
+        }
-        irq_number = lp->board_data.phy_irq_pin;
        status = request_irq(irq_number, at91ether_phy_interrupt, 0, dev->name, dev);
        if (status) {
                printk(KERN_ERR "at91_ether: PHY IRQ %d request failed - status %d!\n", irq_number, status);
@@ -292,12 +298,11 @@ static void disable_phyirq(struct net_device *dev)
        unsigned int dsintr;
        unsigned int irq_number;
-        if (lp->phy_type == MII_RTL8201_ID)     /* RTL8201 does not have an interrupt */
+        irq_number = lp->board_data.phy_irq_pin;
-                return;
+        if (!irq_number) {
-        if (lp->phy_type == MII_DP83847_ID)     /* DP83847 does not have an interrupt */
+                del_timer_sync(&check_timer);
-                return;
-        if (lp->phy_type == MII_AC101L_ID)      /* AC101L interrupt not supported yet */
                return;
+        }
        spin_lock_irq(&lp->lock);
        enable_mdi();
@@ -326,7 +331,6 @@ static void disable_phyirq(struct net_device *dev)
        disable_mdi();
        spin_unlock_irq(&lp->lock);
-        irq_number = lp->board_data.phy_irq_pin;
        free_irq(irq_number, dev);                      /* Free interrupt handler */
 }
@@ -355,6 +359,18 @@ static void reset_phy(struct net_device *dev)
 }
 #endif
+static void at91ether_check_link(unsigned long dev_id)
+{
+        struct net_device *dev = (struct net_device *) dev_id;
+        enable_mdi();
+        update_linkspeed(dev, 1);
+        disable_mdi();
+        check_timer.expires = jiffies + LINK_POLL_INTERVAL;
+        add_timer(&check_timer);
+}
 /* ......................... ADDRESS MANAGEMENT ........................ */
 /*
@@ -501,7 +517,7 @@ static int hash_get_index(__u8 *addr)
                hash_index |= (bitval << j);
        }
-        return hash_index;
+        return hash_index;
 }
 /*
@@ -557,10 +573,8 @@ static void at91ether_set_rx_mode(struct net_device *dev)
        at91_emac_write(AT91_EMAC_CFG, cfg);
 }
 /* ......................... ETHTOOL SUPPORT ........................... */
 static int mdio_read(struct net_device *dev, int phy_id, int location)
 {
        unsigned int value;
@@ -642,6 +656,22 @@ static struct ethtool_ops at91ether_ethtool_ops = {
        .get_link       = ethtool_op_get_link,
 };
+static int at91ether_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
+{
+        struct at91_private *lp = (struct at91_private *) dev->priv;
+        int res;
+        if (!netif_running(dev))
+                return -EINVAL;
+        spin_lock_irq(&lp->lock);
+        enable_mdi();
+        res = generic_mii_ioctl(&lp->mii, if_mii(rq), cmd, NULL);
+        disable_mdi();
+        spin_unlock_irq(&lp->lock);
+        return res;
+}
 /* ................................ MAC ................................ */
@@ -685,10 +715,10 @@ static int at91ether_open(struct net_device *dev)
        struct at91_private *lp = (struct at91_private *) dev->priv;
        unsigned long ctl;
-        if (!is_valid_ether_addr(dev->dev_addr))
+        if (!is_valid_ether_addr(dev->dev_addr))
-                return -EADDRNOTAVAIL;
+                return -EADDRNOTAVAIL;
-        clk_enable(ether_clk);                  /* Re-enable Peripheral clock */
+        clk_enable(lp->ether_clk);              /* Re-enable Peripheral clock */
        /* Clear internal statistics */
        ctl = at91_emac_read(AT91_EMAC_CTL);
@@ -708,7 +738,7 @@ static int at91ether_open(struct net_device *dev)
        /* Determine current link speed */
        spin_lock_irq(&lp->lock);
        enable_mdi();
-        update_linkspeed(dev);
+        update_linkspeed(dev, 0);
        disable_mdi();
        spin_unlock_irq(&lp->lock);
@@ -722,6 +752,7 @@ static int at91ether_open(struct net_device *dev)
 */
 static int at91ether_close(struct net_device *dev)
 {
+        struct at91_private *lp = (struct at91_private *) dev->priv;
        unsigned long ctl;
        /* Disable Receiver and Transmitter */
@@ -738,7 +769,7 @@ static int at91ether_close(struct net_device *dev)
        netif_stop_queue(dev);
-        clk_disable(ether_clk);                 /* Disable Peripheral clock */
+        clk_disable(lp->ether_clk);             /* Disable Peripheral clock */
        return 0;
 }
@@ -870,7 +901,7 @@ static irqreturn_t at91ether_interrupt(int irq, void *dev_id, struct pt_regs *re
        if (intstatus & AT91_EMAC_RCOM)         /* Receive complete */
                at91ether_rx(dev);
-        if (intstatus & AT91_EMAC_TCOM) {               /* Transmit complete */
+        if (intstatus & AT91_EMAC_TCOM) {       /* Transmit complete */
                /* The TCOM bit is set even if the transmission failed. */
                if (intstatus & (AT91_EMAC_TUND | AT91_EMAC_RTRY))
                        lp->stats.tx_errors += 1;
@@ -899,7 +930,8 @@ static irqreturn_t at91ether_interrupt(int irq, void *dev_id, struct pt_regs *re
 /*
 * Initialize the ethernet interface
 */
-static int __init at91ether_setup(unsigned long phy_type, unsigned short phy_address, struct platform_device *pdev)
+static int __init at91ether_setup(unsigned long phy_type, unsigned short phy_address,
+                        struct platform_device *pdev, struct clk *ether_clk)
 {
        struct at91_eth_data *board_data = pdev->dev.platform_data;
        struct net_device *dev;
@@ -933,6 +965,7 @@ static int __init at91ether_setup(unsigned long phy_type, unsigned short phy_add
                return -ENOMEM;
        }
        lp->board_data = *board_data;
+        lp->ether_clk = ether_clk;
        platform_set_drvdata(pdev, dev);
        spin_lock_init(&lp->lock);
@@ -945,6 +978,7 @@ static int __init at91ether_setup(unsigned long phy_type, unsigned short phy_add
        dev->set_multicast_list = at91ether_set_rx_mode;
        dev->set_mac_address = set_mac_address;
        dev->ethtool_ops = &at91ether_ethtool_ops;
+        dev->do_ioctl = at91ether_ioctl;
        SET_NETDEV_DEV(dev, &pdev->dev);
@@ -975,6 +1009,9 @@ static int __init at91ether_setup(unsigned long phy_type, unsigned short phy_add
        lp->mii.dev = dev;              /* Support for ethtool */
        lp->mii.mdio_read = mdio_read;
        lp->mii.mdio_write = mdio_write;
+        lp->mii.phy_id = phy_address;
+        lp->mii.phy_id_mask = 0x1f;
+        lp->mii.reg_num_mask = 0x1f;
        lp->phy_type = phy_type;        /* Type of PHY connected */
        lp->phy_address = phy_address;  /* MDI address of PHY */
@@ -992,11 +1029,18 @@ static int __init at91ether_setup(unsigned long phy_type, unsigned short phy_add
        /* Determine current link speed */
        spin_lock_irq(&lp->lock);
        enable_mdi();
-        update_linkspeed(dev);
+        update_linkspeed(dev, 0);
        disable_mdi();
        spin_unlock_irq(&lp->lock);
        netif_carrier_off(dev);         /* will be enabled in open() */
+        /* If board has no PHY IRQ, use a timer to poll the PHY */
+        if (!lp->board_data.phy_irq_pin) {
+                init_timer(&check_timer);
+                check_timer.data = (unsigned long)dev;
+                check_timer.function = at91ether_check_link;
+        }
        /* Display ethernet banner */
        printk(KERN_INFO "%s: AT91 ethernet at 0x%08x int=%d %s%s (%02x:%02x:%02x:%02x:%02x:%02x)\n",
                dev->name, (uint) dev->base_addr, dev->irq,
@@ -1005,7 +1049,7 @@ static int __init at91ether_setup(unsigned long phy_type, unsigned short phy_add
                dev->dev_addr[0], dev->dev_addr[1], dev->dev_addr[2],
                dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5]);
        if ((phy_type == MII_DM9161_ID) || (lp->phy_type == MII_DM9161A_ID))
-                printk(KERN_INFO "%s: Davicom 9196 PHY %s\n", dev->name, (lp->phy_media == PORT_FIBRE) ? "(Fiber)" : "(Copper)");
+                printk(KERN_INFO "%s: Davicom 9161 PHY %s\n", dev->name, (lp->phy_media == PORT_FIBRE) ? "(Fiber)" : "(Copper)");
        else if (phy_type == MII_LXT971A_ID)
                printk(KERN_INFO "%s: Intel LXT971A PHY\n", dev->name);
        else if (phy_type == MII_RTL8201_ID)
@@ -1031,9 +1075,10 @@ static int __init at91ether_probe(struct platform_device *pdev)
        int detected = -1;
        unsigned long phy_id;
        unsigned short phy_address = 0;
+        struct clk *ether_clk;
        ether_clk = clk_get(&pdev->dev, "ether_clk");
-        if (!ether_clk) {
+        if (IS_ERR(ether_clk)) {
                printk(KERN_ERR "at91_ether: no clock defined\n");
                return -ENODEV;
        }
@@ -1056,7 +1101,7 @@ static int __init at91ether_probe(struct platform_device *pdev)
                        case MII_DP83847_ID:            /* National Semiconductor DP83847:  */
                        case MII_AC101L_ID:             /* Altima AC101L: PHY_ID1 = 0x22, PHY_ID2 = 0x5520 */
                        case MII_KS8721_ID:             /* Micrel KS8721: PHY_ID1 = 0x22, PHY_ID2 = 0x1610 */
-                                detected = at91ether_setup(phy_id, phy_address, pdev);
+                                detected = at91ether_setup(phy_id, phy_address, pdev, ether_clk);
                                break;
                }
@@ -1075,17 +1120,61 @@ static int __devexit at91ether_remove(struct platform_device *pdev)
        unregister_netdev(at91_dev);
        free_irq(at91_dev->irq, at91_dev);
        dma_free_coherent(NULL, sizeof(struct recv_desc_bufs), lp->dlist, (dma_addr_t)lp->dlist_phys);
-        clk_put(ether_clk);
+        clk_put(lp->ether_clk);
        free_netdev(at91_dev);
        at91_dev = NULL;
        return 0;
 }
+#ifdef CONFIG_PM
+static int at91ether_suspend(struct platform_device *pdev, pm_message_t mesg)
+{
+        struct at91_private *lp = (struct at91_private *) at91_dev->priv;
+        struct net_device *net_dev = platform_get_drvdata(pdev);
+        int phy_irq = lp->board_data.phy_irq_pin;
+        if (netif_running(net_dev)) {
+                if (phy_irq)
+                        disable_irq(phy_irq);
+                netif_stop_queue(net_dev);
+                netif_device_detach(net_dev);
+                clk_disable(lp->ether_clk);
+        }
+        return 0;
+}
+static int at91ether_resume(struct platform_device *pdev)
+{
+        struct at91_private *lp = (struct at91_private *) at91_dev->priv;
+        struct net_device *net_dev = platform_get_drvdata(pdev);
+        int phy_irq = lp->board_data.phy_irq_pin;
+        if (netif_running(net_dev)) {
+                clk_enable(lp->ether_clk);
+                netif_device_attach(net_dev);
+                netif_start_queue(net_dev);
+                if (phy_irq)
+                        enable_irq(phy_irq);
+        }
+        return 0;
+}
+#else
+#define at91ether_suspend       NULL
+#define at91ether_resume        NULL
+#endif
 static struct platform_driver at91ether_driver = {
        .probe          = at91ether_probe,
        .remove         = __devexit_p(at91ether_remove),
-        /* FIXME:  support suspend and resume */
+        .suspend        = at91ether_suspend,
+        .resume         = at91ether_resume,
        .driver         = {
                .name   = DRV_NAME,
                .owner  = THIS_MODULE,
diff --git a/drivers/net/arm/at91_ether.h b/drivers/net/arm/at91_ether.h
index 9885735c9c8a..d1e72e02be3a 100644
--- a/drivers/net/arm/at91_ether.h
+++ b/drivers/net/arm/at91_ether.h
@@ -80,6 +80,7 @@ struct at91_private
        struct net_device_stats stats;
        struct mii_if_info mii;                 /* ethtool support */
        struct at91_eth_data board_data;        /* board-specific configuration */
+        struct clk *ether_clk;                  /* clock */
        /* PHY */
        unsigned long phy_type;                 /* type of PHY (PHY_ID) */
diff --git a/drivers/net/arm/ether1.c b/drivers/net/arm/ether1.c
index 36475eb2727f..312955d07b28 100644
--- a/drivers/net/arm/ether1.c
+++ b/drivers/net/arm/ether1.c
@@ -700,8 +700,7 @@ ether1_sendpacket (struct sk_buff *skb, struct net_device *dev)
        }
        if (skb->len < ETH_ZLEN) {
-                skb = skb_padto(skb, ETH_ZLEN);
+                if (skb_padto(skb, ETH_ZLEN))
-                if (skb == NULL)
                        goto out;
        }
diff --git a/drivers/net/arm/ether3.c b/drivers/net/arm/ether3.c
index f1d5b1027ff7..081074180e62 100644
--- a/drivers/net/arm/ether3.c
+++ b/drivers/net/arm/ether3.c
@@ -518,8 +518,7 @@ ether3_sendpacket(struct sk_buff *skb, struct net_device *dev)
        length = (length + 1) & ~1;
        if (length != skb->len) {
-                skb = skb_padto(skb, length);
+                if (skb_padto(skb, length))
-                if (skb == NULL)
                        goto out;
        }
diff --git a/drivers/net/at1700.c b/drivers/net/at1700.c
index e613cc289749..5d7929c79bce 100644
--- a/drivers/net/at1700.c
+++ b/drivers/net/at1700.c
@@ -35,7 +35,6 @@
        response to inb()s from other device probes!
 */
-#include <linux/config.h>
 #include <linux/errno.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
diff --git a/drivers/net/atarilance.c b/drivers/net/atarilance.c
index 442b2cbeb58a..91783a8008be 100644
--- a/drivers/net/atarilance.c
+++ b/drivers/net/atarilance.c
@@ -804,8 +804,7 @@ static int lance_start_xmit( struct sk_buff *skb, struct net_device *dev )
                ++len;
                
        if (len > skb->len) {
-                skb = skb_padto(skb, len);
+                if (skb_padto(skb, len))
-                if (skb == NULL)
                        return 0;
        }
                
diff --git a/drivers/net/au1000_eth.c b/drivers/net/au1000_eth.c
index 038d5fcb15e6..55f6e3f65b53 100644
--- a/drivers/net/au1000_eth.c
+++ b/drivers/net/au1000_eth.c
@@ -35,7 +35,6 @@
 * 
 */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
diff --git a/drivers/net/b44.c b/drivers/net/b44.c
index d8233e0b7899..bea0fc0ede2f 100644
--- a/drivers/net/b44.c
+++ b/drivers/net/b44.c
@@ -29,8 +29,8 @@
 #define DRV_MODULE_NAME         "b44"
 #define PFX DRV_MODULE_NAME     ": "
-#define DRV_MODULE_VERSION      "1.00"
+#define DRV_MODULE_VERSION      "1.01"
-#define DRV_MODULE_RELDATE      "Apr 7, 2006"
+#define DRV_MODULE_RELDATE      "Jun 16, 2006"
 #define B44_DEF_MSG_ENABLE        \
        (NETIF_MSG_DRV          | \
@@ -75,6 +75,15 @@
 /* minimum number of free TX descriptors required to wake up TX process */
 #define B44_TX_WAKEUP_THRESH            (B44_TX_RING_SIZE / 4)
+/* b44 internal pattern match filter info */
+#define B44_PATTERN_BASE        0x400
+#define B44_PATTERN_SIZE        0x80
+#define B44_PMASK_BASE          0x600
+#define B44_PMASK_SIZE          0x10
+#define B44_MAX_PATTERNS        16
+#define B44_ETHIPV6UDP_HLEN     62
+#define B44_ETHIPV4UDP_HLEN     42
 static char version[] __devinitdata =
        DRV_MODULE_NAME ".c:v" DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n";
@@ -101,7 +110,7 @@ MODULE_DEVICE_TABLE(pci, b44_pci_tbl);
 static void b44_halt(struct b44 *);
 static void b44_init_rings(struct b44 *);
-static void b44_init_hw(struct b44 *);
+static void b44_init_hw(struct b44 *, int);
 static int dma_desc_align_mask;
 static int dma_desc_sync_size;
@@ -873,7 +882,7 @@ static int b44_poll(struct net_device *netdev, int *budget)
                spin_lock_irq(&bp->lock);
                b44_halt(bp);
                b44_init_rings(bp);
-                b44_init_hw(bp);
+                b44_init_hw(bp, 1);
                netif_wake_queue(bp->dev);
                spin_unlock_irq(&bp->lock);
                done = 1;
@@ -942,7 +951,7 @@ static void b44_tx_timeout(struct net_device *dev)
        b44_halt(bp);
        b44_init_rings(bp);
-        b44_init_hw(bp);
+        b44_init_hw(bp, 1);
        spin_unlock_irq(&bp->lock);
@@ -1059,7 +1068,7 @@ static int b44_change_mtu(struct net_device *dev, int new_mtu)
        b44_halt(bp);
        dev->mtu = new_mtu;
        b44_init_rings(bp);
-        b44_init_hw(bp);
+        b44_init_hw(bp, 1);
        spin_unlock_irq(&bp->lock);
        b44_enable_ints(bp);
@@ -1356,13 +1365,15 @@ static int b44_set_mac_addr(struct net_device *dev, void *p)
 * packet processing.  Invoked with bp->lock held.
 */
 static void __b44_set_rx_mode(struct net_device *);
-static void b44_init_hw(struct b44 *bp)
+static void b44_init_hw(struct b44 *bp, int full_reset)
 {
        u32 val;
        b44_chip_reset(bp);
-        b44_phy_reset(bp);
+        if (full_reset) {
-        b44_setup_phy(bp);
+                b44_phy_reset(bp);
+                b44_setup_phy(bp);
+        }
        /* Enable CRC32, set proper LED modes and power on PHY */
        bw32(bp, B44_MAC_CTRL, MAC_CTRL_CRC32_ENAB | MAC_CTRL_PHY_LEDCTRL);
@@ -1376,16 +1387,21 @@ static void b44_init_hw(struct b44 *bp)
        bw32(bp, B44_TXMAXLEN, bp->dev->mtu + ETH_HLEN + 8 + RX_HEADER_LEN);
        bw32(bp, B44_TX_WMARK, 56); /* XXX magic */
-        bw32(bp, B44_DMATX_CTRL, DMATX_CTRL_ENABLE);
+        if (full_reset) {
-        bw32(bp, B44_DMATX_ADDR, bp->tx_ring_dma + bp->dma_offset);
+                bw32(bp, B44_DMATX_CTRL, DMATX_CTRL_ENABLE);
-        bw32(bp, B44_DMARX_CTRL, (DMARX_CTRL_ENABLE |
+                bw32(bp, B44_DMATX_ADDR, bp->tx_ring_dma + bp->dma_offset);
-                              (bp->rx_offset << DMARX_CTRL_ROSHIFT)));
+                bw32(bp, B44_DMARX_CTRL, (DMARX_CTRL_ENABLE |
-        bw32(bp, B44_DMARX_ADDR, bp->rx_ring_dma + bp->dma_offset);
+                                      (bp->rx_offset << DMARX_CTRL_ROSHIFT)));
+                bw32(bp, B44_DMARX_ADDR, bp->rx_ring_dma + bp->dma_offset);
-        bw32(bp, B44_DMARX_PTR, bp->rx_pending);
+                bw32(bp, B44_DMARX_PTR, bp->rx_pending);
-        bp->rx_prod = bp->rx_pending;
+                bp->rx_prod = bp->rx_pending;
-        bw32(bp, B44_MIB_CTRL, MIB_CTRL_CLR_ON_READ);
+                bw32(bp, B44_MIB_CTRL, MIB_CTRL_CLR_ON_READ);
+        } else {
+                bw32(bp, B44_DMARX_CTRL, (DMARX_CTRL_ENABLE |
+                                      (bp->rx_offset << DMARX_CTRL_ROSHIFT)));
+        }
        val = br32(bp, B44_ENET_CTRL);
        bw32(bp, B44_ENET_CTRL, (val | ENET_CTRL_ENABLE));
@@ -1401,11 +1417,11 @@ static int b44_open(struct net_device *dev)
                goto out;
        b44_init_rings(bp);
-        b44_init_hw(bp);
+        b44_init_hw(bp, 1);
        b44_check_phy(bp);
-        err = request_irq(dev->irq, b44_interrupt, SA_SHIRQ, dev->name, dev);
+        err = request_irq(dev->irq, b44_interrupt, IRQF_SHARED, dev->name, dev);
        if (unlikely(err < 0)) {
                b44_chip_reset(bp);
                b44_free_rings(bp);
@@ -1450,6 +1466,140 @@ static void b44_poll_controller(struct net_device *dev)
 }
 #endif
+static void bwfilter_table(struct b44 *bp, u8 *pp, u32 bytes, u32 table_offset)
+{
+        u32 i;
+        u32 *pattern = (u32 *) pp;
+        for (i = 0; i < bytes; i += sizeof(u32)) {
+                bw32(bp, B44_FILT_ADDR, table_offset + i);
+                bw32(bp, B44_FILT_DATA, pattern[i / sizeof(u32)]);
+        }
+}
+static int b44_magic_pattern(u8 *macaddr, u8 *ppattern, u8 *pmask, int offset)
+{
+        int magicsync = 6;
+        int k, j, len = offset;
+        int ethaddr_bytes = ETH_ALEN;
+        memset(ppattern + offset, 0xff, magicsync);
+        for (j = 0; j < magicsync; j++)
+                set_bit(len++, (unsigned long *) pmask);
+        for (j = 0; j < B44_MAX_PATTERNS; j++) {
+                if ((B44_PATTERN_SIZE - len) >= ETH_ALEN)
+                        ethaddr_bytes = ETH_ALEN;
+                else
+                        ethaddr_bytes = B44_PATTERN_SIZE - len;
+                if (ethaddr_bytes <=0)
+                        break;
+                for (k = 0; k< ethaddr_bytes; k++) {
+                        ppattern[offset + magicsync +
+                                (j * ETH_ALEN) + k] = macaddr[k];
+                        len++;
+                        set_bit(len, (unsigned long *) pmask);
+                }
+        }
+        return len - 1;
+}
+/* Setup magic packet patterns in the b44 WOL
+ * pattern matching filter.
+ */
+static void b44_setup_pseudo_magicp(struct b44 *bp)
+{
+        u32 val;
+        int plen0, plen1, plen2;
+        u8 *pwol_pattern;
+        u8 pwol_mask[B44_PMASK_SIZE];
+        pwol_pattern = kmalloc(B44_PATTERN_SIZE, GFP_KERNEL);
+        if (!pwol_pattern) {
+                printk(KERN_ERR PFX "Memory not available for WOL\n");
+                return;
+        }
+        /* Ipv4 magic packet pattern - pattern 0.*/
+        memset(pwol_pattern, 0, B44_PATTERN_SIZE);
+        memset(pwol_mask, 0, B44_PMASK_SIZE);
+        plen0 = b44_magic_pattern(bp->dev->dev_addr, pwol_pattern, pwol_mask,
+                                  B44_ETHIPV4UDP_HLEN);
+        bwfilter_table(bp, pwol_pattern, B44_PATTERN_SIZE, B44_PATTERN_BASE);
+        bwfilter_table(bp, pwol_mask, B44_PMASK_SIZE, B44_PMASK_BASE);
+        /* Raw ethernet II magic packet pattern - pattern 1 */
+        memset(pwol_pattern, 0, B44_PATTERN_SIZE);
+        memset(pwol_mask, 0, B44_PMASK_SIZE);
+        plen1 = b44_magic_pattern(bp->dev->dev_addr, pwol_pattern, pwol_mask,
+                                  ETH_HLEN);
+        bwfilter_table(bp, pwol_pattern, B44_PATTERN_SIZE,
+                       B44_PATTERN_BASE + B44_PATTERN_SIZE);
+        bwfilter_table(bp, pwol_mask, B44_PMASK_SIZE,
+                       B44_PMASK_BASE + B44_PMASK_SIZE);
+        /* Ipv6 magic packet pattern - pattern 2 */
+        memset(pwol_pattern, 0, B44_PATTERN_SIZE);
+        memset(pwol_mask, 0, B44_PMASK_SIZE);
+        plen2 = b44_magic_pattern(bp->dev->dev_addr, pwol_pattern, pwol_mask,
+                                  B44_ETHIPV6UDP_HLEN);
+        bwfilter_table(bp, pwol_pattern, B44_PATTERN_SIZE,
+                       B44_PATTERN_BASE + B44_PATTERN_SIZE + B44_PATTERN_SIZE);
+        bwfilter_table(bp, pwol_mask, B44_PMASK_SIZE,
+                       B44_PMASK_BASE + B44_PMASK_SIZE + B44_PMASK_SIZE);
+        kfree(pwol_pattern);
+        /* set these pattern's lengths: one less than each real length */
+        val = plen0 | (plen1 << 8) | (plen2 << 16) | WKUP_LEN_ENABLE_THREE;
+        bw32(bp, B44_WKUP_LEN, val);
+        /* enable wakeup pattern matching */
+        val = br32(bp, B44_DEVCTRL);
+        bw32(bp, B44_DEVCTRL, val | DEVCTRL_PFE);
+}
+static void b44_setup_wol(struct b44 *bp)
+{
+        u32 val;
+        u16 pmval;
+        bw32(bp, B44_RXCONFIG, RXCONFIG_ALLMULTI);
+        if (bp->flags & B44_FLAG_B0_ANDLATER) {
+                bw32(bp, B44_WKUP_LEN, WKUP_LEN_DISABLE);
+                val = bp->dev->dev_addr[2] << 24 |
+                        bp->dev->dev_addr[3] << 16 |
+                        bp->dev->dev_addr[4] << 8 |
+                        bp->dev->dev_addr[5];
+                bw32(bp, B44_ADDR_LO, val);
+                val = bp->dev->dev_addr[0] << 8 |
+                        bp->dev->dev_addr[1];
+                bw32(bp, B44_ADDR_HI, val);
+                val = br32(bp, B44_DEVCTRL);
+                bw32(bp, B44_DEVCTRL, val | DEVCTRL_MPM | DEVCTRL_PFE);
+        } else {
+                b44_setup_pseudo_magicp(bp);
+        }
+        val = br32(bp, B44_SBTMSLOW);
+        bw32(bp, B44_SBTMSLOW, val | SBTMSLOW_PE);
+        pci_read_config_word(bp->pdev, SSB_PMCSR, &pmval);
+        pci_write_config_word(bp->pdev, SSB_PMCSR, pmval | SSB_PE);
+}
 static int b44_close(struct net_device *dev)
 {
        struct b44 *bp = netdev_priv(dev);
@@ -1475,6 +1625,11 @@ static int b44_close(struct net_device *dev)
        netif_poll_enable(dev);
+        if (bp->flags & B44_FLAG_WOL_ENABLE) {
+                b44_init_hw(bp, 0);
+                b44_setup_wol(bp);
+        }
        b44_free_consistent(bp);
        return 0;
@@ -1620,8 +1775,6 @@ static int b44_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 {
        struct b44 *bp = netdev_priv(dev);
-        if (!netif_running(dev))
-                return -EAGAIN;
        cmd->supported = (SUPPORTED_Autoneg);
        cmd->supported |= (SUPPORTED_100baseT_Half |
                          SUPPORTED_100baseT_Full |
@@ -1649,6 +1802,12 @@ static int b44_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
                XCVR_INTERNAL : XCVR_EXTERNAL;
        cmd->autoneg = (bp->flags & B44_FLAG_FORCE_LINK) ?
                AUTONEG_DISABLE : AUTONEG_ENABLE;
+        if (cmd->autoneg == AUTONEG_ENABLE)
+                cmd->advertising |= ADVERTISED_Autoneg;
+        if (!netif_running(dev)){
+                cmd->speed = 0;
+                cmd->duplex = 0xff;
+        }
        cmd->maxtxpkt = 0;
        cmd->maxrxpkt = 0;
        return 0;
@@ -1658,9 +1817,6 @@ static int b44_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 {
        struct b44 *bp = netdev_priv(dev);
-        if (!netif_running(dev))
-                return -EAGAIN;
        /* We do not support gigabit. */
        if (cmd->autoneg == AUTONEG_ENABLE) {
                if (cmd->advertising &
@@ -1677,28 +1833,39 @@ static int b44_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
        spin_lock_irq(&bp->lock);
        if (cmd->autoneg == AUTONEG_ENABLE) {
-                bp->flags &= ~B44_FLAG_FORCE_LINK;
+                bp->flags &= ~(B44_FLAG_FORCE_LINK |
-                bp->flags &= ~(B44_FLAG_ADV_10HALF |
+                               B44_FLAG_100_BASE_T |
+                               B44_FLAG_FULL_DUPLEX |
+                               B44_FLAG_ADV_10HALF |
                               B44_FLAG_ADV_10FULL |
                               B44_FLAG_ADV_100HALF |
                               B44_FLAG_ADV_100FULL);
-                if (cmd->advertising & ADVERTISE_10HALF)
+                if (cmd->advertising == 0) {
-                        bp->flags |= B44_FLAG_ADV_10HALF;
+                        bp->flags |= (B44_FLAG_ADV_10HALF |
-                if (cmd->advertising & ADVERTISE_10FULL)
+                                      B44_FLAG_ADV_10FULL |
-                        bp->flags |= B44_FLAG_ADV_10FULL;
+                                      B44_FLAG_ADV_100HALF |
-                if (cmd->advertising & ADVERTISE_100HALF)
+                                      B44_FLAG_ADV_100FULL);
-                        bp->flags |= B44_FLAG_ADV_100HALF;
+                } else {
-                if (cmd->advertising & ADVERTISE_100FULL)
+                        if (cmd->advertising & ADVERTISED_10baseT_Half)
-                        bp->flags |= B44_FLAG_ADV_100FULL;
+                                bp->flags |= B44_FLAG_ADV_10HALF;
+                        if (cmd->advertising & ADVERTISED_10baseT_Full)
+                                bp->flags |= B44_FLAG_ADV_10FULL;
+                        if (cmd->advertising & ADVERTISED_100baseT_Half)
+                                bp->flags |= B44_FLAG_ADV_100HALF;
+                        if (cmd->advertising & ADVERTISED_100baseT_Full)
+                                bp->flags |= B44_FLAG_ADV_100FULL;
+                }
        } else {
                bp->flags |= B44_FLAG_FORCE_LINK;
+                bp->flags &= ~(B44_FLAG_100_BASE_T | B44_FLAG_FULL_DUPLEX);
                if (cmd->speed == SPEED_100)
                        bp->flags |= B44_FLAG_100_BASE_T;
                if (cmd->duplex == DUPLEX_FULL)
                        bp->flags |= B44_FLAG_FULL_DUPLEX;
        }
-        b44_setup_phy(bp);
+        if (netif_running(dev))
+                b44_setup_phy(bp);
        spin_unlock_irq(&bp->lock);
@@ -1734,7 +1901,7 @@ static int b44_set_ringparam(struct net_device *dev,
        b44_halt(bp);
        b44_init_rings(bp);
-        b44_init_hw(bp);
+        b44_init_hw(bp, 1);
        netif_wake_queue(bp->dev);
        spin_unlock_irq(&bp->lock);
@@ -1777,7 +1944,7 @@ static int b44_set_pauseparam(struct net_device *dev,
        if (bp->flags & B44_FLAG_PAUSE_AUTO) {
                b44_halt(bp);
                b44_init_rings(bp);
-                b44_init_hw(bp);
+                b44_init_hw(bp, 1);
        } else {
                __b44_set_flow_ctrl(bp, bp->flags);
        }
@@ -1819,12 +1986,40 @@ static void b44_get_ethtool_stats(struct net_device *dev,
        spin_unlock_irq(&bp->lock);
 }
+static void b44_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
+{
+        struct b44 *bp = netdev_priv(dev);
+        wol->supported = WAKE_MAGIC;
+        if (bp->flags & B44_FLAG_WOL_ENABLE)
+                wol->wolopts = WAKE_MAGIC;
+        else
+                wol->wolopts = 0;
+        memset(&wol->sopass, 0, sizeof(wol->sopass));
+}
+static int b44_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
+{
+        struct b44 *bp = netdev_priv(dev);
+        spin_lock_irq(&bp->lock);
+        if (wol->wolopts & WAKE_MAGIC)
+                bp->flags |= B44_FLAG_WOL_ENABLE;
+        else
+                bp->flags &= ~B44_FLAG_WOL_ENABLE;
+        spin_unlock_irq(&bp->lock);
+        return 0;
+}
 static struct ethtool_ops b44_ethtool_ops = {
        .get_drvinfo            = b44_get_drvinfo,
        .get_settings           = b44_get_settings,
        .set_settings           = b44_set_settings,
        .nway_reset             = b44_nway_reset,
        .get_link               = ethtool_op_get_link,
+        .get_wol                = b44_get_wol,
+        .set_wol                = b44_set_wol,
        .get_ringparam          = b44_get_ringparam,
        .set_ringparam          = b44_set_ringparam,
        .get_pauseparam         = b44_get_pauseparam,
@@ -1903,6 +2098,10 @@ static int __devinit b44_get_invariants(struct b44 *bp)
        /* XXX - really required?
           bp->flags |= B44_FLAG_BUGGY_TXPTR;
         */
+        if (ssb_get_core_rev(bp) >= 7)
+                bp->flags |= B44_FLAG_B0_ANDLATER;
 out:
        return err;
 }
@@ -1921,13 +2120,14 @@ static int __devinit b44_init_one(struct pci_dev *pdev,
        err = pci_enable_device(pdev);
        if (err) {
-                printk(KERN_ERR PFX "Cannot enable PCI device, "
+                dev_err(&pdev->dev, "Cannot enable PCI device, "
                       "aborting.\n");
                return err;
        }
        if (!(pci_resource_flags(pdev, 0) & IORESOURCE_MEM)) {
-                printk(KERN_ERR PFX "Cannot find proper PCI device "
+                dev_err(&pdev->dev,
+                        "Cannot find proper PCI device "
                       "base address, aborting.\n");
                err = -ENODEV;
                goto err_out_disable_pdev;
@@ -1935,8 +2135,8 @@ static int __devinit b44_init_one(struct pci_dev *pdev,
        err = pci_request_regions(pdev, DRV_MODULE_NAME);
        if (err) {
-                printk(KERN_ERR PFX "Cannot obtain PCI resources, "
+                dev_err(&pdev->dev,
-                       "aborting.\n");
+                        "Cannot obtain PCI resources, aborting.\n");
                goto err_out_disable_pdev;
        }
@@ -1944,15 +2144,13 @@ static int __devinit b44_init_one(struct pci_dev *pdev,
        err = pci_set_dma_mask(pdev, (u64) B44_DMA_MASK);
        if (err) {
-                printk(KERN_ERR PFX "No usable DMA configuration, "
+                dev_err(&pdev->dev, "No usable DMA configuration, aborting.\n");
-                       "aborting.\n");
                goto err_out_free_res;
        }
        err = pci_set_consistent_dma_mask(pdev, (u64) B44_DMA_MASK);
        if (err) {
-                printk(KERN_ERR PFX "No usable DMA configuration, "
+                dev_err(&pdev->dev, "No usable DMA configuration, aborting.\n");
-                       "aborting.\n");
                goto err_out_free_res;
        }
@@ -1961,7 +2159,7 @@ static int __devinit b44_init_one(struct pci_dev *pdev,
        dev = alloc_etherdev(sizeof(*bp));
        if (!dev) {
-                printk(KERN_ERR PFX "Etherdev alloc failed, aborting.\n");
+                dev_err(&pdev->dev, "Etherdev alloc failed, aborting.\n");
                err = -ENOMEM;
                goto err_out_free_res;
        }
@@ -1982,8 +2180,7 @@ static int __devinit b44_init_one(struct pci_dev *pdev,
        bp->regs = ioremap(b44reg_base, b44reg_len);
        if (bp->regs == 0UL) {
-                printk(KERN_ERR PFX "Cannot map device registers, "
+                dev_err(&pdev->dev, "Cannot map device registers, aborting.\n");
-                       "aborting.\n");
                err = -ENOMEM;
                goto err_out_free_dev;
        }
@@ -2013,8 +2210,8 @@ static int __devinit b44_init_one(struct pci_dev *pdev,
        err = b44_get_invariants(bp);
        if (err) {
-                printk(KERN_ERR PFX "Problem fetching invariants of chip, "
+                dev_err(&pdev->dev,
-                       "aborting.\n");
+                        "Problem fetching invariants of chip, aborting.\n");
                goto err_out_iounmap;
        }
@@ -2034,8 +2231,7 @@ static int __devinit b44_init_one(struct pci_dev *pdev,
        err = register_netdev(dev);
        if (err) {
-                printk(KERN_ERR PFX "Cannot register net device, "
+                dev_err(&pdev->dev, "Cannot register net device, aborting.\n");
-                       "aborting.\n");
                goto err_out_iounmap;
        }
@@ -2103,6 +2299,10 @@ static int b44_suspend(struct pci_dev *pdev, pm_message_t state)
        spin_unlock_irq(&bp->lock);
        free_irq(dev->irq, dev);
+        if (bp->flags & B44_FLAG_WOL_ENABLE) {
+                b44_init_hw(bp, 0);
+                b44_setup_wol(bp);
+        }
        pci_disable_device(pdev);
        return 0;
 }
@@ -2119,13 +2319,13 @@ static int b44_resume(struct pci_dev *pdev)
        if (!netif_running(dev))
                return 0;
-        if (request_irq(dev->irq, b44_interrupt, SA_SHIRQ, dev->name, dev))
+        if (request_irq(dev->irq, b44_interrupt, IRQF_SHARED, dev->name, dev))
                printk(KERN_ERR PFX "%s: request_irq failed\n", dev->name);
        spin_lock_irq(&bp->lock);
        b44_init_rings(bp);
-        b44_init_hw(bp);
+        b44_init_hw(bp, 1);
        netif_device_attach(bp->dev);
        spin_unlock_irq(&bp->lock);
diff --git a/drivers/net/b44.h b/drivers/net/b44.h
index b178662978f3..4944507fad23 100644
--- a/drivers/net/b44.h
+++ b/drivers/net/b44.h
@@ -24,6 +24,9 @@
 #define  WKUP_LEN_P3_MASK       0x7f000000 /* Pattern 3 */
 #define  WKUP_LEN_P3_SHIFT      24
 #define  WKUP_LEN_D3            0x80000000
+#define  WKUP_LEN_DISABLE       0x80808080
+#define  WKUP_LEN_ENABLE_TWO    0x80800000
+#define  WKUP_LEN_ENABLE_THREE  0x80000000
 #define B44_ISTAT       0x0020UL /* Interrupt Status */
 #define  ISTAT_LS               0x00000020 /* Link Change (B0 only) */
 #define  ISTAT_PME              0x00000040 /* Power Management Event */
@@ -264,6 +267,8 @@
 #define  SBIDHIGH_VC_SHIFT      16
 /* SSB PCI config space registers.  */
+#define SSB_PMCSR               0x44
+#define  SSB_PE                 0x100
 #define SSB_BAR0_WIN            0x80
 #define SSB_BAR1_WIN            0x84
 #define SSB_SPROM_CONTROL       0x88
@@ -420,6 +425,7 @@ struct b44 {
        u32                     dma_offset;
        u32                     flags;
+#define B44_FLAG_B0_ANDLATER    0x00000001
 #define B44_FLAG_BUGGY_TXPTR    0x00000002
 #define B44_FLAG_REORDER_BUG    0x00000004
 #define B44_FLAG_PAUSE_AUTO     0x00008000
@@ -435,6 +441,7 @@ struct b44 {
 #define B44_FLAG_INTERNAL_PHY   0x10000000
 #define B44_FLAG_RX_RING_HACK   0x20000000
 #define B44_FLAG_TX_RING_HACK   0x40000000
+#define B44_FLAG_WOL_ENABLE     0x80000000
        u32                     rx_offset;
diff --git a/drivers/net/bmac.c b/drivers/net/bmac.c
index bbca8ae8018c..6fad83f24c4f 100644
--- a/drivers/net/bmac.c
+++ b/drivers/net/bmac.c
@@ -7,7 +7,6 @@
 * May 1999, Al Viro: proper release of /proc/net/bmac entry, switched to
 * dynamic procfs inode.
 */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/netdevice.h>
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index 702d546567ad..64b6a72b4f6a 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -9,7 +9,6 @@
 * Written by: Michael Chan  (mchan@broadcom.com)
 */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
@@ -57,8 +56,8 @@
 #define DRV_MODULE_NAME         "bnx2"
 #define PFX DRV_MODULE_NAME     ": "
-#define DRV_MODULE_VERSION      "1.4.42"
+#define DRV_MODULE_VERSION      "1.4.43"
-#define DRV_MODULE_RELDATE      "June 12, 2006"
+#define DRV_MODULE_RELDATE      "June 28, 2006"
 #define RUN_AT(x) (jiffies + (x))
@@ -1640,7 +1639,7 @@ bnx2_tx_int(struct bnx2 *bp)
                skb = tx_buf->skb;
 #ifdef BCM_TSO 
                /* partial BD completions possible with TSO packets */
-                if (skb_shinfo(skb)->tso_size) {
+                if (skb_shinfo(skb)->gso_size) {
                        u16 last_idx, last_ring_idx;
                        last_idx = sw_cons +
@@ -1676,7 +1675,7 @@ bnx2_tx_int(struct bnx2 *bp)
                tx_free_bd += last + 1;
-                dev_kfree_skb_irq(skb);
+                dev_kfree_skb(skb);
                hw_cons = bp->hw_tx_cons =
                        sblk->status_tx_quick_consumer_index0;
@@ -1824,7 +1823,7 @@ reuse_rx:
                if ((len > (bp->dev->mtu + ETH_HLEN)) &&
                        (ntohs(skb->protocol) != 0x8100)) {
-                        dev_kfree_skb_irq(skb);
+                        dev_kfree_skb(skb);
                        goto next_rx;
                }
@@ -3643,7 +3642,7 @@ bnx2_free_tx_skbs(struct bnx2 *bp)
                                skb_shinfo(skb)->frags[j].size,
                                PCI_DMA_TODEVICE);
                }
-                dev_kfree_skb_any(skb);
+                dev_kfree_skb(skb);
                i += j + 1;
        }
@@ -3669,7 +3668,7 @@ bnx2_free_rx_skbs(struct bnx2 *bp)
                rx_buf->skb = NULL;
-                dev_kfree_skb_any(skb);
+                dev_kfree_skb(skb);
        }
 }
@@ -3999,7 +3998,7 @@ bnx2_run_loopback(struct bnx2 *bp, int loopback_mode)
        udelay(5);
        pci_unmap_single(bp->pdev, map, pkt_size, PCI_DMA_TODEVICE);
-        dev_kfree_skb_irq(skb);
+        dev_kfree_skb(skb);
        if (bp->status_blk->status_tx_quick_consumer_index0 != bp->tx_prod) {
                goto loopback_test_done;
@@ -4261,11 +4260,11 @@ bnx2_open(struct net_device *dev)
                }
                else {
                        rc = request_irq(bp->pdev->irq, bnx2_interrupt,
-                                        SA_SHIRQ, dev->name, dev);
+                                        IRQF_SHARED, dev->name, dev);
                }
        }
        else {
-                rc = request_irq(bp->pdev->irq, bnx2_interrupt, SA_SHIRQ,
+                rc = request_irq(bp->pdev->irq, bnx2_interrupt, IRQF_SHARED,
                                dev->name, dev);
        }
        if (rc) {
@@ -4312,7 +4311,7 @@ bnx2_open(struct net_device *dev)
                        if (!rc) {
                                rc = request_irq(bp->pdev->irq, bnx2_interrupt,
-                                        SA_SHIRQ, dev->name, dev);
+                                        IRQF_SHARED, dev->name, dev);
                        }
                        if (rc) {
                                bnx2_free_skbs(bp);
@@ -4428,7 +4427,7 @@ bnx2_start_xmit(struct sk_buff *skb, struct net_device *dev)
                        (TX_BD_FLAGS_VLAN_TAG | (vlan_tx_tag_get(skb) << 16));
        }
 #ifdef BCM_TSO 
-        if ((mss = skb_shinfo(skb)->tso_size) &&
+        if ((mss = skb_shinfo(skb)->gso_size) &&
                (skb->len > (bp->dev->mtu + ETH_HLEN))) {
                u32 tcp_opt_len, ip_tcp_len;
@@ -4541,7 +4540,7 @@ bnx2_close(struct net_device *dev)
        bnx2_netif_stop(bp);
        del_timer_sync(&bp->timer);
        if (bp->flags & NO_WOL_FLAG)
-                reset_code = BNX2_DRV_MSG_CODE_UNLOAD;
+                reset_code = BNX2_DRV_MSG_CODE_UNLOAD_LNK_DN;
        else if (bp->wol)
                reset_code = BNX2_DRV_MSG_CODE_SUSPEND_WOL;
        else
@@ -5128,6 +5127,16 @@ bnx2_set_rx_csum(struct net_device *dev, u32 data)
        return 0;
 }
+static int
+bnx2_set_tso(struct net_device *dev, u32 data)
+{
+        if (data)
+                dev->features |= NETIF_F_TSO | NETIF_F_TSO_ECN;
+        else
+                dev->features &= ~(NETIF_F_TSO | NETIF_F_TSO_ECN);
+        return 0;
+}
 #define BNX2_NUM_STATS 46
 static struct {
@@ -5445,7 +5454,7 @@ static struct ethtool_ops bnx2_ethtool_ops = {
        .set_sg                 = ethtool_op_set_sg,
 #ifdef BCM_TSO
        .get_tso                = ethtool_op_get_tso,
-        .set_tso                = ethtool_op_set_tso,
+        .set_tso                = bnx2_set_tso,
 #endif
        .self_test_count        = bnx2_self_test_count,
        .self_test              = bnx2_self_test,
@@ -5566,20 +5575,20 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)
        /* enable device (incl. PCI PM wakeup), and bus-mastering */
        rc = pci_enable_device(pdev);
        if (rc) {
-                printk(KERN_ERR PFX "Cannot enable PCI device, aborting.");
+                dev_err(&pdev->dev, "Cannot enable PCI device, aborting.");
                goto err_out;
        }
        if (!(pci_resource_flags(pdev, 0) & IORESOURCE_MEM)) {
-                printk(KERN_ERR PFX "Cannot find PCI device base address, "
+                dev_err(&pdev->dev,
-                       "aborting.\n");
+                        "Cannot find PCI device base address, aborting.\n");
                rc = -ENODEV;
                goto err_out_disable;
        }
        rc = pci_request_regions(pdev, DRV_MODULE_NAME);
        if (rc) {
-                printk(KERN_ERR PFX "Cannot obtain PCI resources, aborting.\n");
+                dev_err(&pdev->dev, "Cannot obtain PCI resources, aborting.\n");
                goto err_out_disable;
        }
@@ -5587,15 +5596,15 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)
        bp->pm_cap = pci_find_capability(pdev, PCI_CAP_ID_PM);
        if (bp->pm_cap == 0) {
-                printk(KERN_ERR PFX "Cannot find power management capability, "
+                dev_err(&pdev->dev,
-                               "aborting.\n");
+                        "Cannot find power management capability, aborting.\n");
                rc = -EIO;
                goto err_out_release;
        }
        bp->pcix_cap = pci_find_capability(pdev, PCI_CAP_ID_PCIX);
        if (bp->pcix_cap == 0) {
-                printk(KERN_ERR PFX "Cannot find PCIX capability, aborting.\n");
+                dev_err(&pdev->dev, "Cannot find PCIX capability, aborting.\n");
                rc = -EIO;
                goto err_out_release;
        }
@@ -5603,14 +5612,14 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)
        if (pci_set_dma_mask(pdev, DMA_64BIT_MASK) == 0) {
                bp->flags |= USING_DAC_FLAG;
                if (pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK) != 0) {
-                        printk(KERN_ERR PFX "pci_set_consistent_dma_mask "
+                        dev_err(&pdev->dev,
-                               "failed, aborting.\n");
+                                "pci_set_consistent_dma_mask failed, aborting.\n");
                        rc = -EIO;
                        goto err_out_release;
                }
        }
        else if (pci_set_dma_mask(pdev, DMA_32BIT_MASK) != 0) {
-                printk(KERN_ERR PFX "System does not support DMA, aborting.\n");
+                dev_err(&pdev->dev, "System does not support DMA, aborting.\n");
                rc = -EIO;
                goto err_out_release;
        }
@@ -5630,7 +5639,7 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)
        bp->regview = ioremap_nocache(dev->base_addr, mem_len);
        if (!bp->regview) {
-                printk(KERN_ERR PFX "Cannot map register space, aborting.\n");
+                dev_err(&pdev->dev, "Cannot map register space, aborting.\n");
                rc = -ENOMEM;
                goto err_out_release;
        }
@@ -5702,8 +5711,8 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)
        else if ((CHIP_ID(bp) == CHIP_ID_5706_A1) &&
                !(bp->flags & PCIX_FLAG)) {
-                printk(KERN_ERR PFX "5706 A1 can only be used in a PCIX bus, "
+                dev_err(&pdev->dev,
-                       "aborting.\n");
+                        "5706 A1 can only be used in a PCIX bus, aborting.\n");
                goto err_out_unmap;
        }
@@ -5724,7 +5733,7 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)
        if ((reg & BNX2_DEV_INFO_SIGNATURE_MAGIC_MASK) !=
            BNX2_DEV_INFO_SIGNATURE_MAGIC) {
-                printk(KERN_ERR PFX "Firmware not running, aborting.\n");
+                dev_err(&pdev->dev, "Firmware not running, aborting.\n");
                rc = -ENODEV;
                goto err_out_unmap;
        }
@@ -5886,7 +5895,7 @@ bnx2_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 #endif
        if ((rc = register_netdev(dev))) {
-                printk(KERN_ERR PFX "Cannot register net device\n");
+                dev_err(&pdev->dev, "Cannot register net device\n");
                if (bp->regview)
                        iounmap(bp->regview);
                pci_release_regions(pdev);
@@ -5926,7 +5935,7 @@ bnx2_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
        dev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
 #endif
 #ifdef BCM_TSO
-        dev->features |= NETIF_F_TSO;
+        dev->features |= NETIF_F_TSO | NETIF_F_TSO_ECN;
 #endif
        netif_carrier_off(bp->dev);
@@ -5968,7 +5977,7 @@ bnx2_suspend(struct pci_dev *pdev, pm_message_t state)
        netif_device_detach(dev);
        del_timer_sync(&bp->timer);
        if (bp->flags & NO_WOL_FLAG)
-                reset_code = BNX2_DRV_MSG_CODE_UNLOAD;
+                reset_code = BNX2_DRV_MSG_CODE_UNLOAD_LNK_DN;
        else if (bp->wol)
                reset_code = BNX2_DRV_MSG_CODE_SUSPEND_WOL;
        else
diff --git a/drivers/net/bnx2.h b/drivers/net/bnx2.h
index 5845e334941b..658c5ee95c73 100644
--- a/drivers/net/bnx2.h
+++ b/drivers/net/bnx2.h
@@ -4174,6 +4174,7 @@ struct fw_info {
 #define BNX2_DRV_MSG_CODE_PULSE                  0x06000000
 #define BNX2_DRV_MSG_CODE_DIAG                   0x07000000
 #define BNX2_DRV_MSG_CODE_SUSPEND_NO_WOL         0x09000000
+#define BNX2_DRV_MSG_CODE_UNLOAD_LNK_DN          0x0b000000
 #define BNX2_DRV_MSG_DATA                        0x00ff0000
 #define BNX2_DRV_MSG_DATA_WAIT0                  0x00010000
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 8171cae06688..8b951238f3a2 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -33,7 +33,6 @@
 //#define BONDING_DEBUG 1
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/sched.h>
diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c
index 5a9bd95884be..cfe4dc3a93a3 100644
--- a/drivers/net/bonding/bond_sysfs.c
+++ b/drivers/net/bonding/bond_sysfs.c
@@ -20,7 +20,6 @@
 * file called LICENSE.
 *
 */
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/sched.h>
diff --git a/drivers/net/cassini.c b/drivers/net/cassini.c
index 39f36aa05aa8..a31544ccb3c4 100644
--- a/drivers/net/cassini.c
+++ b/drivers/net/cassini.c
@@ -66,7 +66,6 @@
 * by default, the selective clear mask is set up to process rx packets.  
 */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
@@ -2915,8 +2914,7 @@ static int cas_start_xmit(struct sk_buff *skb, struct net_device *dev)
         */
        static int ring; 
-        skb = skb_padto(skb, cp->min_frame_size);
+        if (skb_padto(skb, cp->min_frame_size))
-        if (!skb)
                return 0;
        /* XXX: we need some higher-level QoS hooks to steer packets to
@@ -4351,7 +4349,7 @@ static int cas_open(struct net_device *dev)
         * mapping to expose them
         */
        if (request_irq(cp->pdev->irq, cas_interrupt,
-                        SA_SHIRQ, dev->name, (void *) dev)) {
+                        IRQF_SHARED, dev->name, (void *) dev)) {
                printk(KERN_ERR "%s: failed to request irq !\n", 
                       cp->dev->name);
                err = -EAGAIN;
@@ -4889,13 +4887,12 @@ static int __devinit cas_init_one(struct pci_dev *pdev,
        err = pci_enable_device(pdev);
        if (err) {
-                printk(KERN_ERR PFX "Cannot enable PCI device, "
+                dev_err(&pdev->dev, "Cannot enable PCI device, aborting.\n");
-                       "aborting.\n");
                return err;
        }
        if (!(pci_resource_flags(pdev, 0) & IORESOURCE_MEM)) {
-                printk(KERN_ERR PFX "Cannot find proper PCI device "
+                dev_err(&pdev->dev, "Cannot find proper PCI device "
                       "base address, aborting.\n");
                err = -ENODEV;
                goto err_out_disable_pdev;
@@ -4903,7 +4900,7 @@ static int __devinit cas_init_one(struct pci_dev *pdev,
        dev = alloc_etherdev(sizeof(*cp));
        if (!dev) {
-                printk(KERN_ERR PFX "Etherdev alloc failed, aborting.\n");
+                dev_err(&pdev->dev, "Etherdev alloc failed, aborting.\n");
                err = -ENOMEM;
                goto err_out_disable_pdev;
        }
@@ -4912,8 +4909,7 @@ static int __devinit cas_init_one(struct pci_dev *pdev,
        err = pci_request_regions(pdev, dev->name);
        if (err) {
-                printk(KERN_ERR PFX "Cannot obtain PCI resources, "
+                dev_err(&pdev->dev, "Cannot obtain PCI resources, aborting.\n");
-                       "aborting.\n");
                goto err_out_free_netdev;
        }
        pci_set_master(pdev);
@@ -4943,7 +4939,7 @@ static int __devinit cas_init_one(struct pci_dev *pdev,
                if (pci_write_config_byte(pdev, 
                                          PCI_CACHE_LINE_SIZE, 
                                          cas_cacheline_size)) {
-                        printk(KERN_ERR PFX "Could not set PCI cache "
+                        dev_err(&pdev->dev, "Could not set PCI cache "
                               "line size\n");
                        goto err_write_cacheline;
                }
@@ -4957,7 +4953,7 @@ static int __devinit cas_init_one(struct pci_dev *pdev,
                err = pci_set_consistent_dma_mask(pdev,
                                                  DMA_64BIT_MASK);
                if (err < 0) {
-                        printk(KERN_ERR PFX "Unable to obtain 64-bit DMA "
+                        dev_err(&pdev->dev, "Unable to obtain 64-bit DMA "
                               "for consistent allocations\n");
                        goto err_out_free_res;
                }
@@ -4965,7 +4961,7 @@ static int __devinit cas_init_one(struct pci_dev *pdev,
        } else {
                err = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
                if (err) {
-                        printk(KERN_ERR PFX "No usable DMA configuration, "
+                        dev_err(&pdev->dev, "No usable DMA configuration, "
                               "aborting.\n");
                        goto err_out_free_res;
                }
@@ -5025,8 +5021,7 @@ static int __devinit cas_init_one(struct pci_dev *pdev,
        /* give us access to cassini registers */
        cp->regs = pci_iomap(pdev, 0, casreg_len);
        if (cp->regs == 0UL) {
-                printk(KERN_ERR PFX "Cannot map device registers, "
+                dev_err(&pdev->dev, "Cannot map device registers, aborting.\n");
-                       "aborting.\n");
                goto err_out_free_res;
        }
        cp->casreg_len = casreg_len;
@@ -5042,8 +5037,7 @@ static int __devinit cas_init_one(struct pci_dev *pdev,
                pci_alloc_consistent(pdev, sizeof(struct cas_init_block),
                                     &cp->block_dvma);
        if (!cp->init_block) {
-                printk(KERN_ERR PFX "Cannot allocate init block, "
+                dev_err(&pdev->dev, "Cannot allocate init block, aborting.\n");
-                       "aborting.\n");
                goto err_out_iounmap;
        }
@@ -5087,8 +5081,7 @@ static int __devinit cas_init_one(struct pci_dev *pdev,
                dev->features |= NETIF_F_HIGHDMA;
        if (register_netdev(dev)) {
-                printk(KERN_ERR PFX "Cannot register net device, "
+                dev_err(&pdev->dev, "Cannot register net device, aborting.\n");
-                       "aborting.\n");
                goto err_out_free_consistent;
        }
diff --git a/drivers/net/chelsio/common.h b/drivers/net/chelsio/common.h
index bf3e7b6a7a18..5d9dd14427c5 100644
--- a/drivers/net/chelsio/common.h
+++ b/drivers/net/chelsio/common.h
@@ -39,7 +39,6 @@
 #ifndef _CXGB_COMMON_H_
 #define _CXGB_COMMON_H_
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/netdevice.h>
 #include <linux/types.h>
diff --git a/drivers/net/chelsio/cxgb2.c b/drivers/net/chelsio/cxgb2.c
index 7fe2638ae06d..e67872433e92 100644
--- a/drivers/net/chelsio/cxgb2.c
+++ b/drivers/net/chelsio/cxgb2.c
@@ -37,7 +37,6 @@
 ****************************************************************************/
 #include "common.h"
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/pci.h>
@@ -219,7 +218,7 @@ static int cxgb_up(struct adapter *adapter)
        t1_interrupts_clear(adapter);
        if ((err = request_irq(adapter->pdev->irq,
-                               t1_select_intr_handler(adapter), SA_SHIRQ,
+                               t1_select_intr_handler(adapter), IRQF_SHARED,
                               adapter->name, adapter))) {
                goto out_err;
        }
diff --git a/drivers/net/chelsio/sge.c b/drivers/net/chelsio/sge.c
index 4391bf4bf573..87f94d939ff8 100644
--- a/drivers/net/chelsio/sge.c
+++ b/drivers/net/chelsio/sge.c
@@ -39,7 +39,6 @@
 #include "common.h"
-#include <linux/config.h>
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/pci.h>
@@ -1418,7 +1417,7 @@ int t1_start_xmit(struct sk_buff *skb, struct net_device *dev)
        struct cpl_tx_pkt *cpl;
 #ifdef NETIF_F_TSO
-        if (skb_shinfo(skb)->tso_size) {
+        if (skb_shinfo(skb)->gso_size) {
                int eth_type;
                struct cpl_tx_pkt_lso *hdr;
@@ -1433,7 +1432,7 @@ int t1_start_xmit(struct sk_buff *skb, struct net_device *dev)
                hdr->ip_hdr_words = skb->nh.iph->ihl;
                hdr->tcp_hdr_words = skb->h.th->doff;
                hdr->eth_type_mss = htons(MK_ETH_TYPE_MSS(eth_type,
-                                                skb_shinfo(skb)->tso_size));
+                                                skb_shinfo(skb)->gso_size));
                hdr->len = htonl(skb->len - sizeof(*hdr));
                cpl = (struct cpl_tx_pkt *)hdr;
                sge->stats.tx_lso_pkts++;
diff --git a/drivers/net/cris/eth_v10.c b/drivers/net/cris/eth_v10.c
index 64105e4eaf31..0eb1f8787ed7 100644
--- a/drivers/net/cris/eth_v10.c
+++ b/drivers/net/cris/eth_v10.c
@@ -218,7 +218,6 @@
 *
 */
-#include <linux/config.h>
 #include <linux/module.h>
@@ -672,7 +671,7 @@ e100_open(struct net_device *dev)
        /* allocate the irq corresponding to the receiving DMA */
        if (request_irq(NETWORK_DMA_RX_IRQ_NBR, e100rxtx_interrupt,
-                        SA_SAMPLE_RANDOM, cardname, (void *)dev)) {
+                        IRQF_SAMPLE_RANDOM, cardname, (void *)dev)) {
                goto grace_exit0;
        }
diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c
index ef54ebeb29b8..47eecce35fa4 100644
--- a/drivers/net/cs89x0.c
+++ b/drivers/net/cs89x0.c
@@ -100,7 +100,6 @@
 /* Always include 'config.h' first in case the user wants to turn on
   or override something. */
-#include <linux/config.h>
 #include <linux/module.h>
 /*
diff --git a/drivers/net/cs89x0.h b/drivers/net/cs89x0.h
index bd954aaa636f..968fe11a0bf0 100644
--- a/drivers/net/cs89x0.h
+++ b/drivers/net/cs89x0.h
@@ -14,7 +14,6 @@
   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
   */
-#include <linux/config.h>
 #define PP_ChipID 0x0000        /* offset   0h -> Corp -ID              */
                                /* offset   2h -> Model/Product Number  */
diff --git a/drivers/net/declance.c b/drivers/net/declance.c
index f130bdab3fd3..6ad5796121c8 100644
--- a/drivers/net/declance.c
+++ b/drivers/net/declance.c
@@ -42,7 +42,6 @@
 *              bits. macro
 */
-#include <linux/config.h>
 #include <linux/crc32.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
@@ -704,8 +703,8 @@ static irqreturn_t lance_dma_merr_int(const int irq, void *dev_id,
        return IRQ_HANDLED;
 }
-static irqreturn_t
+static irqreturn_t lance_interrupt(const int irq, void *dev_id,
-lance_interrupt(const int irq, void *dev_id, struct pt_regs *regs)
+                                   struct pt_regs *regs)
 {
        struct net_device *dev = (struct net_device *) dev_id;
        struct lance_private *lp = netdev_priv(dev);
@@ -885,8 +884,7 @@ static int lance_start_xmit(struct sk_buff *skb, struct net_device *dev)
        len = skblen;
        
        if (len < ETH_ZLEN) {
-                skb = skb_padto(skb, ETH_ZLEN);
+                if (skb_padto(skb, ETH_ZLEN))
-                if (skb == NULL)
                        return 0;
                len = ETH_ZLEN;
        }
@@ -1255,7 +1253,7 @@ static int __init dec_lance_init(const int type, const int slot)
        return 0;
 err_out_free_dev:
-        kfree(dev);
+        free_netdev(dev);
 err_out:
        return ret;
@@ -1301,6 +1299,7 @@ static void __exit dec_lance_cleanup(void)
        while (root_lance_dev) {
                struct net_device *dev = root_lance_dev;
                struct lance_private *lp = netdev_priv(dev);
                unregister_netdev(dev);
 #ifdef CONFIG_TC
                if (lp->slot >= 0)
diff --git a/drivers/net/defxx.c b/drivers/net/defxx.c
index 5acd35c312ac..91cc8cbdd440 100644
--- a/drivers/net/defxx.c
+++ b/drivers/net/defxx.c
@@ -1228,7 +1228,7 @@ static int dfx_open(struct net_device *dev)
        
        /* Register IRQ - support shared interrupts by passing device ptr */
-        ret = request_irq(dev->irq, dfx_interrupt, SA_SHIRQ, dev->name, dev);
+        ret = request_irq(dev->irq, dfx_interrupt, IRQF_SHARED, dev->name, dev);
        if (ret) {
                printk(KERN_ERR "%s: Requested IRQ %d is busy\n", dev->name, dev->irq);
                return ret;
diff --git a/drivers/net/depca.c b/drivers/net/depca.c
index 0941d40f046f..b1cbe99249c1 100644
--- a/drivers/net/depca.c
+++ b/drivers/net/depca.c
@@ -235,7 +235,6 @@
    =========================================================================
 */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
@@ -938,11 +937,8 @@ static int depca_start_xmit(struct sk_buff *skb, struct net_device *dev)
        if (skb->len < 1)
                goto out;
-        if (skb->len < ETH_ZLEN) {
+        if (skb_padto(skb, ETH_ZLEN))
-                skb = skb_padto(skb, ETH_ZLEN);
+                goto out;
-                if (skb == NULL)
-                        goto out;
-        }
        
        netif_stop_queue(dev);
diff --git a/drivers/net/dgrs.c b/drivers/net/dgrs.c
index e175d4876682..fa4f09432975 100644
--- a/drivers/net/dgrs.c
+++ b/drivers/net/dgrs.c
@@ -1191,7 +1191,7 @@ dgrs_probe1(struct net_device *dev)
        if (priv->plxreg)
                OUTL(dev->base_addr + PLX_LCL2PCI_DOORBELL, 1);
        
-        rc = request_irq(dev->irq, &dgrs_intr, SA_SHIRQ, "RightSwitch", dev);
+        rc = request_irq(dev->irq, &dgrs_intr, IRQF_SHARED, "RightSwitch", dev);
        if (rc)
                goto err_out;
diff --git a/drivers/net/dl2k.c b/drivers/net/dl2k.c
index 038447fb5c5e..402961e68c89 100644
--- a/drivers/net/dl2k.c
+++ b/drivers/net/dl2k.c
@@ -9,49 +9,10 @@
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
 */
-/*
-    Rev         Date            Description
-    ==========================================================================
-    0.01        2001/05/03      Created DL2000-based linux driver
-    0.02        2001/05/21      Added VLAN and hardware checksum support.
-    1.00        2001/06/26      Added jumbo frame support.
-    1.01        2001/08/21      Added two parameters, rx_coalesce and rx_timeout.
-    1.02        2001/10/08      Supported fiber media.
-                                Added flow control parameters.
-    1.03        2001/10/12      Changed the default media to 1000mbps_fd for 
-                                the fiber devices.
-    1.04        2001/11/08      Fixed Tx stopped when tx very busy.
-    1.05        2001/11/22      Fixed Tx stopped when unidirectional tx busy.
-    1.06        2001/12/13      Fixed disconnect bug at 10Mbps mode.
-                                Fixed tx_full flag incorrect.
-                                Added tx_coalesce paramter.
-    1.07        2002/01/03      Fixed miscount of RX frame error.
-    1.08        2002/01/17      Fixed the multicast bug.
-    1.09        2002/03/07      Move rx-poll-now to re-fill loop.       
-                                Added rio_timer() to watch rx buffers. 
-    1.10        2002/04/16      Fixed miscount of carrier error.
-    1.11        2002/05/23      Added ISR schedule scheme
-                                Fixed miscount of rx frame error for DGE-550SX.
-                                Fixed VLAN bug.
-    1.12        2002/06/13      Lock tx_coalesce=1 on 10/100Mbps mode.
-    1.13        2002/08/13      1. Fix disconnection (many tx:carrier/rx:frame
-                                   errs) with some mainboards.
-                                2. Use definition "DRV_NAME" "DRV_VERSION" 
-                                   "DRV_RELDATE" for flexibility.       
-    1.14        2002/08/14      Support ethtool.        
-    1.15        2002/08/27      Changed the default media to Auto-Negotiation
-                                for the fiber devices.    
-    1.16        2002/09/04      More power down time for fiber devices auto-
-                                negotiation.
-                                Fix disconnect bug after ifup and ifdown.
-    1.17        2002/10/03      Fix RMON statistics overflow. 
-                                Always use I/O mapping to access eeprom, 
-                                avoid system freezing with some chipsets.
-*/
 #define DRV_NAME        "D-Link DL2000-based linux driver"
-#define DRV_VERSION     "v1.17b"
+#define DRV_VERSION     "v1.18"
-#define DRV_RELDATE     "2006/03/10"
+#define DRV_RELDATE     "2006/06/27"
 #include "dl2k.h"
 #include <linux/dma-mapping.h>
@@ -390,7 +351,7 @@ parse_eeprom (struct net_device *dev)
        for (i = 0; i < 6; i++)
                dev->dev_addr[i] = psrom->mac_addr[i];
-        /* Parse Software Infomation Block */
+        /* Parse Software Information Block */
        i = 0x30;
        psib = (u8 *) sromdata;
        do {
@@ -440,7 +401,7 @@ rio_open (struct net_device *dev)
        int i;
        u16 macctrl;
        
-        i = request_irq (dev->irq, &rio_interrupt, SA_SHIRQ, dev->name, dev);
+        i = request_irq (dev->irq, &rio_interrupt, IRQF_SHARED, dev->name, dev);
        if (i)
                return i;
        
diff --git a/drivers/net/dl2k.h b/drivers/net/dl2k.h
index 6e75482d75f2..53449207e53b 100644
--- a/drivers/net/dl2k.h
+++ b/drivers/net/dl2k.h
@@ -683,11 +683,6 @@ struct netdev_private {
 };
 /* The station address location in the EEPROM. */
-#ifdef MEM_MAPPING
-#define PCI_IOTYPE (PCI_USES_MASTER | PCI_USES_MEM | PCI_ADDR1)
-#else
-#define PCI_IOTYPE (PCI_USES_MASTER | PCI_USES_IO  | PCI_ADDR0)
-#endif
 /* The struct pci_device_id consist of:
        vendor, device          Vendor and device ID to match (or PCI_ANY_ID)
        subvendor, subdevice    Subsystem vendor and device ID to match (or PCI_ANY_ID)
@@ -695,9 +690,10 @@ struct netdev_private {
        class_mask              of the class are honored during the comparison.
        driver_data             Data private to the driver.
 */
-static struct pci_device_id rio_pci_tbl[] = {
-        {0x1186, 0x4000, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+static const struct pci_device_id rio_pci_tbl[] = {
-        {0,}
+        {0x1186, 0x4000, PCI_ANY_ID, PCI_ANY_ID, },
+        { }
 };
 MODULE_DEVICE_TABLE (pci, rio_pci_tbl);
 #define TX_TIMEOUT  (4*HZ)
diff --git a/drivers/net/dm9000.c b/drivers/net/dm9000.c
index 24996da4c1c4..1b758b707134 100644
--- a/drivers/net/dm9000.c
+++ b/drivers/net/dm9000.c
@@ -410,10 +410,7 @@ dm9000_probe(struct platform_device *pdev)
        if (pdev->num_resources < 2) {
                ret = -ENODEV;
                goto out;
-        }
+        } else if (pdev->num_resources == 2) {
-        switch (pdev->num_resources) {
-        case 2:
                base = pdev->resource[0].start;
                if (!request_mem_region(base, 4, ndev->name)) {
@@ -423,17 +420,16 @@ dm9000_probe(struct platform_device *pdev)
                ndev->base_addr = base;
                ndev->irq = pdev->resource[1].start;
-                db->io_addr = (void *)base;
+                db->io_addr = (void __iomem *)base;
-                db->io_data = (void *)(base + 4);
+                db->io_data = (void __iomem *)(base + 4);
-                break;
-        case 3:
+        } else {
                db->addr_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
                db->data_res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
                db->irq_res  = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
-                if (db->addr_res == NULL || db->data_res == NULL) {
+                if (db->addr_res == NULL || db->data_res == NULL ||
+                    db->irq_res == NULL) {
                        printk(KERN_ERR PFX "insufficient resources\n");
                        ret = -ENOENT;
                        goto out;
@@ -482,7 +478,6 @@ dm9000_probe(struct platform_device *pdev)
                /* ensure at least we have a default set of IO routines */
                dm9000_set_io(db, iosize);
        }
        /* check to see if anything is being over-ridden */
@@ -564,6 +559,13 @@ dm9000_probe(struct platform_device *pdev)
        for (i = 0; i < 6; i++)
                ndev->dev_addr[i] = db->srom[i];
+        if (!is_valid_ether_addr(ndev->dev_addr)) {
+                /* try reading from mac */
+                for (i = 0; i < 6; i++)
+                        ndev->dev_addr[i] = ior(db, i+DM9000_PAR);
+        }
        if (!is_valid_ether_addr(ndev->dev_addr))
                printk("%s: Invalid ethernet MAC address.  Please "
                       "set using ifconfig\n", ndev->name);
@@ -601,7 +603,7 @@ dm9000_open(struct net_device *dev)
        PRINTK2("entering dm9000_open\n");
-        if (request_irq(dev->irq, &dm9000_interrupt, SA_SHIRQ, dev->name, dev))
+        if (request_irq(dev->irq, &dm9000_interrupt, IRQF_SHARED, dev->name, dev))
                return -EAGAIN;
        /* Initialize DM9000 board */
@@ -663,7 +665,6 @@ dm9000_init_dm9000(struct net_device *dev)
        db->tx_pkt_cnt = 0;
        db->queue_pkt_len = 0;
        dev->trans_start = 0;
-        spin_lock_init(&db->lock);
 }
 /*
@@ -767,7 +768,7 @@ dm9000_stop(struct net_device *ndev)
 * receive the packet to upper layer, free the transmitted packet
 */
-void
+static void
 dm9000_tx_done(struct net_device *dev, board_info_t * db)
 {
        int tx_status = ior(db, DM9000_NSR);    /* Got TX status */
@@ -1187,13 +1188,14 @@ dm9000_drv_remove(struct platform_device *pdev)
 }
 static struct platform_driver dm9000_driver = {
+        .driver = {
+                .name    = "dm9000",
+                .owner   = THIS_MODULE,
+        },
        .probe   = dm9000_probe,
        .remove  = dm9000_drv_remove,
        .suspend = dm9000_drv_suspend,
        .resume  = dm9000_drv_resume,
-        .driver = {
-                .name   = "dm9000",
-        },
 };
 static int __init
diff --git a/drivers/net/dummy.c b/drivers/net/dummy.c
index dd8c15ac5c77..36d511729f71 100644
--- a/drivers/net/dummy.c
+++ b/drivers/net/dummy.c
@@ -28,7 +28,6 @@
                        Alan Cox, 30th May 1994
 */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/netdevice.h>
diff --git a/drivers/net/e100.c b/drivers/net/e100.c
index f37170cc1a37..91ef5f2fd768 100644
--- a/drivers/net/e100.c
+++ b/drivers/net/e100.c
@@ -138,7 +138,6 @@
 *      - Stratus87247: protect MDI control register manipulations
 */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/kernel.h>
@@ -2064,7 +2063,7 @@ static int e100_up(struct nic *nic)
        e100_set_multicast_list(nic->netdev);
        e100_start_receiver(nic, NULL);
        mod_timer(&nic->watchdog, jiffies);
-        if((err = request_irq(nic->pdev->irq, e100_intr, SA_SHIRQ,
+        if((err = request_irq(nic->pdev->irq, e100_intr, IRQF_SHARED,
                nic->netdev->name, nic->netdev)))
                goto err_no_irq;
        netif_wake_queue(nic->netdev);
@@ -2678,9 +2677,9 @@ static int __devinit e100_probe(struct pci_dev *pdev,
                goto err_out_free;
        }
-        DPRINTK(PROBE, INFO, "addr 0x%lx, irq %d, "
+        DPRINTK(PROBE, INFO, "addr 0x%llx, irq %d, "
                "MAC addr %02X:%02X:%02X:%02X:%02X:%02X\n",
-                pci_resource_start(pdev, 0), pdev->irq,
+                (unsigned long long)pci_resource_start(pdev, 0), pdev->irq,
                netdev->dev_addr[0], netdev->dev_addr[1], netdev->dev_addr[2],
                netdev->dev_addr[3], netdev->dev_addr[4], netdev->dev_addr[5]);
diff --git a/drivers/net/e1000/e1000.h b/drivers/net/e1000/e1000.h
index 323a2683417f..f411bbb44f86 100644
--- a/drivers/net/e1000/e1000.h
+++ b/drivers/net/e1000/e1000.h
@@ -34,7 +34,6 @@
 #define _E1000_H_
 #include <linux/stddef.h>
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/types.h>
 #include <asm/byteorder.h>
diff --git a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/e1000/e1000_ethtool.c
index 3a0b847fac31..88a82ba88f57 100644
--- a/drivers/net/e1000/e1000_ethtool.c
+++ b/drivers/net/e1000/e1000_ethtool.c
@@ -882,10 +882,10 @@ e1000_intr_test(struct e1000_adapter *adapter, uint64_t *data)
        *data = 0;
        /* Hook up test interrupt handler just for this test */
-        if (!request_irq(irq, &e1000_test_intr, SA_PROBEIRQ, netdev->name,
+        if (!request_irq(irq, &e1000_test_intr, IRQF_PROBE_SHARED,
-                         netdev)) {
+                         netdev->name, netdev)) {
                shared_int = FALSE;
-        } else if (request_irq(irq, &e1000_test_intr, SA_SHIRQ,
+        } else if (request_irq(irq, &e1000_test_intr, IRQF_SHARED,
                              netdev->name, netdev)){
                *data = 1;
                return -1;
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index f9a02c1ab523..f06b281c8f6e 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -272,7 +272,7 @@ static int e1000_request_irq(struct e1000_adapter *adapter)
        struct net_device *netdev = adapter->netdev;
        int flags, err = 0;
-        flags = SA_SHIRQ | SA_SAMPLE_RANDOM;
+        flags = IRQF_SHARED;
 #ifdef CONFIG_PCI_MSI
        if (adapter->hw.mac_type > e1000_82547_rev_2) {
                adapter->have_msi = TRUE;
@@ -2524,7 +2524,7 @@ e1000_tso(struct e1000_adapter *adapter, struct e1000_tx_ring *tx_ring,
        uint8_t ipcss, ipcso, tucss, tucso, hdr_len;
        int err;
-        if (skb_shinfo(skb)->tso_size) {
+        if (skb_shinfo(skb)->gso_size) {
                if (skb_header_cloned(skb)) {
                        err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC);
                        if (err)
@@ -2532,7 +2532,7 @@ e1000_tso(struct e1000_adapter *adapter, struct e1000_tx_ring *tx_ring,
                }
                hdr_len = ((skb->h.raw - skb->data) + (skb->h.th->doff << 2));
-                mss = skb_shinfo(skb)->tso_size;
+                mss = skb_shinfo(skb)->gso_size;
                if (skb->protocol == htons(ETH_P_IP)) {
                        skb->nh.iph->tot_len = 0;
                        skb->nh.iph->check = 0;
@@ -2649,7 +2649,7 @@ e1000_tx_map(struct e1000_adapter *adapter, struct e1000_tx_ring *tx_ring,
                 * tso gets written back prematurely before the data is fully
                 * DMA'd to the controller */
                if (!skb->data_len && tx_ring->last_tx_tso &&
-                    !skb_shinfo(skb)->tso_size) {
+                    !skb_shinfo(skb)->gso_size) {
                        tx_ring->last_tx_tso = 0;
                        size -= 4;
                }
@@ -2887,7 +2887,7 @@ e1000_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
        }
 #ifdef NETIF_F_TSO
-        mss = skb_shinfo(skb)->tso_size;
+        mss = skb_shinfo(skb)->gso_size;
        /* The controller does a simple calculation to
         * make sure there is enough room in the FIFO before
         * initiating the DMA for each buffer.  The calc is:
@@ -2938,7 +2938,7 @@ e1000_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
 #ifdef NETIF_F_TSO
        /* Controller Erratum workaround */
        if (!skb->data_len && tx_ring->last_tx_tso &&
-            !skb_shinfo(skb)->tso_size)
+            !skb_shinfo(skb)->gso_size)
                count++;
 #endif
diff --git a/drivers/net/eepro.c b/drivers/net/eepro.c
index a806dfe54d23..20d31430c74f 100644
--- a/drivers/net/eepro.c
+++ b/drivers/net/eepro.c
@@ -920,7 +920,7 @@ static int	eepro_grab_irq(struct net_device *dev)
                eepro_sw2bank0(ioaddr); /* Switch back to Bank 0 */
-                if (request_irq (*irqp, NULL, SA_SHIRQ, "bogus", dev) != EBUSY) {
+                if (request_irq (*irqp, NULL, IRQF_SHARED, "bogus", dev) != EBUSY) {
                        unsigned long irq_mask;
                        /* Twinkle the interrupt, and check if it's seen */
                        irq_mask = probe_irq_on();
@@ -1154,8 +1154,7 @@ static int eepro_send_packet(struct sk_buff *skb, struct net_device *dev)
                printk(KERN_DEBUG  "%s: entering eepro_send_packet routine.\n", dev->name);
        if (length < ETH_ZLEN) {
-                skb = skb_padto(skb, ETH_ZLEN);
+                if (skb_padto(skb, ETH_ZLEN))
-                if (skb == NULL)
                        return 0;
                length = ETH_ZLEN;
        }
diff --git a/drivers/net/eepro100.c b/drivers/net/eepro100.c
index 467fc861360d..e445988c92ee 100644
--- a/drivers/net/eepro100.c
+++ b/drivers/net/eepro100.c
@@ -87,7 +87,6 @@ static int options[] = {-1, -1, -1, -1, -1, -1, -1, -1};
 /* Size of an pre-allocated Rx buffer: <Ethernet MTU> + slack.*/
 #define PKT_BUF_SZ              1536
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
@@ -278,11 +277,6 @@ having to sign an Intel NDA when I'm helping Intel sell their own product!
 static int speedo_found1(struct pci_dev *pdev, void __iomem *ioaddr, int fnd_cnt, int acpi_idle_state);
-enum pci_flags_bit {
-        PCI_USES_IO=1, PCI_USES_MEM=2, PCI_USES_MASTER=4,
-        PCI_ADDR0=0x10<<0, PCI_ADDR1=0x10<<1, PCI_ADDR2=0x10<<2, PCI_ADDR3=0x10<<3,
-};
 /* Offsets to the various registers.
   All accesses need not be longword aligned. */
 enum speedo_offsets {
@@ -561,12 +555,12 @@ static int __devinit eepro100_init_one (struct pci_dev *pdev,
        if (!request_region(pci_resource_start(pdev, 1),
                        pci_resource_len(pdev, 1), "eepro100")) {
-                printk (KERN_ERR "eepro100: cannot reserve I/O ports\n");
+                dev_err(&pdev->dev, "eepro100: cannot reserve I/O ports\n");
                goto err_out_none;
        }
        if (!request_mem_region(pci_resource_start(pdev, 0),
                        pci_resource_len(pdev, 0), "eepro100")) {
-                printk (KERN_ERR "eepro100: cannot reserve MMIO region\n");
+                dev_err(&pdev->dev, "eepro100: cannot reserve MMIO region\n");
                goto err_out_free_pio_region;
        }
@@ -579,7 +573,7 @@ static int __devinit eepro100_init_one (struct pci_dev *pdev,
        ioaddr = pci_iomap(pdev, pci_bar, 0);
        if (!ioaddr) {
-                printk (KERN_ERR "eepro100: cannot remap IO\n");
+                dev_err(&pdev->dev, "eepro100: cannot remap IO\n");
                goto err_out_free_mmio_region;
        }
@@ -983,7 +977,7 @@ speedo_open(struct net_device *dev)
        sp->in_interrupt = 0;
        /* .. we can safely take handler calls during init. */
-        retval = request_irq(dev->irq, &speedo_interrupt, SA_SHIRQ, dev->name, dev);
+        retval = request_irq(dev->irq, &speedo_interrupt, IRQF_SHARED, dev->name, dev);
        if (retval) {
                return retval;
        }
diff --git a/drivers/net/eexpress.c b/drivers/net/eexpress.c
index 82bd356e4f3a..33291bcf6d4c 100644
--- a/drivers/net/eexpress.c
+++ b/drivers/net/eexpress.c
@@ -97,7 +97,6 @@
 #define LOCKUP16 0
 #endif
  
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
@@ -677,8 +676,7 @@ static int eexp_xmit(struct sk_buff *buf, struct net_device *dev)
 #endif
        if (buf->len < ETH_ZLEN) {
-                buf = skb_padto(buf, ETH_ZLEN);
+                if (skb_padto(buf, ETH_ZLEN))
-                if (buf == NULL)
                        return 0;
                length = ETH_ZLEN;
        }
diff --git a/drivers/net/epic100.c b/drivers/net/epic100.c
index 8d680ce600d7..a67650ccf084 100644
--- a/drivers/net/epic100.c
+++ b/drivers/net/epic100.c
@@ -19,62 +19,15 @@
        Information and updates available at
        http://www.scyld.com/network/epic100.html
+        [this link no longer provides anything useful -jgarzik]
        ---------------------------------------------------------------------
-        Linux kernel-specific changes:
-        LK1.1.2 (jgarzik):
-        * Merge becker version 1.09 (4/08/2000)
-        LK1.1.3:
-        * Major bugfix to 1.09 driver (Francis Romieu)
-        LK1.1.4 (jgarzik):
-        * Merge becker test version 1.09 (5/29/2000)
-        LK1.1.5:
-        * Fix locking (jgarzik)
-        * Limit 83c175 probe to ethernet-class PCI devices (rgooch)
-        LK1.1.6:
-        * Merge becker version 1.11
-        * Move pci_enable_device before any PCI BAR len checks
-        LK1.1.7:
-        * { fill me in }
-        LK1.1.8:
-        * ethtool driver info support (jgarzik)
-        LK1.1.9:
-        * ethtool media get/set support (jgarzik)
-        LK1.1.10:
-        * revert MII transceiver init change (jgarzik)
-        LK1.1.11:
-        * implement ETHTOOL_[GS]SET, _NWAY_RST, _[GS]MSGLVL, _GLINK (jgarzik)
-        * replace some MII-related magic numbers with constants
-        LK1.1.12:
-        * fix power-up sequence
-        LK1.1.13:
-        * revert version 1.1.12, power-up sequence "fix"
-        LK1.1.14 (Kryzsztof Halasa):
-        * fix spurious bad initializations
-        * pound phy a la SMSC's app note on the subject
-        AC1.1.14ac
-        * fix power up/down for ethtool that broke in 1.11
 */
 #define DRV_NAME        "epic100"
-#define DRV_VERSION     "1.11+LK1.1.14+AC1.1.14"
+#define DRV_VERSION     "2.0"
-#define DRV_RELDATE     "June 2, 2004"
+#define DRV_RELDATE     "June 27, 2006"
 /* The user-configurable values.
   These may be modified when a driver module is loaded.*/
@@ -114,7 +67,6 @@ static int rx_copybreak;
 #define TX_FIFO_THRESH 256
 #define RX_FIFO_THRESH 1                /* 0-3, 0==32, 64,96, or 3==128 bytes  */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
@@ -191,23 +143,10 @@ IVc. Errata
 */
-enum pci_id_flags_bits {
-        /* Set PCI command register bits before calling probe1(). */
-        PCI_USES_IO=1, PCI_USES_MEM=2, PCI_USES_MASTER=4,
-        /* Read and map the single following PCI BAR. */
-        PCI_ADDR0=0<<4, PCI_ADDR1=1<<4, PCI_ADDR2=2<<4, PCI_ADDR3=3<<4,
-        PCI_ADDR_64BITS=0x100, PCI_NO_ACPI_WAKE=0x200, PCI_NO_MIN_LATENCY=0x400,
-};
 enum chip_capability_flags { MII_PWRDWN=1, TYPE2_INTR=2, NO_MII=4 };
 #define EPIC_TOTAL_SIZE 0x100
 #define USE_IO_OPS 1
-#ifdef USE_IO_OPS
-#define EPIC_IOTYPE PCI_USES_MASTER|PCI_USES_IO|PCI_ADDR0
-#else
-#define EPIC_IOTYPE PCI_USES_MASTER|PCI_USES_MEM|PCI_ADDR1
-#endif
 typedef enum {
        SMSC_83C170_0,
@@ -218,20 +157,15 @@ typedef enum {
 struct epic_chip_info {
        const char *name;
-        enum pci_id_flags_bits pci_flags;
-        int io_size;                            /* Needed for I/O region check or ioremap(). */
        int drv_flags;                          /* Driver use, intended as capability flags. */
 };
 /* indexed by chip_t */
 static const struct epic_chip_info pci_id_tbl[] = {
-        { "SMSC EPIC/100 83c170",
+        { "SMSC EPIC/100 83c170",       TYPE2_INTR | NO_MII | MII_PWRDWN },
-         EPIC_IOTYPE, EPIC_TOTAL_SIZE, TYPE2_INTR | NO_MII | MII_PWRDWN },
+        { "SMSC EPIC/100 83c170",       TYPE2_INTR },
-        { "SMSC EPIC/100 83c170",
+        { "SMSC EPIC/C 83c175",         TYPE2_INTR | MII_PWRDWN },
-         EPIC_IOTYPE, EPIC_TOTAL_SIZE, TYPE2_INTR },
-        { "SMSC EPIC/C 83c175",
-         EPIC_IOTYPE, EPIC_TOTAL_SIZE, TYPE2_INTR | MII_PWRDWN },
 };
@@ -400,8 +334,8 @@ static int __devinit epic_init_one (struct pci_dev *pdev,
                goto out;
        irq = pdev->irq;
-        if (pci_resource_len(pdev, 0) < pci_id_tbl[chip_idx].io_size) {
+        if (pci_resource_len(pdev, 0) < EPIC_TOTAL_SIZE) {
-                printk (KERN_ERR "card %d: no PCI region space\n", card_idx);
+                dev_err(&pdev->dev, "no PCI region space\n");
                ret = -ENODEV;
                goto err_out_disable;
        }
@@ -416,7 +350,7 @@ static int __devinit epic_init_one (struct pci_dev *pdev,
        dev = alloc_etherdev(sizeof (*ep));
        if (!dev) {
-                printk (KERN_ERR "card %d: no memory for eth device\n", card_idx);
+                dev_err(&pdev->dev, "no memory for eth device\n");
                goto err_out_free_res;
        }
        SET_MODULE_OWNER(dev);
@@ -428,7 +362,7 @@ static int __devinit epic_init_one (struct pci_dev *pdev,
        ioaddr = pci_resource_start (pdev, 1);
        ioaddr = (long) ioremap (ioaddr, pci_resource_len (pdev, 1));
        if (!ioaddr) {
-                printk (KERN_ERR DRV_NAME " %d: ioremap failed\n", card_idx);
+                dev_err(&pdev->dev, "ioremap failed\n");
                goto err_out_free_netdev;
        }
 #endif
@@ -488,8 +422,7 @@ static int __devinit epic_init_one (struct pci_dev *pdev,
                ((u16 *)dev->dev_addr)[i] = le16_to_cpu(inw(ioaddr + LAN0 + i*4));
        if (debug > 2) {
-                printk(KERN_DEBUG DRV_NAME "(%s): EEPROM contents\n",
+                dev_printk(KERN_DEBUG, &pdev->dev, "EEPROM contents:\n");
-                       pci_name(pdev));
                for (i = 0; i < 64; i++)
                        printk(" %4.4x%s", read_eeprom(ioaddr, i),
                                   i % 16 == 15 ? "\n" : "");
@@ -511,21 +444,23 @@ static int __devinit epic_init_one (struct pci_dev *pdev,
                        int mii_status = mdio_read(dev, phy, MII_BMSR);
                        if (mii_status != 0xffff  &&  mii_status != 0x0000) {
                                ep->phys[phy_idx++] = phy;
-                                printk(KERN_INFO DRV_NAME "(%s): MII transceiver #%d control "
+                                dev_info(&pdev->dev,
-                                           "%4.4x status %4.4x.\n",
+                                        "MII transceiver #%d control "
-                                           pci_name(pdev), phy, mdio_read(dev, phy, 0), mii_status);
+                                        "%4.4x status %4.4x.\n",
+                                        phy, mdio_read(dev, phy, 0), mii_status);
                        }
                }
                ep->mii_phy_cnt = phy_idx;
                if (phy_idx != 0) {
                        phy = ep->phys[0];
                        ep->mii.advertising = mdio_read(dev, phy, MII_ADVERTISE);
-                        printk(KERN_INFO DRV_NAME "(%s): Autonegotiation advertising %4.4x link "
+                        dev_info(&pdev->dev,
+                                "Autonegotiation advertising %4.4x link "
                                   "partner %4.4x.\n",
-                                   pci_name(pdev), ep->mii.advertising, mdio_read(dev, phy, 5));
+                                   ep->mii.advertising, mdio_read(dev, phy, 5));
                } else if ( ! (ep->chip_flags & NO_MII)) {
-                        printk(KERN_WARNING DRV_NAME "(%s): ***WARNING***: No MII transceiver found!\n",
+                        dev_warn(&pdev->dev,
-                               pci_name(pdev));
+                                "***WARNING***: No MII transceiver found!\n");
                        /* Use the known PHY address of the EPII. */
                        ep->phys[0] = 3;
                }
@@ -540,8 +475,7 @@ static int __devinit epic_init_one (struct pci_dev *pdev,
        /* The lower four bits are the media type. */
        if (duplex) {
                ep->mii.force_media = ep->mii.full_duplex = 1;
-                printk(KERN_INFO DRV_NAME "(%s):  Forced full duplex operation requested.\n",
+                dev_info(&pdev->dev, "Forced full duplex requested.\n");
-                       pci_name(pdev));
        }
        dev->if_port = ep->default_port = option;
@@ -728,7 +662,7 @@ static int epic_open(struct net_device *dev)
        /* Soft reset the chip. */
        outl(0x4001, ioaddr + GENCTL);
-        if ((retval = request_irq(dev->irq, &epic_interrupt, SA_SHIRQ, dev->name, dev)))
+        if ((retval = request_irq(dev->irq, &epic_interrupt, IRQF_SHARED, dev->name, dev)))
                return retval;
        epic_init_ring(dev);
@@ -1027,11 +961,8 @@ static int epic_start_xmit(struct sk_buff *skb, struct net_device *dev)
        u32 ctrl_word;
        unsigned long flags;
-        if (skb->len < ETH_ZLEN) {
+        if (skb_padto(skb, ETH_ZLEN))
-                skb = skb_padto(skb, ETH_ZLEN);
+                return 0;
-                if (skb == NULL)
-                        return 0;
-        }
        /* Caution: the write order is important here, set the field with the
           "ownership" bit last. */
diff --git a/drivers/net/eth16i.c b/drivers/net/eth16i.c
index b67545be2caa..4bf76f86d8e9 100644
--- a/drivers/net/eth16i.c
+++ b/drivers/net/eth16i.c
@@ -1064,8 +1064,7 @@ static int eth16i_tx(struct sk_buff *skb, struct net_device *dev)
        unsigned long flags;
        if (length < ETH_ZLEN) {
-                skb = skb_padto(skb, ETH_ZLEN);
+                if (skb_padto(skb, ETH_ZLEN))
-                if (skb == NULL)
                        return 0;
                length = ETH_ZLEN;
        }
diff --git a/drivers/net/fealnx.c b/drivers/net/fealnx.c
index a8449265e5fd..97d34fee8c1f 100644
--- a/drivers/net/fealnx.c
+++ b/drivers/net/fealnx.c
@@ -124,16 +124,8 @@ MODULE_PARM_DESC(multicast_filter_limit, "fealnx maximum number of filtered mult
 MODULE_PARM_DESC(options, "fealnx: Bits 0-3: media type, bit 17: full duplex");
 MODULE_PARM_DESC(full_duplex, "fealnx full duplex setting(s) (1)");
-#define MIN_REGION_SIZE 136
+enum {
+        MIN_REGION_SIZE         = 136,
-enum pci_flags_bit {
-        PCI_USES_IO = 1,
-        PCI_USES_MEM = 2,
-        PCI_USES_MASTER = 4,
-        PCI_ADDR0 = 0x10 << 0,
-        PCI_ADDR1 = 0x10 << 1,
-        PCI_ADDR2 = 0x10 << 2,
-        PCI_ADDR3 = 0x10 << 3,
 };
 /* A chip capabilities table, matching the entries in pci_tbl[] above. */
@@ -156,14 +148,13 @@ enum phy_type_flags {
 struct chip_info {
        char *chip_name;
-        int io_size;
        int flags;
 };
-static const struct chip_info skel_netdrv_tbl[] = {
+static const struct chip_info skel_netdrv_tbl[] __devinitdata = {
-        {"100/10M Ethernet PCI Adapter", 136, HAS_MII_XCVR},
+        { "100/10M Ethernet PCI Adapter",       HAS_MII_XCVR },
-        {"100/10M Ethernet PCI Adapter", 136, HAS_CHIP_XCVR},
+        { "100/10M Ethernet PCI Adapter",       HAS_CHIP_XCVR },
-        {"1000/100/10M Ethernet PCI Adapter", 136, HAS_MII_XCVR},
+        { "1000/100/10M Ethernet PCI Adapter",  HAS_MII_XCVR },
 };
 /* Offsets to the Command and Status Registers. */
@@ -514,13 +505,14 @@ static int __devinit fealnx_init_one(struct pci_dev *pdev,
        
        len = pci_resource_len(pdev, bar);
        if (len < MIN_REGION_SIZE) {
-                printk(KERN_ERR "%s: region size %ld too small, aborting\n",
+                dev_err(&pdev->dev,
-                       boardname, len);
+                           "region size %ld too small, aborting\n", len);
                return -ENODEV;
        }
        i = pci_request_regions(pdev, boardname);
-        if (i) return i;
+        if (i)
+                return i;
        
        irq = pdev->irq;
@@ -586,9 +578,9 @@ static int __devinit fealnx_init_one(struct pci_dev *pdev,
                        if (mii_status != 0xffff && mii_status != 0x0000) {
                                np->phys[phy_idx++] = phy;
-                                printk(KERN_INFO
+                                dev_info(&pdev->dev,
-                                       "%s: MII PHY found at address %d, status "
+                                       "MII PHY found at address %d, status "
-                                       "0x%4.4x.\n", dev->name, phy, mii_status);
+                                       "0x%4.4x.\n", phy, mii_status);
                                /* get phy type */
                                {
                                        unsigned int data;
@@ -611,10 +603,10 @@ static int __devinit fealnx_init_one(struct pci_dev *pdev,
                }
                np->mii_cnt = phy_idx;
-                if (phy_idx == 0) {
+                if (phy_idx == 0)
-                        printk(KERN_WARNING "%s: MII PHY not found -- this device may "
+                        dev_warn(&pdev->dev,
-                               "not operate correctly.\n", dev->name);
+                                "MII PHY not found -- this device may "
-                }
+                               "not operate correctly.\n");
        } else {
                np->phys[0] = 32;
 /* 89/6/23 add, (begin) */
@@ -640,7 +632,7 @@ static int __devinit fealnx_init_one(struct pci_dev *pdev,
                np->mii.full_duplex = full_duplex[card_idx];
        if (np->mii.full_duplex) {
-                printk(KERN_INFO "%s: Media type forced to Full Duplex.\n", dev->name);
+                dev_info(&pdev->dev, "Media type forced to Full Duplex.\n");
 /* 89/6/13 add, (begin) */
 //      if (np->PHYType==MarvellPHY)
                if ((np->PHYType == MarvellPHY) || (np->PHYType == LevelOnePHY)) {
@@ -844,7 +836,7 @@ static int netdev_open(struct net_device *dev)
        iowrite32(0x00000001, ioaddr + BCR);    /* Reset */
-        if (request_irq(dev->irq, &intr_handler, SA_SHIRQ, dev->name, dev))
+        if (request_irq(dev->irq, &intr_handler, IRQF_SHARED, dev->name, dev))
                return -EAGAIN;
        for (i = 0; i < 3; i++)
diff --git a/drivers/net/fec.c b/drivers/net/fec.c
index bd6983d1afba..9b4030031744 100644
--- a/drivers/net/fec.c
+++ b/drivers/net/fec.c
@@ -22,10 +22,9 @@
 * Copyright (c) 2001-2005 Greg Ungerer (gerg@snapgear.com)
 *
 * Bug fixes and cleanup by Philippe De Muyter (phdm@macqel.be)
- * Copyright (c) 2004-2005 Macq Electronique SA.
+ * Copyright (c) 2004-2006 Macq Electronique SA.
 */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
@@ -51,7 +50,7 @@
 #if defined(CONFIG_M523x) || defined(CONFIG_M527x) || \
    defined(CONFIG_M5272) || defined(CONFIG_M528x) || \
-    defined(CONFIG_M520x)
+    defined(CONFIG_M520x) || defined(CONFIG_M532x)
 #include <asm/coldfire.h>
 #include <asm/mcfsim.h>
 #include "fec.h"
@@ -80,6 +79,8 @@ static unsigned int fec_hw[] = {
        (MCF_MBAR + 0x1000),
 #elif defined(CONFIG_M520x)
        (MCF_MBAR+0x30000),
+#elif defined(CONFIG_M532x)
+        (MCF_MBAR+0xfc030000),
 #else
        &(((immap_t *)IMAP_ADDR)->im_cpm.cp_fec),
 #endif
@@ -143,7 +144,7 @@ typedef struct {
 #define TX_RING_MOD_MASK        15      /*   for this to work */
 #if (((RX_RING_SIZE + TX_RING_SIZE) * 8) > PAGE_SIZE)
-#error "FEC: descriptor ring size contants too large"
+#error "FEC: descriptor ring size constants too large"
 #endif
 /* Interrupt events/masks.
@@ -167,12 +168,12 @@ typedef struct {
 /*
- * The 5270/5271/5280/5282 RX control register also contains maximum frame
+ * The 5270/5271/5280/5282/532x RX control register also contains maximum frame
 * size bits. Other FEC hardware does not, so we need to take that into
 * account when setting it.
 */
 #if defined(CONFIG_M523x) || defined(CONFIG_M527x) || defined(CONFIG_M528x) || \
-    defined(CONFIG_M520x)
+    defined(CONFIG_M520x) || defined(CONFIG_M532x)
 #define OPT_FRAME_SIZE  (PKT_MAXBUF_SIZE << 16)
 #else
 #define OPT_FRAME_SIZE  0
@@ -308,6 +309,7 @@ fec_enet_start_xmit(struct sk_buff *skb, struct net_device *dev)
        struct fec_enet_private *fep;
        volatile fec_t  *fecp;
        volatile cbd_t  *bdp;
+        unsigned short  status;
        fep = netdev_priv(dev);
        fecp = (volatile fec_t*)dev->base_addr;
@@ -320,8 +322,9 @@ fec_enet_start_xmit(struct sk_buff *skb, struct net_device *dev)
        /* Fill in a Tx ring entry */
        bdp = fep->cur_tx;
+        status = bdp->cbd_sc;
 #ifndef final_version
-        if (bdp->cbd_sc & BD_ENET_TX_READY) {
+        if (status & BD_ENET_TX_READY) {
                /* Ooops.  All transmit buffers are full.  Bail out.
                 * This should not happen, since dev->tbusy should be set.
                 */
@@ -332,7 +335,7 @@ fec_enet_start_xmit(struct sk_buff *skb, struct net_device *dev)
        /* Clear all of the status flags.
         */
-        bdp->cbd_sc &= ~BD_ENET_TX_STATS;
+        status &= ~BD_ENET_TX_STATS;
        /* Set buffer length and buffer pointer.
        */
@@ -366,21 +369,22 @@ fec_enet_start_xmit(struct sk_buff *skb, struct net_device *dev)
        spin_lock_irq(&fep->lock);
-        /* Send it on its way.  Tell FEC its ready, interrupt when done,
+        /* Send it on its way.  Tell FEC it's ready, interrupt when done,
-         * its the last BD of the frame, and to put the CRC on the end.
+         * it's the last BD of the frame, and to put the CRC on the end.
         */
-        bdp->cbd_sc |= (BD_ENET_TX_READY | BD_ENET_TX_INTR
+        status |= (BD_ENET_TX_READY | BD_ENET_TX_INTR
                        | BD_ENET_TX_LAST | BD_ENET_TX_TC);
+        bdp->cbd_sc = status;
        dev->trans_start = jiffies;
        /* Trigger transmission start */
-        fecp->fec_x_des_active = 0x01000000;
+        fecp->fec_x_des_active = 0;
        /* If this was the last BD in the ring, start at the beginning again.
        */
-        if (bdp->cbd_sc & BD_ENET_TX_WRAP) {
+        if (status & BD_ENET_TX_WRAP) {
                bdp = fep->tx_bd_base;
        } else {
                bdp++;
@@ -491,43 +495,44 @@ fec_enet_tx(struct net_device *dev)
 {
        struct  fec_enet_private *fep;
        volatile cbd_t  *bdp;
+        unsigned short status;
        struct  sk_buff *skb;
        fep = netdev_priv(dev);
        spin_lock(&fep->lock);
        bdp = fep->dirty_tx;
-        while ((bdp->cbd_sc&BD_ENET_TX_READY) == 0) {
+        while (((status = bdp->cbd_sc) & BD_ENET_TX_READY) == 0) {
                if (bdp == fep->cur_tx && fep->tx_full == 0) break;
                skb = fep->tx_skbuff[fep->skb_dirty];
                /* Check for errors. */
-                if (bdp->cbd_sc & (BD_ENET_TX_HB | BD_ENET_TX_LC |
+                if (status & (BD_ENET_TX_HB | BD_ENET_TX_LC |
                                   BD_ENET_TX_RL | BD_ENET_TX_UN |
                                   BD_ENET_TX_CSL)) {
                        fep->stats.tx_errors++;
-                        if (bdp->cbd_sc & BD_ENET_TX_HB)  /* No heartbeat */
+                        if (status & BD_ENET_TX_HB)  /* No heartbeat */
                                fep->stats.tx_heartbeat_errors++;
-                        if (bdp->cbd_sc & BD_ENET_TX_LC)  /* Late collision */
+                        if (status & BD_ENET_TX_LC)  /* Late collision */
                                fep->stats.tx_window_errors++;
-                        if (bdp->cbd_sc & BD_ENET_TX_RL)  /* Retrans limit */
+                        if (status & BD_ENET_TX_RL)  /* Retrans limit */
                                fep->stats.tx_aborted_errors++;
-                        if (bdp->cbd_sc & BD_ENET_TX_UN)  /* Underrun */
+                        if (status & BD_ENET_TX_UN)  /* Underrun */
                                fep->stats.tx_fifo_errors++;
-                        if (bdp->cbd_sc & BD_ENET_TX_CSL) /* Carrier lost */
+                        if (status & BD_ENET_TX_CSL) /* Carrier lost */
                                fep->stats.tx_carrier_errors++;
                } else {
                        fep->stats.tx_packets++;
                }
 #ifndef final_version
-                if (bdp->cbd_sc & BD_ENET_TX_READY)
+                if (status & BD_ENET_TX_READY)
                        printk("HEY! Enet xmit interrupt and TX_READY.\n");
 #endif
                /* Deferred means some collisions occurred during transmit,
                 * but we eventually sent the packet OK.
                 */
-                if (bdp->cbd_sc & BD_ENET_TX_DEF)
+                if (status & BD_ENET_TX_DEF)
                        fep->stats.collisions++;
            
                /* Free the sk buffer associated with this last transmit.
@@ -538,7 +543,7 @@ fec_enet_tx(struct net_device *dev)
            
                /* Update pointer to next buffer descriptor to be transmitted.
                 */
-                if (bdp->cbd_sc & BD_ENET_TX_WRAP)
+                if (status & BD_ENET_TX_WRAP)
                        bdp = fep->tx_bd_base;
                else
                        bdp++;
@@ -568,9 +573,14 @@ fec_enet_rx(struct net_device *dev)
        struct  fec_enet_private *fep;
        volatile fec_t  *fecp;
        volatile cbd_t *bdp;
+        unsigned short status;
        struct  sk_buff *skb;
        ushort  pkt_len;
        __u8 *data;
+        
+#ifdef CONFIG_M532x
+        flush_cache_all();
+#endif  
        fep = netdev_priv(dev);
        fecp = (volatile fec_t*)dev->base_addr;
@@ -580,13 +590,13 @@ fec_enet_rx(struct net_device *dev)
         */
        bdp = fep->cur_rx;
-while (!(bdp->cbd_sc & BD_ENET_RX_EMPTY)) {
+while (!((status = bdp->cbd_sc) & BD_ENET_RX_EMPTY)) {
 #ifndef final_version
        /* Since we have allocated space to hold a complete frame,
         * the last indicator should be set.
         */
-        if ((bdp->cbd_sc & BD_ENET_RX_LAST) == 0)
+        if ((status & BD_ENET_RX_LAST) == 0)
                printk("FEC ENET: rcv is not +last\n");
 #endif
@@ -594,26 +604,26 @@ while (!(bdp->cbd_sc & BD_ENET_RX_EMPTY)) {
                goto rx_processing_done;
        /* Check for errors. */
-        if (bdp->cbd_sc & (BD_ENET_RX_LG | BD_ENET_RX_SH | BD_ENET_RX_NO |
+        if (status & (BD_ENET_RX_LG | BD_ENET_RX_SH | BD_ENET_RX_NO |
                           BD_ENET_RX_CR | BD_ENET_RX_OV)) {
                fep->stats.rx_errors++;       
-                if (bdp->cbd_sc & (BD_ENET_RX_LG | BD_ENET_RX_SH)) {
+                if (status & (BD_ENET_RX_LG | BD_ENET_RX_SH)) {
                /* Frame too long or too short. */
                        fep->stats.rx_length_errors++;
                }
-                if (bdp->cbd_sc & BD_ENET_RX_NO)        /* Frame alignment */
+                if (status & BD_ENET_RX_NO)     /* Frame alignment */
                        fep->stats.rx_frame_errors++;
-                if (bdp->cbd_sc & BD_ENET_RX_CR)        /* CRC Error */
+                if (status & BD_ENET_RX_CR)     /* CRC Error */
-                        fep->stats.rx_crc_errors++;
-                if (bdp->cbd_sc & BD_ENET_RX_OV)        /* FIFO overrun */
                        fep->stats.rx_crc_errors++;
+                if (status & BD_ENET_RX_OV)     /* FIFO overrun */
+                        fep->stats.rx_fifo_errors++;
        }
        /* Report late collisions as a frame error.
         * On this error, the BD is closed, but we don't know what we
         * have in the buffer.  So, just drop this frame on the floor.
         */
-        if (bdp->cbd_sc & BD_ENET_RX_CL) {
+        if (status & BD_ENET_RX_CL) {
                fep->stats.rx_errors++;
                fep->stats.rx_frame_errors++;
                goto rx_processing_done;
@@ -639,9 +649,7 @@ while (!(bdp->cbd_sc & BD_ENET_RX_EMPTY)) {
        } else {
                skb->dev = dev;
                skb_put(skb,pkt_len-4); /* Make room */
-                eth_copy_and_sum(skb,
+                eth_copy_and_sum(skb, data, pkt_len-4, 0);
-                                 (unsigned char *)__va(bdp->cbd_bufaddr),
-                                 pkt_len-4, 0);
                skb->protocol=eth_type_trans(skb,dev);
                netif_rx(skb);
        }
@@ -649,15 +657,16 @@ while (!(bdp->cbd_sc & BD_ENET_RX_EMPTY)) {
        /* Clear the status flags for this buffer.
        */
-        bdp->cbd_sc &= ~BD_ENET_RX_STATS;
+        status &= ~BD_ENET_RX_STATS;
        /* Mark the buffer empty.
        */
-        bdp->cbd_sc |= BD_ENET_RX_EMPTY;
+        status |= BD_ENET_RX_EMPTY;
+        bdp->cbd_sc = status;
        /* Update BD pointer to next entry.
        */
-        if (bdp->cbd_sc & BD_ENET_RX_WRAP)
+        if (status & BD_ENET_RX_WRAP)
                bdp = fep->rx_bd_base;
        else
                bdp++;
@@ -667,9 +676,9 @@ while (!(bdp->cbd_sc & BD_ENET_RX_EMPTY)) {
         * incoming frames.  On a heavily loaded network, we should be
         * able to keep up at the expense of system resources.
         */
-        fecp->fec_r_des_active = 0x01000000;
+        fecp->fec_r_des_active = 0;
 #endif
-   } /* while (!(bdp->cbd_sc & BD_ENET_RX_EMPTY)) */
+   } /* while (!((status = bdp->cbd_sc) & BD_ENET_RX_EMPTY)) */
        fep->cur_rx = (cbd_t *)bdp;
 #if 0
@@ -680,11 +689,12 @@ while (!(bdp->cbd_sc & BD_ENET_RX_EMPTY)) {
         * our way back to the interrupt return only to come right back
         * here.
         */
-        fecp->fec_r_des_active = 0x01000000;
+        fecp->fec_r_des_active = 0;
 #endif
 }
+/* called from interrupt context */
 static void
 fec_enet_mii(struct net_device *dev)
 {
@@ -696,10 +706,12 @@ fec_enet_mii(struct net_device *dev)
        fep = netdev_priv(dev);
        ep = fep->hwp;
        mii_reg = ep->fec_mii_data;
+        spin_lock(&fep->lock);
        
        if ((mip = mii_head) == NULL) {
                printk("MII and no head!\n");
-                return;
+                goto unlock;
        }
        if (mip->mii_func != NULL)
@@ -711,6 +723,9 @@ fec_enet_mii(struct net_device *dev)
        if ((mip = mii_head) != NULL)
                ep->fec_mii_data = mip->mii_regval;
+unlock:
+        spin_unlock(&fep->lock);
 }
 static int
@@ -728,8 +743,7 @@ mii_queue(struct net_device *dev, int regval, void (*func)(uint, struct net_devi
        retval = 0;
-        save_flags(flags);
+        spin_lock_irqsave(&fep->lock,flags);
-        cli();
        if ((mip = mii_free) != NULL) {
                mii_free = mip->mii_next;
@@ -749,7 +763,7 @@ mii_queue(struct net_device *dev, int regval, void (*func)(uint, struct net_devi
                retval = 1;
        }
-        restore_flags(flags);
+        spin_unlock_irqrestore(&fep->lock,flags);
        return(retval);
 }
@@ -1216,7 +1230,7 @@ static phy_info_t const * const phy_info[] = {
 };
 /* ------------------------------------------------------------------------- */
+#if !defined(CONFIG_M532x)
 #ifdef CONFIG_RPXCLASSIC
 static void
 mii_link_interrupt(void *dev_id);
@@ -1224,6 +1238,7 @@ mii_link_interrupt(void *dev_id);
 static irqreturn_t
 mii_link_interrupt(int irq, void * dev_id, struct pt_regs * regs);
 #endif
+#endif
 #if defined(CONFIG_M5272)
@@ -1384,13 +1399,13 @@ static void __inline__ fec_request_intrs(struct net_device *dev)
        {
                volatile unsigned char  *icrp;
                volatile unsigned long  *imrp;
-                int i;
+                int i, ilip;
                b = (fep->index) ? MCFICM_INTC1 : MCFICM_INTC0;
                icrp = (volatile unsigned char *) (MCF_IPSBAR + b +
                        MCFINTC_ICR0);
-                for (i = 23; (i < 36); i++)
+                for (i = 23, ilip = 0x28; (i < 36); i++)
-                        icrp[i] = 0x23;
+                        icrp[i] = ilip--;
                imrp = (volatile unsigned long *) (MCF_IPSBAR + b +
                        MCFINTC_IMRH);
@@ -1618,6 +1633,159 @@ static void __inline__ fec_uncache(unsigned long addr)
 /* ------------------------------------------------------------------------- */
+#elif defined(CONFIG_M532x)
+/*
+ * Code specific for M532x
+ */
+static void __inline__ fec_request_intrs(struct net_device *dev)
+{
+        struct fec_enet_private *fep;
+        int b;
+        static const struct idesc {
+                char *name;
+                unsigned short irq;
+        } *idp, id[] = {
+            { "fec(TXF)", 36 },
+            { "fec(TXB)", 37 },
+            { "fec(TXFIFO)", 38 },
+            { "fec(TXCR)", 39 },
+            { "fec(RXF)", 40 },
+            { "fec(RXB)", 41 },
+            { "fec(MII)", 42 },
+            { "fec(LC)", 43 },
+            { "fec(HBERR)", 44 },
+            { "fec(GRA)", 45 },
+            { "fec(EBERR)", 46 },
+            { "fec(BABT)", 47 },
+            { "fec(BABR)", 48 },
+            { NULL },
+        };
+        fep = netdev_priv(dev);
+        b = (fep->index) ? 128 : 64;
+        /* Setup interrupt handlers. */
+        for (idp = id; idp->name; idp++) {
+                if (request_irq(b+idp->irq,fec_enet_interrupt,0,idp->name,dev)!=0)
+                        printk("FEC: Could not allocate %s IRQ(%d)!\n", 
+                                idp->name, b+idp->irq);
+        }
+        /* Unmask interrupts */
+        MCF_INTC0_ICR36 = 0x2;
+        MCF_INTC0_ICR37 = 0x2;
+        MCF_INTC0_ICR38 = 0x2;
+        MCF_INTC0_ICR39 = 0x2;
+        MCF_INTC0_ICR40 = 0x2;
+        MCF_INTC0_ICR41 = 0x2;
+        MCF_INTC0_ICR42 = 0x2;
+        MCF_INTC0_ICR43 = 0x2;
+        MCF_INTC0_ICR44 = 0x2;
+        MCF_INTC0_ICR45 = 0x2;
+        MCF_INTC0_ICR46 = 0x2;
+        MCF_INTC0_ICR47 = 0x2;
+        MCF_INTC0_ICR48 = 0x2;
+        MCF_INTC0_IMRH &= ~(
+                MCF_INTC_IMRH_INT_MASK36 |
+                MCF_INTC_IMRH_INT_MASK37 |
+                MCF_INTC_IMRH_INT_MASK38 |
+                MCF_INTC_IMRH_INT_MASK39 |
+                MCF_INTC_IMRH_INT_MASK40 |
+                MCF_INTC_IMRH_INT_MASK41 |
+                MCF_INTC_IMRH_INT_MASK42 |
+                MCF_INTC_IMRH_INT_MASK43 |
+                MCF_INTC_IMRH_INT_MASK44 |
+                MCF_INTC_IMRH_INT_MASK45 |
+                MCF_INTC_IMRH_INT_MASK46 |
+                MCF_INTC_IMRH_INT_MASK47 |
+                MCF_INTC_IMRH_INT_MASK48 );
+        /* Set up gpio outputs for MII lines */
+        MCF_GPIO_PAR_FECI2C |= (0 |
+                MCF_GPIO_PAR_FECI2C_PAR_MDC_EMDC |
+                MCF_GPIO_PAR_FECI2C_PAR_MDIO_EMDIO);
+        MCF_GPIO_PAR_FEC = (0 |
+                MCF_GPIO_PAR_FEC_PAR_FEC_7W_FEC |
+                MCF_GPIO_PAR_FEC_PAR_FEC_MII_FEC);
+}
+static void __inline__ fec_set_mii(struct net_device *dev, struct fec_enet_private *fep)
+{
+        volatile fec_t *fecp;
+        fecp = fep->hwp;
+        fecp->fec_r_cntrl = OPT_FRAME_SIZE | 0x04;
+        fecp->fec_x_cntrl = 0x00;
+        /*
+         * Set MII speed to 2.5 MHz
+         */
+        fep->phy_speed = ((((MCF_CLK / 2) / (2500000 / 10)) + 5) / 10) * 2;
+        fecp->fec_mii_speed = fep->phy_speed;
+        fec_restart(dev, 0);
+}
+static void __inline__ fec_get_mac(struct net_device *dev)
+{
+        struct fec_enet_private *fep = netdev_priv(dev);
+        volatile fec_t *fecp;
+        unsigned char *iap, tmpaddr[ETH_ALEN];
+        fecp = fep->hwp;
+        if (FEC_FLASHMAC) {
+                /*
+                 * Get MAC address from FLASH.
+                 * If it is all 1's or 0's, use the default.
+                 */
+                iap = FEC_FLASHMAC;
+                if ((iap[0] == 0) && (iap[1] == 0) && (iap[2] == 0) &&
+                    (iap[3] == 0) && (iap[4] == 0) && (iap[5] == 0))
+                        iap = fec_mac_default;
+                if ((iap[0] == 0xff) && (iap[1] == 0xff) && (iap[2] == 0xff) &&
+                    (iap[3] == 0xff) && (iap[4] == 0xff) && (iap[5] == 0xff))
+                        iap = fec_mac_default;
+        } else {
+                *((unsigned long *) &tmpaddr[0]) = fecp->fec_addr_low;
+                *((unsigned short *) &tmpaddr[4]) = (fecp->fec_addr_high >> 16);
+                iap = &tmpaddr[0];
+        }
+        memcpy(dev->dev_addr, iap, ETH_ALEN);
+        /* Adjust MAC if using default MAC address */
+        if (iap == fec_mac_default)
+                dev->dev_addr[ETH_ALEN-1] = fec_mac_default[ETH_ALEN-1] + fep->index;
+}
+static void __inline__ fec_enable_phy_intr(void)
+{
+}
+static void __inline__ fec_disable_phy_intr(void)
+{
+}
+static void __inline__ fec_phy_ack_intr(void)
+{
+}
+static void __inline__ fec_localhw_setup(void)
+{
+}
+/*
+ *      Do not need to make region uncached on 532x.
+ */
+static void __inline__ fec_uncache(unsigned long addr)
+{
+}
+/* ------------------------------------------------------------------------- */
 #else
 /*
@@ -1985,9 +2153,12 @@ fec_enet_open(struct net_device *dev)
                mii_do_cmd(dev, fep->phy->config);
                mii_do_cmd(dev, phy_cmd_config);  /* display configuration */
-                /* FIXME: use netif_carrier_{on,off} ; this polls
+                /* Poll until the PHY tells us its configuration
-                 * until link is up which is wrong...  could be
+                 * (not link state).
-                 * 30 seconds or more we are trapped in here. -jgarzik
+                 * Request is initiated by mii_do_cmd above, but answer
+                 * comes by interrupt.
+                 * This should take about 25 usec per register at 2.5 MHz,
+                 * and we read approximately 5 registers.
                 */
                while(!fep->sequence_done)
                        schedule();
@@ -2253,15 +2424,11 @@ int __init fec_enet_init(struct net_device *dev)
        */
        fec_request_intrs(dev);
-        /* Clear and enable interrupts */
-        fecp->fec_ievent = 0xffc00000;
-        fecp->fec_imask = (FEC_ENET_TXF | FEC_ENET_TXB |
-                FEC_ENET_RXF | FEC_ENET_RXB | FEC_ENET_MII);
        fecp->fec_hash_table_high = 0;
        fecp->fec_hash_table_low = 0;
        fecp->fec_r_buff_size = PKT_MAXBLR_SIZE;
        fecp->fec_ecntrl = 2;
-        fecp->fec_r_des_active = 0x01000000;
+        fecp->fec_r_des_active = 0;
        dev->base_addr = (unsigned long)fecp;
@@ -2281,6 +2448,11 @@ int __init fec_enet_init(struct net_device *dev)
        /* setup MII interface */
        fec_set_mii(dev, fep);
+        /* Clear and enable interrupts */
+        fecp->fec_ievent = 0xffc00000;
+        fecp->fec_imask = (FEC_ENET_TXF | FEC_ENET_TXB |
+                FEC_ENET_RXF | FEC_ENET_RXB | FEC_ENET_MII);
        /* Queue up command to detect the PHY and initialize the
         * remainder of the interface.
         */
@@ -2312,11 +2484,6 @@ fec_restart(struct net_device *dev, int duplex)
        fecp->fec_ecntrl = 1;
        udelay(10);
-        /* Enable interrupts we wish to service.
-        */
-        fecp->fec_imask = (FEC_ENET_TXF | FEC_ENET_TXB |
-                                FEC_ENET_RXF | FEC_ENET_RXB | FEC_ENET_MII);
        /* Clear any outstanding interrupt.
        */
        fecp->fec_ievent = 0xffc00000;
@@ -2408,7 +2575,12 @@ fec_restart(struct net_device *dev, int duplex)
        /* And last, enable the transmit and receive processing.
        */
        fecp->fec_ecntrl = 2;
-        fecp->fec_r_des_active = 0x01000000;
+        fecp->fec_r_des_active = 0;
+        /* Enable interrupts we wish to service.
+        */
+        fecp->fec_imask = (FEC_ENET_TXF | FEC_ENET_TXB |
+                FEC_ENET_RXF | FEC_ENET_RXB | FEC_ENET_MII);
 }
 static void
@@ -2420,9 +2592,16 @@ fec_stop(struct net_device *dev)
        fep = netdev_priv(dev);
        fecp = fep->hwp;
-        fecp->fec_x_cntrl = 0x01;       /* Graceful transmit stop */
+        /*
+        ** We cannot expect a graceful transmit stop without link !!!
-        while(!(fecp->fec_ievent & FEC_ENET_GRA));
+        */
+        if (fep->link)
+                {
+                fecp->fec_x_cntrl = 0x01;       /* Graceful transmit stop */
+                udelay(10);
+                if (!(fecp->fec_ievent & FEC_ENET_GRA))
+                        printk("fec_stop : Graceful transmit stop did not complete !\n");
+                }
        /* Whack a reset.  We should wait for this.
        */
diff --git a/drivers/net/fec.h b/drivers/net/fec.h
index 965c5c49fcdc..1d421606984f 100644
--- a/drivers/net/fec.h
+++ b/drivers/net/fec.h
@@ -14,7 +14,7 @@
 /****************************************************************************/
 #if defined(CONFIG_M523x) || defined(CONFIG_M527x) || defined(CONFIG_M528x) || \
-    defined(CONFIG_M520x)
+    defined(CONFIG_M520x) || defined(CONFIG_M532x)
 /*
 *      Just figures, Motorola would have to change the offsets for
 *      registers in the same peripheral device on different models
diff --git a/drivers/net/fec_8xx/fec_8xx-netta.c b/drivers/net/fec_8xx/fec_8xx-netta.c
index 29c275e1d566..790d9dbe42dd 100644
--- a/drivers/net/fec_8xx/fec_8xx-netta.c
+++ b/drivers/net/fec_8xx/fec_8xx-netta.c
@@ -2,7 +2,6 @@
 * FEC instantatiation file for NETTA
 */
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/sched.h>
diff --git a/drivers/net/fec_8xx/fec_main.c b/drivers/net/fec_8xx/fec_main.c
index 7e4338097139..282b1452c39a 100644
--- a/drivers/net/fec_8xx/fec_main.c
+++ b/drivers/net/fec_8xx/fec_main.c
@@ -10,7 +10,6 @@
 * Released under the GPL
 */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
diff --git a/drivers/net/fec_8xx/fec_mii.c b/drivers/net/fec_8xx/fec_mii.c
index 3b44ac1a7bfe..d3c16b85d9a4 100644
--- a/drivers/net/fec_8xx/fec_mii.c
+++ b/drivers/net/fec_8xx/fec_mii.c
@@ -10,7 +10,6 @@
 * Released under the GPL
 */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index 04a53f1dfdbd..037d870712ff 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -1495,8 +1495,8 @@ static int nv_start_xmit(struct sk_buff *skb, struct net_device *dev)
        np->tx_skbuff[nr] = skb;
 #ifdef NETIF_F_TSO
-        if (skb_shinfo(skb)->tso_size)
+        if (skb_shinfo(skb)->gso_size)
-                tx_flags_extra = NV_TX2_TSO | (skb_shinfo(skb)->tso_size << NV_TX2_TSO_SHIFT);
+                tx_flags_extra = NV_TX2_TSO | (skb_shinfo(skb)->gso_size << NV_TX2_TSO_SHIFT);
        else
 #endif
        tx_flags_extra = (skb->ip_summed == CHECKSUM_HW ? (NV_TX2_CHECKSUM_L3|NV_TX2_CHECKSUM_L4) : 0);
@@ -2076,7 +2076,7 @@ static void nv_set_multicast(struct net_device *dev)
        spin_unlock_irq(&np->lock);
 }
-void nv_update_pause(struct net_device *dev, u32 pause_flags)
+static void nv_update_pause(struct net_device *dev, u32 pause_flags)
 {
        struct fe_priv *np = netdev_priv(dev);
        u8 __iomem *base = get_hwbase(dev);
@@ -2622,21 +2622,21 @@ static int nv_request_irq(struct net_device *dev, int intr_test)
                        np->msi_flags |= NV_MSI_X_ENABLED;
                        if (optimization_mode == NV_OPTIMIZATION_MODE_THROUGHPUT && !intr_test) {
                                /* Request irq for rx handling */
-                                if (request_irq(np->msi_x_entry[NV_MSI_X_VECTOR_RX].vector, &nv_nic_irq_rx, SA_SHIRQ, dev->name, dev) != 0) {
+                                if (request_irq(np->msi_x_entry[NV_MSI_X_VECTOR_RX].vector, &nv_nic_irq_rx, IRQF_SHARED, dev->name, dev) != 0) {
                                        printk(KERN_INFO "forcedeth: request_irq failed for rx %d\n", ret);
                                        pci_disable_msix(np->pci_dev);
                                        np->msi_flags &= ~NV_MSI_X_ENABLED;
                                        goto out_err;
                                }
                                /* Request irq for tx handling */
-                                if (request_irq(np->msi_x_entry[NV_MSI_X_VECTOR_TX].vector, &nv_nic_irq_tx, SA_SHIRQ, dev->name, dev) != 0) {
+                                if (request_irq(np->msi_x_entry[NV_MSI_X_VECTOR_TX].vector, &nv_nic_irq_tx, IRQF_SHARED, dev->name, dev) != 0) {
                                        printk(KERN_INFO "forcedeth: request_irq failed for tx %d\n", ret);
                                        pci_disable_msix(np->pci_dev);
                                        np->msi_flags &= ~NV_MSI_X_ENABLED;
                                        goto out_free_rx;
                                }
                                /* Request irq for link and timer handling */
-                                if (request_irq(np->msi_x_entry[NV_MSI_X_VECTOR_OTHER].vector, &nv_nic_irq_other, SA_SHIRQ, dev->name, dev) != 0) {
+                                if (request_irq(np->msi_x_entry[NV_MSI_X_VECTOR_OTHER].vector, &nv_nic_irq_other, IRQF_SHARED, dev->name, dev) != 0) {
                                        printk(KERN_INFO "forcedeth: request_irq failed for link %d\n", ret);
                                        pci_disable_msix(np->pci_dev);
                                        np->msi_flags &= ~NV_MSI_X_ENABLED;
@@ -2651,9 +2651,9 @@ static int nv_request_irq(struct net_device *dev, int intr_test)
                        } else {
                                /* Request irq for all interrupts */
                                if ((!intr_test &&
-                                     request_irq(np->msi_x_entry[NV_MSI_X_VECTOR_ALL].vector, &nv_nic_irq, SA_SHIRQ, dev->name, dev) != 0) ||
+                                     request_irq(np->msi_x_entry[NV_MSI_X_VECTOR_ALL].vector, &nv_nic_irq, IRQF_SHARED, dev->name, dev) != 0) ||
                                    (intr_test &&
-                                     request_irq(np->msi_x_entry[NV_MSI_X_VECTOR_ALL].vector, &nv_nic_irq_test, SA_SHIRQ, dev->name, dev) != 0)) {
+                                     request_irq(np->msi_x_entry[NV_MSI_X_VECTOR_ALL].vector, &nv_nic_irq_test, IRQF_SHARED, dev->name, dev) != 0)) {
                                        printk(KERN_INFO "forcedeth: request_irq failed %d\n", ret);
                                        pci_disable_msix(np->pci_dev);
                                        np->msi_flags &= ~NV_MSI_X_ENABLED;
@@ -2669,8 +2669,8 @@ static int nv_request_irq(struct net_device *dev, int intr_test)
        if (ret != 0 && np->msi_flags & NV_MSI_CAPABLE) {
                if ((ret = pci_enable_msi(np->pci_dev)) == 0) {
                        np->msi_flags |= NV_MSI_ENABLED;
-                        if ((!intr_test && request_irq(np->pci_dev->irq, &nv_nic_irq, SA_SHIRQ, dev->name, dev) != 0) ||
+                        if ((!intr_test && request_irq(np->pci_dev->irq, &nv_nic_irq, IRQF_SHARED, dev->name, dev) != 0) ||
-                            (intr_test && request_irq(np->pci_dev->irq, &nv_nic_irq_test, SA_SHIRQ, dev->name, dev) != 0)) {
+                            (intr_test && request_irq(np->pci_dev->irq, &nv_nic_irq_test, IRQF_SHARED, dev->name, dev) != 0)) {
                                printk(KERN_INFO "forcedeth: request_irq failed %d\n", ret);
                                pci_disable_msi(np->pci_dev);
                                np->msi_flags &= ~NV_MSI_ENABLED;
@@ -2685,8 +2685,8 @@ static int nv_request_irq(struct net_device *dev, int intr_test)
                }
        }
        if (ret != 0) {
-                if ((!intr_test && request_irq(np->pci_dev->irq, &nv_nic_irq, SA_SHIRQ, dev->name, dev) != 0) ||
+                if ((!intr_test && request_irq(np->pci_dev->irq, &nv_nic_irq, IRQF_SHARED, dev->name, dev) != 0) ||
-                    (intr_test && request_irq(np->pci_dev->irq, &nv_nic_irq_test, SA_SHIRQ, dev->name, dev) != 0))
+                    (intr_test && request_irq(np->pci_dev->irq, &nv_nic_irq_test, IRQF_SHARED, dev->name, dev) != 0))
                        goto out_err;
        }
@@ -2735,21 +2735,21 @@ static void nv_do_nic_poll(unsigned long data)
        if (!using_multi_irqs(dev)) {
                if (np->msi_flags & NV_MSI_X_ENABLED)
-                        disable_irq(np->msi_x_entry[NV_MSI_X_VECTOR_ALL].vector);
+                        disable_irq_lockdep(np->msi_x_entry[NV_MSI_X_VECTOR_ALL].vector);
                else
-                        disable_irq(dev->irq);
+                        disable_irq_lockdep(dev->irq);
                mask = np->irqmask;
        } else {
                if (np->nic_poll_irq & NVREG_IRQ_RX_ALL) {
-                        disable_irq(np->msi_x_entry[NV_MSI_X_VECTOR_RX].vector);
+                        disable_irq_lockdep(np->msi_x_entry[NV_MSI_X_VECTOR_RX].vector);
                        mask |= NVREG_IRQ_RX_ALL;
                }
                if (np->nic_poll_irq & NVREG_IRQ_TX_ALL) {
-                        disable_irq(np->msi_x_entry[NV_MSI_X_VECTOR_TX].vector);
+                        disable_irq_lockdep(np->msi_x_entry[NV_MSI_X_VECTOR_TX].vector);
                        mask |= NVREG_IRQ_TX_ALL;
                }
                if (np->nic_poll_irq & NVREG_IRQ_OTHER) {
-                        disable_irq(np->msi_x_entry[NV_MSI_X_VECTOR_OTHER].vector);
+                        disable_irq_lockdep(np->msi_x_entry[NV_MSI_X_VECTOR_OTHER].vector);
                        mask |= NVREG_IRQ_OTHER;
                }
        }
@@ -2761,23 +2761,23 @@ static void nv_do_nic_poll(unsigned long data)
        pci_push(base);
        if (!using_multi_irqs(dev)) {
-                nv_nic_irq((int) 0, (void *) data, (struct pt_regs *) NULL);
+                nv_nic_irq(0, dev, NULL);
                if (np->msi_flags & NV_MSI_X_ENABLED)
-                        enable_irq(np->msi_x_entry[NV_MSI_X_VECTOR_ALL].vector);
+                        enable_irq_lockdep(np->msi_x_entry[NV_MSI_X_VECTOR_ALL].vector);
                else
-                        enable_irq(dev->irq);
+                        enable_irq_lockdep(dev->irq);
        } else {
                if (np->nic_poll_irq & NVREG_IRQ_RX_ALL) {
-                        nv_nic_irq_rx((int) 0, (void *) data, (struct pt_regs *) NULL);
+                        nv_nic_irq_rx(0, dev, NULL);
-                        enable_irq(np->msi_x_entry[NV_MSI_X_VECTOR_RX].vector);
+                        enable_irq_lockdep(np->msi_x_entry[NV_MSI_X_VECTOR_RX].vector);
                }
                if (np->nic_poll_irq & NVREG_IRQ_TX_ALL) {
-                        nv_nic_irq_tx((int) 0, (void *) data, (struct pt_regs *) NULL);
+                        nv_nic_irq_tx(0, dev, NULL);
-                        enable_irq(np->msi_x_entry[NV_MSI_X_VECTOR_TX].vector);
+                        enable_irq_lockdep(np->msi_x_entry[NV_MSI_X_VECTOR_TX].vector);
                }
                if (np->nic_poll_irq & NVREG_IRQ_OTHER) {
-                        nv_nic_irq_other((int) 0, (void *) data, (struct pt_regs *) NULL);
+                        nv_nic_irq_other(0, dev, NULL);
-                        enable_irq(np->msi_x_entry[NV_MSI_X_VECTOR_OTHER].vector);
+                        enable_irq_lockdep(np->msi_x_entry[NV_MSI_X_VECTOR_OTHER].vector);
                }
        }
 }
@@ -2991,13 +2991,13 @@ static int nv_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
        netif_carrier_off(dev);
        if (netif_running(dev)) {
                nv_disable_irq(dev);
-                spin_lock_bh(&dev->xmit_lock);
+                netif_tx_lock_bh(dev);
                spin_lock(&np->lock);
                /* stop engines */
                nv_stop_rx(dev);
                nv_stop_tx(dev);
                spin_unlock(&np->lock);
-                spin_unlock_bh(&dev->xmit_lock);
+                netif_tx_unlock_bh(dev);
        }
        if (ecmd->autoneg == AUTONEG_ENABLE) {
@@ -3131,13 +3131,13 @@ static int nv_nway_reset(struct net_device *dev)
                netif_carrier_off(dev);
                if (netif_running(dev)) {
                        nv_disable_irq(dev);
-                        spin_lock_bh(&dev->xmit_lock);
+                        netif_tx_lock_bh(dev);
                        spin_lock(&np->lock);
                        /* stop engines */
                        nv_stop_rx(dev);
                        nv_stop_tx(dev);
                        spin_unlock(&np->lock);
-                        spin_unlock_bh(&dev->xmit_lock);
+                        netif_tx_unlock_bh(dev);
                        printk(KERN_INFO "%s: link down.\n", dev->name);
                }
@@ -3244,7 +3244,7 @@ static int nv_set_ringparam(struct net_device *dev, struct ethtool_ringparam* ri
        if (netif_running(dev)) {
                nv_disable_irq(dev);
-                spin_lock_bh(&dev->xmit_lock);
+                netif_tx_lock_bh(dev);
                spin_lock(&np->lock);
                /* stop engines */
                nv_stop_rx(dev);
@@ -3303,7 +3303,7 @@ static int nv_set_ringparam(struct net_device *dev, struct ethtool_ringparam* ri
                nv_start_rx(dev);
                nv_start_tx(dev);
                spin_unlock(&np->lock);
-                spin_unlock_bh(&dev->xmit_lock);
+                netif_tx_unlock_bh(dev);
                nv_enable_irq(dev);
        }
        return 0;
@@ -3339,13 +3339,13 @@ static int nv_set_pauseparam(struct net_device *dev, struct ethtool_pauseparam*
        netif_carrier_off(dev);
        if (netif_running(dev)) {
                nv_disable_irq(dev);
-                spin_lock_bh(&dev->xmit_lock);
+                netif_tx_lock_bh(dev);
                spin_lock(&np->lock);
                /* stop engines */
                nv_stop_rx(dev);
                nv_stop_tx(dev);
                spin_unlock(&np->lock);
-                spin_unlock_bh(&dev->xmit_lock);
+                netif_tx_unlock_bh(dev);
        }
        np->pause_flags &= ~(NV_PAUSEFRAME_RX_REQ|NV_PAUSEFRAME_TX_REQ);
@@ -3729,7 +3729,7 @@ static void nv_self_test(struct net_device *dev, struct ethtool_test *test, u64
        if (test->flags & ETH_TEST_FL_OFFLINE) {
                if (netif_running(dev)) {
                        netif_stop_queue(dev);
-                        spin_lock_bh(&dev->xmit_lock);
+                        netif_tx_lock_bh(dev);
                        spin_lock_irq(&np->lock);
                        nv_disable_hw_interrupts(dev, np->irqmask);
                        if (!(np->msi_flags & NV_MSI_X_ENABLED)) {
@@ -3745,7 +3745,7 @@ static void nv_self_test(struct net_device *dev, struct ethtool_test *test, u64
                        nv_drain_rx(dev);
                        nv_drain_tx(dev);
                        spin_unlock_irq(&np->lock);
-                        spin_unlock_bh(&dev->xmit_lock);
+                        netif_tx_unlock_bh(dev);
                }
                if (!nv_register_test(dev)) {
diff --git a/drivers/net/fs_enet/fs_enet-main.c b/drivers/net/fs_enet/fs_enet-main.c
index 196298f33db8..f6abff5846b3 100644
--- a/drivers/net/fs_enet/fs_enet-main.c
+++ b/drivers/net/fs_enet/fs_enet-main.c
@@ -15,7 +15,6 @@
 * kind, whether express or implied.
 */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
@@ -672,7 +671,7 @@ static int fs_request_irq(struct net_device *dev, int irq, const char *name,
        struct fs_enet_private *fep = netdev_priv(dev);
        (*fep->ops->pre_request_irq)(dev, irq);
-        return request_irq(irq, irqf, SA_SHIRQ, name, dev);
+        return request_irq(irq, irqf, IRQF_SHARED, name, dev);
 }
 static void fs_free_irq(struct net_device *dev, int irq)
diff --git a/drivers/net/fs_enet/fs_enet-mii.c b/drivers/net/fs_enet/fs_enet-mii.c
index c6770377ef87..b7e6e21725cb 100644
--- a/drivers/net/fs_enet/fs_enet-mii.c
+++ b/drivers/net/fs_enet/fs_enet-mii.c
@@ -16,7 +16,6 @@
 */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
@@ -431,8 +430,7 @@ static struct fs_enet_mii_bus *create_bus(const struct fs_mii_bus_info *bi)
        return bus;
 err:
-        if (bus)
+        kfree(bus);
-                kfree(bus);
        return ERR_PTR(ret);
 }
diff --git a/drivers/net/fs_enet/mac-fcc.c b/drivers/net/fs_enet/mac-fcc.c
index 95e2bb8dd7b4..64e20982c1fe 100644
--- a/drivers/net/fs_enet/mac-fcc.c
+++ b/drivers/net/fs_enet/mac-fcc.c
@@ -12,7 +12,6 @@
 * kind, whether express or implied.
 */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
diff --git a/drivers/net/fs_enet/mac-fec.c b/drivers/net/fs_enet/mac-fec.c
index 3dad69dfdb2c..e09547077529 100644
--- a/drivers/net/fs_enet/mac-fec.c
+++ b/drivers/net/fs_enet/mac-fec.c
@@ -12,7 +12,6 @@
 * kind, whether express or implied.
 */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
diff --git a/drivers/net/fs_enet/mac-scc.c b/drivers/net/fs_enet/mac-scc.c
index a772b286f96d..eaa24fab645f 100644
--- a/drivers/net/fs_enet/mac-scc.c
+++ b/drivers/net/fs_enet/mac-scc.c
@@ -12,7 +12,6 @@
 * kind, whether express or implied.
 */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
diff --git a/drivers/net/fs_enet/mii-bitbang.c b/drivers/net/fs_enet/mii-bitbang.c
index 24a5e2e23d18..48f9cf83ab6f 100644
--- a/drivers/net/fs_enet/mii-bitbang.c
+++ b/drivers/net/fs_enet/mii-bitbang.c
@@ -13,7 +13,6 @@
 */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
diff --git a/drivers/net/fs_enet/mii-fixed.c b/drivers/net/fs_enet/mii-fixed.c
index b3e192d612e5..ae4a9c3bb393 100644
--- a/drivers/net/fs_enet/mii-fixed.c
+++ b/drivers/net/fs_enet/mii-fixed.c
@@ -13,7 +13,6 @@
 */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index 218d31764c52..ebbbd6ca6204 100644
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@ -64,7 +64,6 @@
 *  The driver then cleans up the buffer.
 */
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/string.h>
diff --git a/drivers/net/gianfar.h b/drivers/net/gianfar.h
index 127c98cf3336..f87bbc408dae 100644
--- a/drivers/net/gianfar.h
+++ b/drivers/net/gianfar.h
@@ -22,7 +22,6 @@
 #ifndef __GIANFAR_H
 #define __GIANFAR_H
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/string.h>
diff --git a/drivers/net/gianfar_ethtool.c b/drivers/net/gianfar_ethtool.c
index d69698c695ef..e0f505285e50 100644
--- a/drivers/net/gianfar_ethtool.c
+++ b/drivers/net/gianfar_ethtool.c
@@ -15,7 +15,6 @@
 *  by reference.
 */
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/string.h>
diff --git a/drivers/net/gianfar_mii.c b/drivers/net/gianfar_mii.c
index c6b725529af5..c92e65984fd0 100644
--- a/drivers/net/gianfar_mii.c
+++ b/drivers/net/gianfar_mii.c
@@ -16,7 +16,6 @@
 *
 */
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/string.h>
diff --git a/drivers/net/gianfar_sysfs.c b/drivers/net/gianfar_sysfs.c
index a6d5c43199cb..e8a18f18d08c 100644
--- a/drivers/net/gianfar_sysfs.c
+++ b/drivers/net/gianfar_sysfs.c
@@ -19,7 +19,6 @@
 * Sysfs file creation and management
 */
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/string.h>
diff --git a/drivers/net/gt96100eth.c b/drivers/net/gt96100eth.c
index 2d2435404614..2b4db7414475 100644
--- a/drivers/net/gt96100eth.c
+++ b/drivers/net/gt96100eth.c
@@ -699,7 +699,6 @@ static int __init gt96100_probe1(struct pci_dev *pci, int port_num)
        memset(gp, 0, sizeof(*gp)); // clear it
        gp->port_num = port_num;
-        gp->io_size = GT96100_ETH_IO_SIZE;
        gp->port_offset = port_num * GT96100_ETH_IO_SIZE;
        gp->phy_addr = phy_addr;
        gp->chip_rev = chip_rev;
@@ -1030,7 +1029,7 @@ gt96100_open(struct net_device *dev)
        }
        if ((retval = request_irq(dev->irq, &gt96100_interrupt,
-                                  SA_SHIRQ, dev->name, dev))) {
+                                  IRQF_SHARED, dev->name, dev))) {
                err("unable to get IRQ %d\n", dev->irq);
                return retval;
        }
@@ -1531,7 +1530,7 @@ static void gt96100_cleanup_module(void)
                                + sizeof(gt96100_td_t) * TX_RING_SIZE,
                                gp->rx_ring);
                        free_netdev(gtif->dev);
-                        release_region(gtif->iobase, gp->io_size);
+                        release_region(gtif->iobase, GT96100_ETH_IO_SIZE);
                }
        }
 }
diff --git a/drivers/net/gt96100eth.h b/drivers/net/gt96100eth.h
index 395869c5ed3e..3b62a87c7d7f 100644
--- a/drivers/net/gt96100eth.h
+++ b/drivers/net/gt96100eth.h
@@ -27,7 +27,6 @@
 #ifndef _GT96100ETH_H
 #define _GT96100ETH_H
-#include <linux/config.h>
 #include <asm/galileo-boards/gt96100.h>
 #define dbg(lvl, format, arg...) \
@@ -332,7 +331,6 @@ struct gt96100_private {
        mib_counters_t mib;
        struct net_device_stats stats;
-        int io_size;
        int port_num;  // 0 or 1
        int chip_rev;
        u32 port_offset;
@@ -341,7 +339,6 @@ struct gt96100_private {
        u32 last_psr; // last value of the port status register
        int options;     /* User-settable misc. driver options. */
-        int drv_flags;
        struct timer_list timer;
        spinlock_t lock; /* Serialise access to device */
 };
diff --git a/drivers/net/hamachi.c b/drivers/net/hamachi.c
index 0ea4cb4a0d80..409c6aab0411 100644
--- a/drivers/net/hamachi.c
+++ b/drivers/net/hamachi.c
@@ -20,22 +20,15 @@
        Support and updates available at
        http://www.scyld.com/network/hamachi.html
+        [link no longer provides useful info -jgarzik]
        or
        http://www.parl.clemson.edu/~keithu/hamachi.html
-        Linux kernel changelog:
-        LK1.0.1:
-        - fix lack of pci_dev<->dev association
-        - ethtool support (jgarzik)
 */
 #define DRV_NAME        "hamachi"
-#define DRV_VERSION     "1.01+LK1.0.1"
+#define DRV_VERSION     "2.0"
-#define DRV_RELDATE     "5/18/2001"
+#define DRV_RELDATE     "June 27, 2006"
 /* A few user-configurable values. */
@@ -608,7 +601,8 @@ static int __devinit hamachi_init_one (struct pci_dev *pdev,
        pci_set_master(pdev);
        i = pci_request_regions(pdev, DRV_NAME);
-        if (i) return i;
+        if (i)
+                return i;
        irq = pdev->irq;
        ioaddr = ioremap(base, 0x400);
@@ -871,7 +865,7 @@ static int hamachi_open(struct net_device *dev)
        u32 rx_int_var, tx_int_var;
        u16 fifo_info;
-        i = request_irq(dev->irq, &hamachi_interrupt, SA_SHIRQ, dev->name, dev);
+        i = request_irq(dev->irq, &hamachi_interrupt, IRQF_SHARED, dev->name, dev);
        if (i)
                return i;
diff --git a/drivers/net/hamradio/6pack.c b/drivers/net/hamradio/6pack.c
index d12605f0ac7c..86b3bb9bec2d 100644
--- a/drivers/net/hamradio/6pack.c
+++ b/drivers/net/hamradio/6pack.c
@@ -12,7 +12,6 @@
 *              Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
 */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <asm/system.h>
 #include <asm/uaccess.h>
diff --git a/drivers/net/hamradio/baycom_ser_fdx.c b/drivers/net/hamradio/baycom_ser_fdx.c
index 232793d2ce6b..55906c7b4bb1 100644
--- a/drivers/net/hamradio/baycom_ser_fdx.c
+++ b/drivers/net/hamradio/baycom_ser_fdx.c
@@ -434,7 +434,7 @@ static int ser12_open(struct net_device *dev)
        outb(0, FCR(dev->base_addr));  /* disable FIFOs */
        outb(0x0d, MCR(dev->base_addr));
        outb(0, IER(dev->base_addr));
-        if (request_irq(dev->irq, ser12_interrupt, SA_INTERRUPT | SA_SHIRQ,
+        if (request_irq(dev->irq, ser12_interrupt, IRQF_DISABLED | IRQF_SHARED,
                        "baycom_ser_fdx", dev)) {
                release_region(dev->base_addr, SER12_EXTENT);
                return -EBUSY;
diff --git a/drivers/net/hamradio/baycom_ser_hdx.c b/drivers/net/hamradio/baycom_ser_hdx.c
index be596a3eb3fd..de95de8983da 100644
--- a/drivers/net/hamradio/baycom_ser_hdx.c
+++ b/drivers/net/hamradio/baycom_ser_hdx.c
@@ -488,7 +488,7 @@ static int ser12_open(struct net_device *dev)
        outb(0, FCR(dev->base_addr));  /* disable FIFOs */
        outb(0x0d, MCR(dev->base_addr));
        outb(0, IER(dev->base_addr));
-        if (request_irq(dev->irq, ser12_interrupt, SA_INTERRUPT | SA_SHIRQ,
+        if (request_irq(dev->irq, ser12_interrupt, IRQF_DISABLED | IRQF_SHARED,
                        "baycom_ser12", dev)) {
                release_region(dev->base_addr, SER12_EXTENT);       
                return -EBUSY;
diff --git a/drivers/net/hamradio/bpqether.c b/drivers/net/hamradio/bpqether.c
index cb43a9d28774..0641f54fc638 100644
--- a/drivers/net/hamradio/bpqether.c
+++ b/drivers/net/hamradio/bpqether.c
@@ -54,7 +54,6 @@
 *      BPQ   004       Joerg(DL1BKE)           Fixed to not lock up on ifconfig.
 */
-#include <linux/config.h>
 #include <linux/errno.h>
 #include <linux/types.h>
 #include <linux/socket.h>
diff --git a/drivers/net/hamradio/dmascc.c b/drivers/net/hamradio/dmascc.c
index 0d5fccc984bb..c9a46b89942a 100644
--- a/drivers/net/hamradio/dmascc.c
+++ b/drivers/net/hamradio/dmascc.c
@@ -436,7 +436,7 @@ static int __init dmascc_init(void)
 module_init(dmascc_init);
 module_exit(dmascc_exit);
-static void dev_setup(struct net_device *dev)
+static void __init dev_setup(struct net_device *dev)
 {
        dev->type = ARPHRD_AX25;
        dev->hard_header_len = AX25_MAX_HEADER_LEN;
diff --git a/drivers/net/hamradio/mkiss.c b/drivers/net/hamradio/mkiss.c
index 3ebbbe56b6e9..d8715b200c17 100644
--- a/drivers/net/hamradio/mkiss.c
+++ b/drivers/net/hamradio/mkiss.c
@@ -16,7 +16,6 @@
 * Copyright (C) 2004, 05 Ralf Baechle DL5RB <ralf@linux-mips.org>
 * Copyright (C) 2004, 05 Thomas Osterried DL9SAU <thomas@x-berg.in-berlin.de>
 */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <asm/system.h>
 #include <linux/bitops.h>
diff --git a/drivers/net/hamradio/scc.c b/drivers/net/hamradio/scc.c
index 5927784df3f9..df4b68142ac7 100644
--- a/drivers/net/hamradio/scc.c
+++ b/drivers/net/hamradio/scc.c
@@ -148,7 +148,6 @@
 /* ----------------------------------------------------------------------- */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/errno.h>
 #include <linux/signal.h>
@@ -1737,7 +1736,7 @@ static int scc_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
                                
                        if (!Ivec[hwcfg.irq].used && hwcfg.irq)
                        {
-                                if (request_irq(hwcfg.irq, scc_isr, SA_INTERRUPT, "AX.25 SCC", NULL))
+                                if (request_irq(hwcfg.irq, scc_isr, IRQF_DISABLED, "AX.25 SCC", NULL))
                                        printk(KERN_WARNING "z8530drv: warning, cannot get IRQ %d\n", hwcfg.irq);
                                else
                                        Ivec[hwcfg.irq].used = 1;
diff --git a/drivers/net/hamradio/yam.c b/drivers/net/hamradio/yam.c
index b49884048caa..f98f5777dfbb 100644
--- a/drivers/net/hamradio/yam.c
+++ b/drivers/net/hamradio/yam.c
@@ -42,7 +42,6 @@
 /*****************************************************************************/
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/net.h>
@@ -874,7 +873,7 @@ static int yam_open(struct net_device *dev)
                goto out_release_base;
        }
        outb(0, IER(dev->base_addr));
-        if (request_irq(dev->irq, yam_interrupt, SA_INTERRUPT | SA_SHIRQ, dev->name, dev)) {
+        if (request_irq(dev->irq, yam_interrupt, IRQF_DISABLED | IRQF_SHARED, dev->name, dev)) {
                printk(KERN_ERR "%s: irq %d busy\n", dev->name, dev->irq);
                ret = -EBUSY;
                goto out_release_base;
diff --git a/drivers/net/hp100.c b/drivers/net/hp100.c
index 247c8ca86033..e7d9bf330287 100644
--- a/drivers/net/hp100.c
+++ b/drivers/net/hp100.c
@@ -1079,7 +1079,7 @@ static int hp100_open(struct net_device *dev)
        /* New: if bus is PCI or EISA, interrupts might be shared interrupts */
        if (request_irq(dev->irq, hp100_interrupt,
                        lp->bus == HP100_BUS_PCI || lp->bus ==
-                        HP100_BUS_EISA ? SA_SHIRQ : SA_INTERRUPT,
+                        HP100_BUS_EISA ? IRQF_SHARED : IRQF_DISABLED,
                        "hp100", dev)) {
                printk("hp100: %s: unable to get IRQ %d\n", dev->name, dev->irq);
                return -EAGAIN;
@@ -1487,11 +1487,8 @@ static int hp100_start_xmit_bm(struct sk_buff *skb, struct net_device *dev)
        if (skb->len <= 0)
                return 0;
                
-        if (skb->len < ETH_ZLEN && lp->chip == HP100_CHIPID_SHASTA) {
+        if (lp->chip == HP100_CHIPID_SHASTA && skb_padto(skb, ETH_ZLEN))
-                skb = skb_padto(skb, ETH_ZLEN);
+                return 0;
-                if (skb == NULL)
-                        return 0;
-        }
        /* Get Tx ring tail pointer */
        if (lp->txrtail->next == lp->txrhead) {
diff --git a/drivers/net/hydra.c b/drivers/net/hydra.c
index d9fb8e74e631..91326ea3e12b 100644
--- a/drivers/net/hydra.c
+++ b/drivers/net/hydra.c
@@ -117,7 +117,7 @@ static int __devinit hydra_init(struct zorro_dev *z)
    dev->irq = IRQ_AMIGA_PORTS;
    /* Install the Interrupt handler */
-    if (request_irq(IRQ_AMIGA_PORTS, ei_interrupt, SA_SHIRQ, "Hydra Ethernet",
+    if (request_irq(IRQ_AMIGA_PORTS, ei_interrupt, IRQF_SHARED, "Hydra Ethernet",
                    dev)) {
        free_netdev(dev);
        return -EAGAIN;
diff --git a/drivers/net/ibm_emac/ibm_emac.h b/drivers/net/ibm_emac/ibm_emac.h
index c2dae6092c4c..97ed22bb4320 100644
--- a/drivers/net/ibm_emac/ibm_emac.h
+++ b/drivers/net/ibm_emac/ibm_emac.h
@@ -20,7 +20,6 @@
 #ifndef __IBM_EMAC_H_
 #define __IBM_EMAC_H_
-#include <linux/config.h>
 #include <linux/types.h>
 /* This is a simple check to prevent use of this driver on non-tested SoCs */
diff --git a/drivers/net/ibm_emac/ibm_emac_core.c b/drivers/net/ibm_emac/ibm_emac_core.c
index 7e49522b8b3c..82468e2dc799 100644
--- a/drivers/net/ibm_emac/ibm_emac_core.c
+++ b/drivers/net/ibm_emac/ibm_emac_core.c
@@ -19,7 +19,6 @@
 *
 */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
diff --git a/drivers/net/ibm_emac/ibm_emac_core.h b/drivers/net/ibm_emac/ibm_emac_core.h
index f61273b2e94f..dabb94afeb98 100644
--- a/drivers/net/ibm_emac/ibm_emac_core.h
+++ b/drivers/net/ibm_emac/ibm_emac_core.h
@@ -20,7 +20,6 @@
 #ifndef __IBM_EMAC_CORE_H_
 #define __IBM_EMAC_CORE_H_
-#include <linux/config.h>
 #include <linux/netdevice.h>
 #include <linux/dma-mapping.h>
 #include <asm/ocp.h>
diff --git a/drivers/net/ibm_emac/ibm_emac_debug.c b/drivers/net/ibm_emac/ibm_emac_debug.c
index c7e1ecfa08fe..c3645908034d 100644
--- a/drivers/net/ibm_emac/ibm_emac_debug.c
+++ b/drivers/net/ibm_emac/ibm_emac_debug.c
@@ -12,7 +12,6 @@
 * option) any later version.
 *
 */
-#include <linux/config.h>
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
diff --git a/drivers/net/ibm_emac/ibm_emac_debug.h b/drivers/net/ibm_emac/ibm_emac_debug.h
index e85fbe0a8da9..5761389495d0 100644
--- a/drivers/net/ibm_emac/ibm_emac_debug.h
+++ b/drivers/net/ibm_emac/ibm_emac_debug.h
@@ -15,7 +15,6 @@
 #ifndef __IBM_EMAC_DEBUG_H_
 #define __IBM_EMAC_DEBUG_H_
-#include <linux/config.h>
 #include <linux/init.h>
 #include "ibm_emac_core.h"
 #include "ibm_emac_mal.h"
diff --git a/drivers/net/ibm_emac/ibm_emac_mal.c b/drivers/net/ibm_emac/ibm_emac_mal.c
index da88d43081cc..af50e7b2e0d7 100644
--- a/drivers/net/ibm_emac/ibm_emac_mal.c
+++ b/drivers/net/ibm_emac/ibm_emac_mal.c
@@ -19,7 +19,6 @@
 * option) any later version.
 *
 */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
diff --git a/drivers/net/ibm_emac/ibm_emac_mal.h b/drivers/net/ibm_emac/ibm_emac_mal.h
index 2a2d3b24b037..f73f10a0a562 100644
--- a/drivers/net/ibm_emac/ibm_emac_mal.h
+++ b/drivers/net/ibm_emac/ibm_emac_mal.h
@@ -19,7 +19,6 @@
 #ifndef __IBM_EMAC_MAL_H_
 #define __IBM_EMAC_MAL_H_
-#include <linux/config.h>
 #include <linux/init.h>
 #include <linux/list.h>
 #include <linux/netdevice.h>
diff --git a/drivers/net/ibm_emac/ibm_emac_phy.c b/drivers/net/ibm_emac/ibm_emac_phy.c
index 67935dd33a65..4a97024061e5 100644
--- a/drivers/net/ibm_emac/ibm_emac_phy.c
+++ b/drivers/net/ibm_emac/ibm_emac_phy.c
@@ -12,7 +12,6 @@
 * (c) 2004-2005, Eugene Surovegin <ebs@ebshome.net>
 *
 */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
diff --git a/drivers/net/ibm_emac/ibm_emac_rgmii.c b/drivers/net/ibm_emac/ibm_emac_rgmii.c
index f0b1ffb2dbbf..53d281cb9a16 100644
--- a/drivers/net/ibm_emac/ibm_emac_rgmii.c
+++ b/drivers/net/ibm_emac/ibm_emac_rgmii.c
@@ -16,7 +16,6 @@
 * option) any later version.
 *
 */
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/ethtool.h>
 #include <asm/io.h>
diff --git a/drivers/net/ibm_emac/ibm_emac_rgmii.h b/drivers/net/ibm_emac/ibm_emac_rgmii.h
index 7f03d536c9a3..94abde55e2e9 100644
--- a/drivers/net/ibm_emac/ibm_emac_rgmii.h
+++ b/drivers/net/ibm_emac/ibm_emac_rgmii.h
@@ -21,7 +21,6 @@
 #ifndef _IBM_EMAC_RGMII_H_
 #define _IBM_EMAC_RGMII_H_
-#include <linux/config.h>
 /* RGMII bridge */
 struct rgmii_regs {
diff --git a/drivers/net/ibm_emac/ibm_emac_tah.c b/drivers/net/ibm_emac/ibm_emac_tah.c
index af08afc22f9f..e287b451bb44 100644
--- a/drivers/net/ibm_emac/ibm_emac_tah.c
+++ b/drivers/net/ibm_emac/ibm_emac_tah.c
@@ -13,7 +13,6 @@
 * Free Software Foundation;  either version 2 of the  License, or (at your
 * option) any later version.
 */
-#include <linux/config.h>
 #include <asm/io.h>
 #include "ibm_emac_core.h"
diff --git a/drivers/net/ibm_emac/ibm_emac_tah.h b/drivers/net/ibm_emac/ibm_emac_tah.h
index 9299b5dd7eb1..38153945a240 100644
--- a/drivers/net/ibm_emac/ibm_emac_tah.h
+++ b/drivers/net/ibm_emac/ibm_emac_tah.h
@@ -17,7 +17,6 @@
 #ifndef _IBM_EMAC_TAH_H
 #define _IBM_EMAC_TAH_H
-#include <linux/config.h>
 #include <linux/init.h>
 #include <asm/ocp.h>
diff --git a/drivers/net/ibm_emac/ibm_emac_zmii.c b/drivers/net/ibm_emac/ibm_emac_zmii.c
index e129e0aaa045..37dc8f342868 100644
--- a/drivers/net/ibm_emac/ibm_emac_zmii.c
+++ b/drivers/net/ibm_emac/ibm_emac_zmii.c
@@ -16,7 +16,6 @@
 * option) any later version.
 *
 */
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/ethtool.h>
 #include <asm/io.h>
diff --git a/drivers/net/ibm_emac/ibm_emac_zmii.h b/drivers/net/ibm_emac/ibm_emac_zmii.h
index 92c854410753..972e3a44a09f 100644
--- a/drivers/net/ibm_emac/ibm_emac_zmii.h
+++ b/drivers/net/ibm_emac/ibm_emac_zmii.h
@@ -19,7 +19,6 @@
 #ifndef _IBM_EMAC_ZMII_H_
 #define _IBM_EMAC_ZMII_H_
-#include <linux/config.h>
 #include <linux/init.h>
 #include <asm/ocp.h>
diff --git a/drivers/net/ibmlana.c b/drivers/net/ibmlana.c
index 51fd51609ea9..2a95d72fa593 100644
--- a/drivers/net/ibmlana.c
+++ b/drivers/net/ibmlana.c
@@ -782,7 +782,7 @@ static int ibmlana_open(struct net_device *dev)
        /* register resources - only necessary for IRQ */
-        result = request_irq(priv->realirq, irq_handler, SA_SHIRQ | SA_SAMPLE_RANDOM, dev->name, dev);
+        result = request_irq(priv->realirq, irq_handler, IRQF_SHARED | IRQF_SAMPLE_RANDOM, dev->name, dev);
        if (result != 0) {
                printk(KERN_ERR "%s: failed to register irq %d\n", dev->name, dev->irq);
                return result;
diff --git a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c
index 666346f6469e..0464e78f733a 100644
--- a/drivers/net/ibmveth.c
+++ b/drivers/net/ibmveth.c
@@ -33,7 +33,6 @@
  - possibly remove procfs support
 */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/errno.h>
@@ -61,7 +60,7 @@
 #undef DEBUG
 #define ibmveth_printk(fmt, args...) \
-  printk(KERN_INFO "%s: " fmt, __FILE__, ## args)
+  printk(KERN_DEBUG "%s: " fmt, __FILE__, ## args)
 #define ibmveth_error_printk(fmt, args...) \
  printk(KERN_ERR "(%s:%3.3d ua:%x) ERROR: " fmt, __FILE__, __LINE__ , adapter->vdev->unit_address, ## args)
diff --git a/drivers/net/ifb.c b/drivers/net/ifb.c
index 2e222ef91e22..3a42afab5036 100644
--- a/drivers/net/ifb.c
+++ b/drivers/net/ifb.c
@@ -27,7 +27,6 @@
 */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/netdevice.h>
diff --git a/drivers/net/ioc3-eth.c b/drivers/net/ioc3-eth.c
index ae71ed57c12d..68d8af7df08e 100644
--- a/drivers/net/ioc3-eth.c
+++ b/drivers/net/ioc3-eth.c
@@ -30,7 +30,6 @@
 #define IOC3_NAME       "ioc3-eth"
 #define IOC3_VERSION    "2.6.3-3"
-#include <linux/config.h>
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
@@ -145,7 +144,7 @@ static inline struct sk_buff * ioc3_alloc_skb(unsigned long length,
 static inline unsigned long ioc3_map(void *ptr, unsigned long vdev)
 {
 #ifdef CONFIG_SGI_IP27
-        vdev <<= 58;   /* Shift to PCI64_ATTR_VIRTUAL */
+        vdev <<= 57;   /* Shift to PCI64_ATTR_VIRTUAL */
        return vdev | (0xaUL << PCI64_ATTR_TARG_SHFT) | PCI64_ATTR_PREF |
               ((unsigned long)ptr & TO_PHYS_MASK);
@@ -1064,7 +1063,7 @@ static int ioc3_open(struct net_device *dev)
 {
        struct ioc3_private *ip = netdev_priv(dev);
-        if (request_irq(dev->irq, ioc3_interrupt, SA_SHIRQ, ioc3_str, dev)) {
+        if (request_irq(dev->irq, ioc3_interrupt, IRQF_SHARED, ioc3_str, dev)) {
                printk(KERN_ERR "%s: Can't get irq %d\n", dev->name, dev->irq);
                return -EAGAIN;
diff --git a/drivers/net/irda/Kconfig b/drivers/net/irda/Kconfig
index d2ce4896abff..e9e6d99a9add 100644
--- a/drivers/net/irda/Kconfig
+++ b/drivers/net/irda/Kconfig
@@ -350,7 +350,7 @@ config TOSHIBA_FIR
 config AU1000_FIR
        tristate "Alchemy Au1000 SIR/FIR"
-        depends on MIPS_AU1000 && IRDA
+        depends on SOC_AU1000 && IRDA
 config SMC_IRCC_FIR
        tristate "SMSC IrCC (EXPERIMENTAL)"
diff --git a/drivers/net/irda/au1k_ir.c b/drivers/net/irda/au1k_ir.c
index e6b1985767c2..7b2b4135bb23 100644
--- a/drivers/net/irda/au1k_ir.c
+++ b/drivers/net/irda/au1k_ir.c
@@ -18,7 +18,6 @@
 *  with this program; if not, write to the Free Software Foundation, Inc.,
 *  59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
 */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/init.h>
diff --git a/drivers/net/irda/donauboe.c b/drivers/net/irda/donauboe.c
index 910c0cab35b0..33c07d5275da 100644
--- a/drivers/net/irda/donauboe.c
+++ b/drivers/net/irda/donauboe.c
@@ -1372,7 +1372,7 @@ toshoboe_net_open (struct net_device *dev)
    return 0;
  if (request_irq (self->io.irq, toshoboe_interrupt,
-                   SA_SHIRQ | SA_INTERRUPT, dev->name, (void *) self))
+                   IRQF_SHARED | IRQF_DISABLED, dev->name, (void *) self))
    {
      return -EAGAIN;
    }
@@ -1573,7 +1573,7 @@ toshoboe_open (struct pci_dev *pci_dev, const struct pci_device_id *pdid)
  self->io.fir_base = self->base;
  self->io.fir_ext = OBOE_IO_EXTENT;
  self->io.irq = pci_dev->irq;
-  self->io.irqflags = SA_SHIRQ | SA_INTERRUPT;
+  self->io.irqflags = IRQF_SHARED | IRQF_DISABLED;
  self->speed = self->io.speed = 9600;
  self->async = 0;
diff --git a/drivers/net/irda/irda-usb.c b/drivers/net/irda/irda-usb.c
index 844fa74ac9ec..2a0d538b387f 100644
--- a/drivers/net/irda/irda-usb.c
+++ b/drivers/net/irda/irda-usb.c
@@ -1105,7 +1105,7 @@ static int stir421x_patch_device(struct irda_usb_cb *self)
                return ret;
        /* We get a patch from userspace */
-        IRDA_MESSAGE("%s(): Received firmware %s (%u bytes)\n",
+        IRDA_MESSAGE("%s(): Received firmware %s (%zu bytes)\n",
                     __FUNCTION__, stir421x_fw_name, fw->size);
        ret = -EINVAL;
diff --git a/drivers/net/irda/irport.c b/drivers/net/irda/irport.c
index 98fa5319e5cc..44efd49bf4a9 100644
--- a/drivers/net/irda/irport.c
+++ b/drivers/net/irda/irport.c
@@ -386,7 +386,7 @@ static int __irport_change_speed(struct irda_task *task)
        /* Locking notes : this function may be called from irq context with
         * spinlock, via irport_write_wakeup(), or from non-interrupt without
         * spinlock (from the task timer). Yuck !
-         * This is ugly, and unsafe is the spinlock is not already aquired.
+         * This is ugly, and unsafe is the spinlock is not already acquired.
         * This will be fixed when irda-task get rewritten.
         * Jean II */
        if (!spin_is_locked(&self->lock)) {
diff --git a/drivers/net/irda/mcs7780.c b/drivers/net/irda/mcs7780.c
index 754297fc8f22..47f6f64d604c 100644
--- a/drivers/net/irda/mcs7780.c
+++ b/drivers/net/irda/mcs7780.c
@@ -101,7 +101,7 @@ static int transceiver_type = MCS_TSC_VISHAY;
 module_param(transceiver_type, int, 0444);
 MODULE_PARM_DESC(transceiver_type, "IR transceiver type, see mcs7780.h.");
-struct usb_driver mcs_driver = {
+static struct usb_driver mcs_driver = {
        .name = "mcs7780",
        .probe = mcs_probe,
        .disconnect = mcs_disconnect,
diff --git a/drivers/net/irda/nsc-ircc.c b/drivers/net/irda/nsc-ircc.c
index cc7ff8f00e42..cb62f2a9676a 100644
--- a/drivers/net/irda/nsc-ircc.c
+++ b/drivers/net/irda/nsc-ircc.c
@@ -115,8 +115,12 @@ static nsc_chip_t chips[] = {
        /* Contributed by Jan Frey - IBM A30/A31 */
        { "PC8739x", { 0x2e, 0x4e, 0x0 }, 0x20, 0xea, 0xff, 
          nsc_ircc_probe_39x, nsc_ircc_init_39x },
-        { "IBM", { 0x2e, 0x4e, 0x0 }, 0x20, 0xf4, 0xff,
+        /* IBM ThinkPads using PC8738x (T60/X60/Z60) */
-          nsc_ircc_probe_39x, nsc_ircc_init_39x },
+        { "IBM-PC8738x", { 0x2e, 0x4e, 0x0 }, 0x20, 0xf4, 0xff,
+          nsc_ircc_probe_39x, nsc_ircc_init_39x },
+        /* IBM ThinkPads using PC8394T (T43/R52/?) */
+        { "IBM-PC8394T", { 0x2e, 0x4e, 0x0 }, 0x20, 0xf9, 0xff,
+          nsc_ircc_probe_39x, nsc_ircc_init_39x },
        { NULL }
 };
diff --git a/drivers/net/irda/pxaficp_ir.c b/drivers/net/irda/pxaficp_ir.c
index e1aa9910503b..afb19e8d95c8 100644
--- a/drivers/net/irda/pxaficp_ir.c
+++ b/drivers/net/irda/pxaficp_ir.c
@@ -12,7 +12,6 @@
 * Infra-red driver (SIR/FIR) for the PXA2xx embedded microprocessor
 *
 */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/init.h>
diff --git a/drivers/net/irda/sa1100_ir.c b/drivers/net/irda/sa1100_ir.c
index f530686bd09f..8d5a288d7976 100644
--- a/drivers/net/irda/sa1100_ir.c
+++ b/drivers/net/irda/sa1100_ir.c
@@ -18,7 +18,6 @@
 *      power_leve:level        - set the transmitter power level
 *      tx_lpm:0|1              - set transmit low power mode
 */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/types.h>
diff --git a/drivers/net/irda/vlsi_ir.c b/drivers/net/irda/vlsi_ir.c
index d70b9e8d6e60..92d646cc9edc 100644
--- a/drivers/net/irda/vlsi_ir.c
+++ b/drivers/net/irda/vlsi_ir.c
@@ -21,7 +21,6 @@
 *
 ********************************************************************/
-#include <linux/config.h>
 #include <linux/module.h>
 
 #define DRIVER_NAME             "vlsi_ir"
@@ -1518,7 +1517,7 @@ static int vlsi_open(struct net_device *ndev)
        outb(IRINTR_INT_MASK, ndev->base_addr+VLSI_PIO_IRINTR);
-        if (request_irq(ndev->irq, vlsi_interrupt, SA_SHIRQ,
+        if (request_irq(ndev->irq, vlsi_interrupt, IRQF_SHARED,
                        drivername, ndev)) {
                IRDA_WARNING("%s: couldn't get IRQ: %d\n",
                             __FUNCTION__, ndev->irq);
diff --git a/drivers/net/iseries_veth.c b/drivers/net/iseries_veth.c
index f0f04be989d6..cdc14401cdbe 100644
--- a/drivers/net/iseries_veth.c
+++ b/drivers/net/iseries_veth.c
@@ -56,7 +56,6 @@
 * number of packets outstanding to a remote partition at a time.
 */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/errno.h>
@@ -69,6 +68,7 @@
 #include <linux/delay.h>
 #include <linux/mm.h>
 #include <linux/ethtool.h>
+#include <linux/if_ether.h>
 #include <asm/abs_addr.h>
 #include <asm/iseries/mf.h>
@@ -1035,11 +1035,22 @@ static struct ethtool_ops ops = {
        .get_link = veth_get_link,
 };
-static struct net_device * __init veth_probe_one(int vlan, struct device *vdev)
+static struct net_device * __init veth_probe_one(int vlan,
+                struct vio_dev *vio_dev)
 {
        struct net_device *dev;
        struct veth_port *port;
+        struct device *vdev = &vio_dev->dev;
        int i, rc;
+        const unsigned char *mac_addr;
+        mac_addr = vio_get_attribute(vio_dev, "local-mac-address", NULL);
+        if (mac_addr == NULL)
+                mac_addr = vio_get_attribute(vio_dev, "mac-address", NULL);
+        if (mac_addr == NULL) {
+                veth_error("Unable to fetch MAC address from device tree.\n");
+                return NULL;
+        }
        dev = alloc_etherdev(sizeof (struct veth_port));
        if (! dev) {
@@ -1064,16 +1075,11 @@ static struct net_device * __init veth_probe_one(int vlan, struct device *vdev)
        }
        port->dev = vdev;
-        dev->dev_addr[0] = 0x02;
+        memcpy(dev->dev_addr, mac_addr, ETH_ALEN);
-        dev->dev_addr[1] = 0x01;
-        dev->dev_addr[2] = 0xff;
-        dev->dev_addr[3] = vlan;
-        dev->dev_addr[4] = 0xff;
-        dev->dev_addr[5] = this_lp;
        dev->mtu = VETH_MAX_MTU;
-        memcpy(&port->mac_addr, dev->dev_addr, 6);
+        memcpy(&port->mac_addr, mac_addr, ETH_ALEN);
        dev->open = veth_open;
        dev->hard_start_xmit = veth_start_xmit;
@@ -1608,7 +1614,7 @@ static int veth_probe(struct vio_dev *vdev, const struct vio_device_id *id)
        struct net_device *dev;
        struct veth_port *port;
-        dev = veth_probe_one(i, &vdev->dev);
+        dev = veth_probe_one(i, vdev);
        if (dev == NULL) {
                veth_remove(vdev);
                return 1;
@@ -1641,7 +1647,7 @@ static int veth_probe(struct vio_dev *vdev, const struct vio_device_id *id)
 * support.
 */
 static struct vio_device_id veth_device_table[] __devinitdata = {
-        { "vlan", "" },
+        { "network", "IBM,iSeries-l-lan" },
        { "", "" }
 };
 MODULE_DEVICE_TABLE(vio, veth_device_table);
diff --git a/drivers/net/ixgb/ixgb.h b/drivers/net/ixgb/ixgb.h
index a83ef28dadb0..82b67af54c94 100644
--- a/drivers/net/ixgb/ixgb.h
+++ b/drivers/net/ixgb/ixgb.h
@@ -30,7 +30,6 @@
 #define _IXGB_H_
 #include <linux/stddef.h>
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/types.h>
 #include <asm/byteorder.h>
diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c
index 57006fb8840e..b91e082483f6 100644
--- a/drivers/net/ixgb/ixgb_main.c
+++ b/drivers/net/ixgb/ixgb_main.c
@@ -253,7 +253,7 @@ ixgb_up(struct ixgb_adapter *adapter)
 #endif
        if((err = request_irq(adapter->pdev->irq, &ixgb_intr,
-                                  SA_SHIRQ | SA_SAMPLE_RANDOM,
+                                  IRQF_SHARED | IRQF_SAMPLE_RANDOM,
                                  netdev->name, netdev))) {
                DPRINTK(PROBE, ERR,
                 "Unable to allocate interrupt Error: %d\n", err);
@@ -1173,7 +1173,7 @@ ixgb_tso(struct ixgb_adapter *adapter, struct sk_buff *skb)
        uint16_t ipcse, tucse, mss;
        int err;
-        if(likely(skb_shinfo(skb)->tso_size)) {
+        if(likely(skb_shinfo(skb)->gso_size)) {
                if (skb_header_cloned(skb)) {
                        err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC);
                        if (err)
@@ -1181,7 +1181,7 @@ ixgb_tso(struct ixgb_adapter *adapter, struct sk_buff *skb)
                }
                hdr_len = ((skb->h.raw - skb->data) + (skb->h.th->doff << 2));
-                mss = skb_shinfo(skb)->tso_size;
+                mss = skb_shinfo(skb)->gso_size;
                skb->nh.iph->tot_len = 0;
                skb->nh.iph->check = 0;
                skb->h.th->check = ~csum_tcpudp_magic(skb->nh.iph->saddr,
diff --git a/drivers/net/ixp2000/caleb.c b/drivers/net/ixp2000/caleb.c
index 3595e107df22..7dea5b95012c 100644
--- a/drivers/net/ixp2000/caleb.c
+++ b/drivers/net/ixp2000/caleb.c
@@ -9,7 +9,6 @@
 * (at your option) any later version.
 */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/delay.h>
 #include <asm/io.h>
diff --git a/drivers/net/ixp2000/enp2611.c b/drivers/net/ixp2000/enp2611.c
index b67f586d7392..d3f4235c585d 100644
--- a/drivers/net/ixp2000/enp2611.c
+++ b/drivers/net/ixp2000/enp2611.c
@@ -9,7 +9,6 @@
 * (at your option) any later version.
 */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/netdevice.h>
diff --git a/drivers/net/ixp2000/ixp2400-msf.c b/drivers/net/ixp2000/ixp2400-msf.c
index 48a3a891d3a4..9ec38eebfb56 100644
--- a/drivers/net/ixp2000/ixp2400-msf.c
+++ b/drivers/net/ixp2000/ixp2400-msf.c
@@ -11,7 +11,6 @@
 * License, or (at your option) any later version.
 */
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <asm/hardware.h>
diff --git a/drivers/net/ixp2000/ixpdev.c b/drivers/net/ixp2000/ixpdev.c
index fbc2d21020f4..6eeb965b4d72 100644
--- a/drivers/net/ixp2000/ixpdev.c
+++ b/drivers/net/ixp2000/ixpdev.c
@@ -9,7 +9,6 @@
 * (at your option) any later version.
 */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/netdevice.h>
@@ -236,7 +235,7 @@ static int ixpdev_open(struct net_device *dev)
        if (!nds_open++) {
                err = request_irq(IRQ_IXP2000_THDA0, ixpdev_interrupt,
-                                        SA_SHIRQ, "ixp2000_eth", nds);
+                                        IRQF_SHARED, "ixp2000_eth", nds);
                if (err) {
                        nds_open--;
                        return err;
diff --git a/drivers/net/ixp2000/pm3386.c b/drivers/net/ixp2000/pm3386.c
index 5224651c9aac..e08d3f9863b8 100644
--- a/drivers/net/ixp2000/pm3386.c
+++ b/drivers/net/ixp2000/pm3386.c
@@ -9,7 +9,6 @@
 * (at your option) any later version.
 */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/delay.h>
 #include <linux/netdevice.h>
diff --git a/drivers/net/jazzsonic.c b/drivers/net/jazzsonic.c
index 272d331d29cd..661d75b4cad2 100644
--- a/drivers/net/jazzsonic.c
+++ b/drivers/net/jazzsonic.c
@@ -260,7 +260,7 @@ MODULE_DESCRIPTION("Jazz SONIC ethernet driver");
 module_param(sonic_debug, int, 0);
 MODULE_PARM_DESC(sonic_debug, "jazzsonic debug level (1-4)");
-#define SONIC_IRQ_FLAG SA_INTERRUPT
+#define SONIC_IRQ_FLAG IRQF_DISABLED
 #include "sonic.c"
diff --git a/drivers/net/lance.c b/drivers/net/lance.c
index bb5ad479210b..c1c3452c90ca 100644
--- a/drivers/net/lance.c
+++ b/drivers/net/lance.c
@@ -968,8 +968,7 @@ static int lance_start_xmit(struct sk_buff *skb, struct net_device *dev)
        /* The old LANCE chips doesn't automatically pad buffers to min. size. */
        if (chip_table[lp->chip_version].flags & LANCE_MUST_PAD) {
                if (skb->len < ETH_ZLEN) {
-                        skb = skb_padto(skb, ETH_ZLEN);
+                        if (skb_padto(skb, ETH_ZLEN))
-                        if (skb == NULL)
                                goto out;
                        lp->tx_ring[entry].length = -ETH_ZLEN;
                }
diff --git a/drivers/net/lasi_82596.c b/drivers/net/lasi_82596.c
index 957888de3d7e..1ab09447baa5 100644
--- a/drivers/net/lasi_82596.c
+++ b/drivers/net/lasi_82596.c
@@ -1083,8 +1083,7 @@ static int i596_start_xmit(struct sk_buff *skb, struct net_device *dev)
                                skb->len, skb->data));
        if (length < ETH_ZLEN) {
-                skb = skb_padto(skb, ETH_ZLEN);
+                if (skb_padto(skb, ETH_ZLEN))
-                if (skb == NULL)
                        return 0;
                length = ETH_ZLEN;
        }
diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c
index b79d6e8d3045..43fef7de8cb9 100644
--- a/drivers/net/loopback.c
+++ b/drivers/net/loopback.c
@@ -74,7 +74,7 @@ static void emulate_large_send_offload(struct sk_buff *skb)
        struct iphdr *iph = skb->nh.iph;
        struct tcphdr *th = (struct tcphdr*)(skb->nh.raw + (iph->ihl * 4));
        unsigned int doffset = (iph->ihl + th->doff) * 4;
-        unsigned int mtu = skb_shinfo(skb)->tso_size + doffset;
+        unsigned int mtu = skb_shinfo(skb)->gso_size + doffset;
        unsigned int offset = 0;
        u32 seq = ntohl(th->seq);
        u16 id  = ntohs(iph->id);
@@ -139,7 +139,7 @@ static int loopback_xmit(struct sk_buff *skb, struct net_device *dev)
 #endif
 #ifdef LOOPBACK_TSO
-        if (skb_shinfo(skb)->tso_size) {
+        if (skb_shinfo(skb)->gso_size) {
                BUG_ON(skb->protocol != htons(ETH_P_IP));
                BUG_ON(skb->nh.iph->protocol != IPPROTO_TCP);
diff --git a/drivers/net/lp486e.c b/drivers/net/lp486e.c
index 94d5ea1ce8bd..b783a6984abc 100644
--- a/drivers/net/lp486e.c
+++ b/drivers/net/lp486e.c
@@ -851,7 +851,7 @@ static int i596_open(struct net_device *dev)
 {
        int i;
-        i = request_irq(dev->irq, &i596_interrupt, SA_SHIRQ, dev->name, dev);
+        i = request_irq(dev->irq, &i596_interrupt, IRQF_SHARED, dev->name, dev);
        if (i) {
                printk(KERN_ERR "%s: IRQ %d not free\n", dev->name, dev->irq);
                return i;
@@ -877,8 +877,7 @@ static int i596_start_xmit (struct sk_buff *skb, struct net_device *dev) {
        length = skb->len;
        
        if (length < ETH_ZLEN) {
-                skb = skb_padto(skb, ETH_ZLEN);
+                if (skb_padto(skb, ETH_ZLEN))
-                if (skb == NULL)
                        return 0;
                length = ETH_ZLEN;
        }
diff --git a/drivers/net/mace.c b/drivers/net/mace.c
index 77792b286027..29e4b5aa6ead 100644
--- a/drivers/net/mace.c
+++ b/drivers/net/mace.c
@@ -5,7 +5,6 @@
 * Copyright (C) 1996 Paul Mackerras.
 */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/netdevice.h>
@@ -243,12 +242,12 @@ static int __devinit mace_probe(struct macio_dev *mdev, const struct of_device_i
        }
        rc = request_irq(mp->tx_dma_intr, mace_txdma_intr, 0, "MACE-txdma", dev);
        if (rc) {
-                printk(KERN_ERR "MACE: can't get irq %d\n", mace->intrs[1].line);
+                printk(KERN_ERR "MACE: can't get irq %d\n", mp->tx_dma_intr);
                goto err_free_irq;
        }
        rc = request_irq(mp->rx_dma_intr, mace_rxdma_intr, 0, "MACE-rxdma", dev);
        if (rc) {
-                printk(KERN_ERR "MACE: can't get irq %d\n", mace->intrs[2].line);
+                printk(KERN_ERR "MACE: can't get irq %d\n", mp->rx_dma_intr);
                goto err_free_tx_irq;
        }
diff --git a/drivers/net/mipsnet.c b/drivers/net/mipsnet.c
index bbffb585b3b3..07e58f4a2916 100644
--- a/drivers/net/mipsnet.c
+++ b/drivers/net/mipsnet.c
@@ -179,7 +179,7 @@ static int mipsnet_open(struct net_device *dev)
        pr_debug("%s: mipsnet_open\n", dev->name);
        err = request_irq(dev->irq, &mipsnet_interrupt,
-                          SA_SHIRQ, dev->name, (void *) dev);
+                          IRQF_SHARED, dev->name, (void *) dev);
        if (err) {
                pr_debug("%s: %s(): can't get irq %d\n",
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index 625ff61c9988..760c61b98867 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -778,7 +778,7 @@ static int mv643xx_eth_open(struct net_device *dev)
        int err;
        err = request_irq(dev->irq, mv643xx_eth_int_handler,
-                        SA_SHIRQ | SA_SAMPLE_RANDOM, dev->name, dev);
+                        IRQF_SHARED | IRQF_SAMPLE_RANDOM, dev->name, dev);
        if (err) {
                printk(KERN_ERR "Can not assign IRQ number to MV643XX_eth%d\n",
                                                                port_num);
diff --git a/drivers/net/mv643xx_eth.h b/drivers/net/mv643xx_eth.h
index 4262c1da6d4a..33c5fafdbbd3 100644
--- a/drivers/net/mv643xx_eth.h
+++ b/drivers/net/mv643xx_eth.h
@@ -258,7 +258,7 @@ struct pkt_info {
        struct sk_buff *return_info;    /* User resource return information */
 };
-/* Ethernet port specific infomation */
+/* Ethernet port specific information */
 struct mv643xx_mib_counters {
        u64 good_octets_received;
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c
index e1feb58bd661..f4c8fd373b9b 100644
--- a/drivers/net/myri10ge/myri10ge.c
+++ b/drivers/net/myri10ge/myri10ge.c
@@ -188,7 +188,6 @@ struct myri10ge_priv {
        int vendor_specific_offset;
        u32 devctl;
        u16 msi_flags;
-        u32 pm_state[16];
        u32 read_dma;
        u32 write_dma;
        u32 read_write_dma;
@@ -1289,6 +1288,7 @@ static const char myri10ge_gstrings_stats[][ETH_GSTRING_LEN] = {
        "tx_aborted_errors", "tx_carrier_errors", "tx_fifo_errors",
        "tx_heartbeat_errors", "tx_window_errors",
        /* device-specific stats */
+        "tx_boundary", "WC", "irq", "MSI",
        "read_dma_bw_MBs", "write_dma_bw_MBs", "read_write_dma_bw_MBs",
        "serial_number", "tx_pkt_start", "tx_pkt_done",
        "tx_req", "tx_done", "rx_small_cnt", "rx_big_cnt",
@@ -1327,6 +1327,10 @@ myri10ge_get_ethtool_stats(struct net_device *netdev,
        for (i = 0; i < MYRI10GE_NET_STATS_LEN; i++)
                data[i] = ((unsigned long *)&mgp->stats)[i];
+        data[i++] = (unsigned int)mgp->tx.boundary;
+        data[i++] = (unsigned int)(mgp->mtrr >= 0);
+        data[i++] = (unsigned int)mgp->pdev->irq;
+        data[i++] = (unsigned int)mgp->msi_enabled;
        data[i++] = (unsigned int)mgp->read_dma;
        data[i++] = (unsigned int)mgp->write_dma;
        data[i++] = (unsigned int)mgp->read_write_dma;
@@ -1879,7 +1883,7 @@ again:
 #ifdef NETIF_F_TSO
        if (skb->len > (dev->mtu + ETH_HLEN)) {
-                mss = skb_shinfo(skb)->tso_size;
+                mss = skb_shinfo(skb)->gso_size;
                if (mss != 0)
                        max_segments = MYRI10GE_MAX_SEND_DESC_TSO;
        }
@@ -1939,8 +1943,7 @@ again:
                /* pad frames to at least ETH_ZLEN bytes */
                if (unlikely(skb->len < ETH_ZLEN)) {
-                        skb = skb_padto(skb, ETH_ZLEN);
+                        if (skb_padto(skb, ETH_ZLEN)) {
-                        if (skb == NULL) {
                                /* The packet is gone, so we must
                                 * return 0 */
                                mgp->stats.tx_dropped += 1;
@@ -2113,14 +2116,14 @@ abort_linearize:
                }
                idx = (idx + 1) & tx->mask;
        } while (idx != last_idx);
-        if (skb_shinfo(skb)->tso_size) {
+        if (skb_shinfo(skb)->gso_size) {
                printk(KERN_ERR
                       "myri10ge: %s: TSO but wanted to linearize?!?!?\n",
                       mgp->dev->name);
                goto drop;
        }
-        if (skb_linearize(skb, GFP_ATOMIC))
+        if (skb_linearize(skb))
                goto drop;
        mgp->tx_linearized++;
@@ -2198,8 +2201,6 @@ static int myri10ge_change_mtu(struct net_device *dev, int new_mtu)
 * any other device, except if forced with myri10ge_ecrc_enable > 1.
 */
-#define PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_PCIE  0x005d
 static void myri10ge_enable_ecrc(struct myri10ge_priv *mgp)
 {
        struct pci_dev *bridge = mgp->pdev->bus->self;
@@ -2251,12 +2252,6 @@ static void myri10ge_enable_ecrc(struct myri10ge_priv *mgp)
        }
        cap = pci_find_ext_capability(bridge, PCI_EXT_CAP_ID_ERR);
-        /* nvidia ext cap is not always linked in ext cap chain */
-        if (!cap
-            && bridge->vendor == PCI_VENDOR_ID_NVIDIA
-            && bridge->device == PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_PCIE)
-                cap = 0x160;
        if (!cap)
                return;
@@ -2420,7 +2415,7 @@ static int myri10ge_resume(struct pci_dev *pdev)
        pci_enable_device(pdev);
        pci_set_master(pdev);
-        status = request_irq(pdev->irq, myri10ge_intr, SA_SHIRQ,
+        status = request_irq(pdev->irq, myri10ge_intr, IRQF_SHARED,
                             netdev->name, mgp);
        if (status != 0) {
                dev_err(&pdev->dev, "failed to allocate IRQ\n");
@@ -2701,7 +2696,7 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                        mgp->msi_enabled = 1;
        }
-        status = request_irq(pdev->irq, myri10ge_intr, SA_SHIRQ,
+        status = request_irq(pdev->irq, myri10ge_intr, IRQF_SHARED,
                             netdev->name, mgp);
        if (status != 0) {
                dev_err(&pdev->dev, "failed to allocate IRQ\n");
@@ -2732,8 +2727,6 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        /* Save configuration space to be restored if the
         * nic resets due to a parity error */
        myri10ge_save_state(mgp);
-        /* Restore state immediately since pci_save_msi_state disables MSI */
-        myri10ge_restore_state(mgp);
        /* Setup the watchdog timer */
        setup_timer(&mgp->watchdog_timer, myri10ge_watchdog_timer,
@@ -2746,11 +2739,10 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                dev_err(&pdev->dev, "register_netdev failed: %d\n", status);
                goto abort_with_irq;
        }
+        dev_info(dev, "%s IRQ %d, tx bndry %d, fw %s, WC %s\n",
-        printk(KERN_INFO "myri10ge: %s: %s IRQ %d, tx bndry %d, fw %s, WC %s\n",
+                 (mgp->msi_enabled ? "MSI" : "xPIC"),
-               netdev->name, (mgp->msi_enabled ? "MSI" : "xPIC"),
+                 pdev->irq, mgp->tx.boundary, mgp->fw_name,
-               pdev->irq, mgp->tx.boundary, mgp->fw_name,
+                 (mgp->mtrr >= 0 ? "Enabled" : "Disabled"));
-               (mgp->mtrr >= 0 ? "Enabled" : "Disabled"));
        return 0;
diff --git a/drivers/net/myri_sbus.c b/drivers/net/myri_sbus.c
index 6c86dca62e2a..1b965a2b56e4 100644
--- a/drivers/net/myri_sbus.c
+++ b/drivers/net/myri_sbus.c
@@ -1,13 +1,12 @@
-/* myri_sbus.h: MyriCOM MyriNET SBUS card driver.
+/* myri_sbus.c: MyriCOM MyriNET SBUS card driver.
 *
- * Copyright (C) 1996, 1999 David S. Miller (davem@redhat.com)
+ * Copyright (C) 1996, 1999, 2006 David S. Miller (davem@davemloft.net)
 */
 static char version[] =
-        "myri_sbus.c:v1.9 12/Sep/99 David S. Miller (davem@redhat.com)\n";
+        "myri_sbus.c:v2.0 June 23, 2006 David S. Miller (davem@davemloft.net)\n";
 #include <linux/module.h>
-#include <linux/config.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
@@ -81,10 +80,6 @@ static char version[] =
 #define DHDR(x)
 #endif
-#ifdef MODULE
-static struct myri_eth *root_myri_dev;
-#endif
 static void myri_reset_off(void __iomem *lp, void __iomem *cregs)
 {
        /* Clear IRQ mask. */
@@ -896,8 +891,9 @@ static void dump_eeprom(struct myri_eth *mp)
 }
 #endif
-static int __init myri_ether_init(struct sbus_dev *sdev, int num)
+static int __init myri_ether_init(struct sbus_dev *sdev)
 {
+        static int num;
        static unsigned version_printed;
        struct net_device *dev;
        struct myri_eth *mp;
@@ -913,6 +909,9 @@ static int __init myri_ether_init(struct sbus_dev *sdev, int num)
        if (version_printed++ == 0)
                printk(version);
+        SET_MODULE_OWNER(dev);
+        SET_NETDEV_DEV(dev, &sdev->ofdev.dev);
        mp = (struct myri_eth *) dev->priv;
        spin_lock_init(&mp->irq_lock);
        mp->myri_sdev = sdev;
@@ -1070,7 +1069,7 @@ static int __init myri_ether_init(struct sbus_dev *sdev, int num)
        /* Register interrupt handler now. */
        DET(("Requesting MYRIcom IRQ line.\n"));
        if (request_irq(dev->irq, &myri_interrupt,
-                        SA_SHIRQ, "MyriCOM Ethernet", (void *) dev)) {
+                        IRQF_SHARED, "MyriCOM Ethernet", (void *) dev)) {
                printk("MyriCOM: Cannot register interrupt handler.\n");
                goto err;
        }
@@ -1092,10 +1091,9 @@ static int __init myri_ether_init(struct sbus_dev *sdev, int num)
                goto err_free_irq;
        }
-#ifdef MODULE
+        dev_set_drvdata(&sdev->ofdev.dev, mp);
-        mp->next_module = root_myri_dev;
-        root_myri_dev = mp;
+        num++;
-#endif
        printk("%s: MyriCOM MyriNET Ethernet ", dev->name);
@@ -1114,61 +1112,68 @@ err:
        return -ENODEV;
 }
-static int __init myri_sbus_match(struct sbus_dev *sdev)
-{
-        char *name = sdev->prom_name;
-        if (!strcmp(name, "MYRICOM,mlanai") ||
+static int __devinit myri_sbus_probe(struct of_device *dev, const struct of_device_id *match)
-            !strcmp(name, "myri"))
+{
-                return 1;
+        struct sbus_dev *sdev = to_sbus_device(&dev->dev);
-        return 0;
+        return myri_ether_init(sdev);
 }
-static int __init myri_sbus_probe(void)
+static int __devexit myri_sbus_remove(struct of_device *dev)
 {
-        struct sbus_bus *bus;
+        struct myri_eth *mp = dev_get_drvdata(&dev->dev);
-        struct sbus_dev *sdev = NULL;
+        struct net_device *net_dev = mp->dev;
-        static int called;
-        int cards = 0, v;
-#ifdef MODULE
+        unregister_netdevice(net_dev);
-        root_myri_dev = NULL;
-#endif
-        if (called)
+        free_irq(net_dev->irq, net_dev);
-                return -ENODEV;
-        called++;
+        if (mp->eeprom.cpuvers < CPUVERS_4_0) {
+                sbus_iounmap(mp->regs, mp->reg_size);
-        for_each_sbus(bus) {
+        } else {
-                for_each_sbusdev(sdev, bus) {
+                sbus_iounmap(mp->cregs, PAGE_SIZE);
-                        if (myri_sbus_match(sdev)) {
+                sbus_iounmap(mp->lregs, (256 * 1024));
-                                cards++;
+                sbus_iounmap(mp->lanai, (512 * 1024));
-                                DET(("Found myricom myrinet as %s\n", sdev->prom_name));
-                                if ((v = myri_ether_init(sdev, (cards - 1))))
-                                        return v;
-                        }
-                }
        }
-        if (!cards)
-                return -ENODEV;
+        free_netdev(net_dev);
+        dev_set_drvdata(&dev->dev, NULL);
        return 0;
 }
-static void __exit myri_sbus_cleanup(void)
+static struct of_device_id myri_sbus_match[] = {
+        {
+                .name = "MYRICOM,mlanai",
+        },
+        {
+                .name = "myri",
+        },
+        {},
+};
+MODULE_DEVICE_TABLE(of, myri_sbus_match);
+static struct of_platform_driver myri_sbus_driver = {
+        .name           = "myri",
+        .match_table    = myri_sbus_match,
+        .probe          = myri_sbus_probe,
+        .remove         = __devexit_p(myri_sbus_remove),
+};
+static int __init myri_sbus_init(void)
+{
+        return of_register_driver(&myri_sbus_driver, &sbus_bus_type);
+}
+static void __exit myri_sbus_exit(void)
 {
-#ifdef MODULE
+        of_unregister_driver(&myri_sbus_driver);
-        while (root_myri_dev) {
-                struct myri_eth *next = root_myri_dev->next_module;
-                unregister_netdev(root_myri_dev->dev);
-                /* this will also free the co-allocated 'root_myri_dev' */
-                free_netdev(root_myri_dev->dev);
-                root_myri_dev = next;
-        }
-#endif /* MODULE */
 }
-module_init(myri_sbus_probe);
+module_init(myri_sbus_init);
-module_exit(myri_sbus_cleanup);
+module_exit(myri_sbus_exit);
 MODULE_LICENSE("GPL");
diff --git a/drivers/net/myri_sbus.h b/drivers/net/myri_sbus.h
index 47722f708a41..2f69ef7cdccb 100644
--- a/drivers/net/myri_sbus.h
+++ b/drivers/net/myri_sbus.h
@@ -290,7 +290,6 @@ struct myri_eth {
        unsigned int                    reg_size;       /* Size of register space.    */
        unsigned int                    shmem_base;     /* Offset to shared ram.      */
        struct sbus_dev                 *myri_sdev;     /* Our SBUS device struct.    */
-        struct myri_eth                 *next_module;   /* Next in adapter chain.     */
 };
 /* We use this to acquire receive skb's that we can DMA directly into. */
diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c
index 2e4ecedba057..db0475a1102f 100644
--- a/drivers/net/natsemi.c
+++ b/drivers/net/natsemi.c
@@ -20,125 +20,13 @@
        Support information and updates available at
        http://www.scyld.com/network/netsemi.html
+        [link no longer provides useful info -jgarzik]
-        Linux kernel modifications:
-        Version 1.0.1:
-                - Spinlock fixes
-                - Bug fixes and better intr performance (Tjeerd)
-        Version 1.0.2:
-                - Now reads correct MAC address from eeprom
-        Version 1.0.3:
-                - Eliminate redundant priv->tx_full flag
-                - Call netif_start_queue from dev->tx_timeout
-                - wmb() in start_tx() to flush data
-                - Update Tx locking
-                - Clean up PCI enable (davej)
-        Version 1.0.4:
-                - Merge Donald Becker's natsemi.c version 1.07
-        Version 1.0.5:
-                - { fill me in }
-        Version 1.0.6:
-                * ethtool support (jgarzik)
-                * Proper initialization of the card (which sometimes
-                fails to occur and leaves the card in a non-functional
-                state). (uzi)
-                * Some documented register settings to optimize some
-                of the 100Mbit autodetection circuitry in rev C cards. (uzi)
-                * Polling of the PHY intr for stuff like link state
-                change and auto- negotiation to finally work properly. (uzi)
-                * One-liner removal of a duplicate declaration of
-                netdev_error(). (uzi)
-        Version 1.0.7: (Manfred Spraul)
-                * pci dma
-                * SMP locking update
-                * full reset added into tx_timeout
-                * correct multicast hash generation (both big and little endian)
-                        [copied from a natsemi driver version
-                         from Myrio Corporation, Greg Smith]
-                * suspend/resume
-        version 1.0.8 (Tim Hockin <thockin@sun.com>)
-                * ETHTOOL_* support
-                * Wake on lan support (Erik Gilling)
-                * MXDMA fixes for serverworks
-                * EEPROM reload
-        version 1.0.9 (Manfred Spraul)
-                * Main change: fix lack of synchronize
-                netif_close/netif_suspend against a last interrupt
-                or packet.
-                * do not enable superflous interrupts (e.g. the
-                drivers relies on TxDone - TxIntr not needed)
-                * wait that the hardware has really stopped in close
-                and suspend.
-                * workaround for the (at least) gcc-2.95.1 compiler
-                problem. Also simplifies the code a bit.
-                * disable_irq() in tx_timeout - needed to protect
-                against rx interrupts.
-                * stop the nic before switching into silent rx mode
-                for wol (required according to docu).
-        version 1.0.10:
-                * use long for ee_addr (various)
-                * print pointers properly (DaveM)
-                * include asm/irq.h (?)
-        version 1.0.11:
-                * check and reset if PHY errors appear (Adrian Sun)
-                * WoL cleanup (Tim Hockin)
-                * Magic number cleanup (Tim Hockin)
-                * Don't reload EEPROM on every reset (Tim Hockin)
-                * Save and restore EEPROM state across reset (Tim Hockin)
-                * MDIO Cleanup (Tim Hockin)
-                * Reformat register offsets/bits (jgarzik)
-        version 1.0.12:
-                * ETHTOOL_* further support (Tim Hockin)
-        version 1.0.13:
-                * ETHTOOL_[G]EEPROM support (Tim Hockin)
-        version 1.0.13:
-                * crc cleanup (Matt Domsch <Matt_Domsch@dell.com>)
-        version 1.0.14:
-                * Cleanup some messages and autoneg in ethtool (Tim Hockin)
-        version 1.0.15:
-                * Get rid of cable_magic flag
-                * use new (National provided) solution for cable magic issue
-        version 1.0.16:
-                * call netdev_rx() for RxErrors (Manfred Spraul)
-                * formatting and cleanups
-                * change options and full_duplex arrays to be zero
-                  initialized
-                * enable only the WoL and PHY interrupts in wol mode
-        version 1.0.17:
-                * only do cable_magic on 83815 and early 83816 (Tim Hockin)
-                * create a function for rx refill (Manfred Spraul)
-                * combine drain_ring and init_ring (Manfred Spraul)
-                * oom handling (Manfred Spraul)
-                * hands_off instead of playing with netif_device_{de,a}ttach
-                  (Manfred Spraul)
-                * be sure to write the MAC back to the chip (Manfred Spraul)
-                * lengthen EEPROM timeout, and always warn about timeouts
-                  (Manfred Spraul)
-                * comments update (Manfred)
-                * do the right thing on a phy-reset (Manfred and Tim)
        TODO:
        * big endian support with CFG:BEM instead of cpu_to_le32
 */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
@@ -166,8 +54,8 @@
 #include <asm/uaccess.h>
 #define DRV_NAME        "natsemi"
-#define DRV_VERSION     "1.07+LK1.0.17"
+#define DRV_VERSION     "2.0"
-#define DRV_RELDATE     "Sep 27, 2002"
+#define DRV_RELDATE     "June 27, 2006"
 #define RX_OFFSET       2
@@ -226,7 +114,6 @@ static int full_duplex[MAX_UNITS];
                                 NATSEMI_PG1_NREGS)
 #define NATSEMI_REGS_VER        1 /* v1 added RFDR registers */
 #define NATSEMI_REGS_SIZE       (NATSEMI_NREGS * sizeof(u32))
-#define NATSEMI_DEF_EEPROM_SIZE 24 /* 12 16-bit values */
 /* Buffer sizes:
 * The nic writes 32-bit values, even if the upper bytes of
@@ -344,18 +231,6 @@ None characterised.
-enum pcistuff {
-        PCI_USES_IO = 0x01,
-        PCI_USES_MEM = 0x02,
-        PCI_USES_MASTER = 0x04,
-        PCI_ADDR0 = 0x08,
-        PCI_ADDR1 = 0x10,
-};
-/* MMIO operations required */
-#define PCI_IOTYPE (PCI_USES_MASTER | PCI_USES_MEM | PCI_ADDR1)
 /*
 * Support for fibre connections on Am79C874:
 * This phy needs a special setup when connected to a fibre cable.
@@ -363,22 +238,25 @@ enum pcistuff {
 */
 #define PHYID_AM79C874  0x0022561b
-#define MII_MCTRL       0x15    /* mode control register */
+enum {
-#define MII_FX_SEL      0x0001  /* 100BASE-FX (fiber) */
+        MII_MCTRL       = 0x15,         /* mode control register */
-#define MII_EN_SCRM     0x0004  /* enable scrambler (tp) */
+        MII_FX_SEL      = 0x0001,       /* 100BASE-FX (fiber) */
+        MII_EN_SCRM     = 0x0004,       /* enable scrambler (tp) */
+};
 
 /* array of board data directly indexed by pci_tbl[x].driver_data */
 static const struct {
        const char *name;
        unsigned long flags;
+        unsigned int eeprom_size;
 } natsemi_pci_info[] __devinitdata = {
-        { "NatSemi DP8381[56]", PCI_IOTYPE },
+        { "NatSemi DP8381[56]", 0, 24 },
 };
-static struct pci_device_id natsemi_pci_tbl[] = {
+static const struct pci_device_id natsemi_pci_tbl[] __devinitdata = {
-        { PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_83815, PCI_ANY_ID, PCI_ANY_ID, },
+        { PCI_VENDOR_ID_NS, 0x0020, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
-        { 0, },
+        { }     /* terminate list */
 };
 MODULE_DEVICE_TABLE(pci, natsemi_pci_tbl);
@@ -813,6 +691,42 @@ static void move_int_phy(struct net_device *dev, int addr)
        udelay(1);
 }
+static void __devinit natsemi_init_media (struct net_device *dev)
+{
+        struct netdev_private *np = netdev_priv(dev);
+        u32 tmp;
+        netif_carrier_off(dev);
+        /* get the initial settings from hardware */
+        tmp            = mdio_read(dev, MII_BMCR);
+        np->speed      = (tmp & BMCR_SPEED100)? SPEED_100     : SPEED_10;
+        np->duplex     = (tmp & BMCR_FULLDPLX)? DUPLEX_FULL   : DUPLEX_HALF;
+        np->autoneg    = (tmp & BMCR_ANENABLE)? AUTONEG_ENABLE: AUTONEG_DISABLE;
+        np->advertising= mdio_read(dev, MII_ADVERTISE);
+        if ((np->advertising & ADVERTISE_ALL) != ADVERTISE_ALL
+         && netif_msg_probe(np)) {
+                printk(KERN_INFO "natsemi %s: Transceiver default autonegotiation %s "
+                        "10%s %s duplex.\n",
+                        pci_name(np->pci_dev),
+                        (mdio_read(dev, MII_BMCR) & BMCR_ANENABLE)?
+                          "enabled, advertise" : "disabled, force",
+                        (np->advertising &
+                          (ADVERTISE_100FULL|ADVERTISE_100HALF))?
+                            "0" : "",
+                        (np->advertising &
+                          (ADVERTISE_100FULL|ADVERTISE_10FULL))?
+                            "full" : "half");
+        }
+        if (netif_msg_probe(np))
+                printk(KERN_INFO
+                        "natsemi %s: Transceiver status %#04x advertising %#04x.\n",
+                        pci_name(np->pci_dev), mdio_read(dev, MII_BMSR),
+                        np->advertising);
+}
 static int __devinit natsemi_probe1 (struct pci_dev *pdev,
        const struct pci_device_id *ent)
 {
@@ -852,8 +766,7 @@ static int __devinit natsemi_probe1 (struct pci_dev *pdev,
        iosize = pci_resource_len(pdev, pcibar);
        irq = pdev->irq;
-        if (natsemi_pci_info[chip_idx].flags & PCI_USES_MASTER)
+        pci_set_master(pdev);
-                pci_set_master(pdev);
        dev = alloc_etherdev(sizeof (struct netdev_private));
        if (!dev)
@@ -892,7 +805,7 @@ static int __devinit natsemi_probe1 (struct pci_dev *pdev,
        np->msg_enable = (debug >= 0) ? (1<<debug)-1 : NATSEMI_DEF_MSG;
        np->hands_off = 0;
        np->intr_status = 0;
-        np->eeprom_size = NATSEMI_DEF_EEPROM_SIZE;
+        np->eeprom_size = natsemi_pci_info[chip_idx].eeprom_size;
        /* Initial port:
         * - If the nic was configured to use an external phy and if find_mii
@@ -957,34 +870,7 @@ static int __devinit natsemi_probe1 (struct pci_dev *pdev,
        if (mtu)
                dev->mtu = mtu;
-        netif_carrier_off(dev);
+        natsemi_init_media(dev);
-        /* get the initial settings from hardware */
-        tmp            = mdio_read(dev, MII_BMCR);
-        np->speed      = (tmp & BMCR_SPEED100)? SPEED_100     : SPEED_10;
-        np->duplex     = (tmp & BMCR_FULLDPLX)? DUPLEX_FULL   : DUPLEX_HALF;
-        np->autoneg    = (tmp & BMCR_ANENABLE)? AUTONEG_ENABLE: AUTONEG_DISABLE;
-        np->advertising= mdio_read(dev, MII_ADVERTISE);
-        if ((np->advertising & ADVERTISE_ALL) != ADVERTISE_ALL
-         && netif_msg_probe(np)) {
-                printk(KERN_INFO "natsemi %s: Transceiver default autonegotiation %s "
-                        "10%s %s duplex.\n",
-                        pci_name(np->pci_dev),
-                        (mdio_read(dev, MII_BMCR) & BMCR_ANENABLE)?
-                          "enabled, advertise" : "disabled, force",
-                        (np->advertising &
-                          (ADVERTISE_100FULL|ADVERTISE_100HALF))?
-                            "0" : "",
-                        (np->advertising &
-                          (ADVERTISE_100FULL|ADVERTISE_10FULL))?
-                            "full" : "half");
-        }
-        if (netif_msg_probe(np))
-                printk(KERN_INFO
-                        "natsemi %s: Transceiver status %#04x advertising %#04x.\n",
-                        pci_name(np->pci_dev), mdio_read(dev, MII_BMSR),
-                        np->advertising);
        /* save the silicon revision for later querying */
        np->srr = readl(ioaddr + SiliconRev);
@@ -1577,7 +1463,7 @@ static int netdev_open(struct net_device *dev)
        /* Reset the chip, just in case. */
        natsemi_reset(dev);
-        i = request_irq(dev->irq, &intr_handler, SA_SHIRQ, dev->name, dev);
+        i = request_irq(dev->irq, &intr_handler, IRQF_SHARED, dev->name, dev);
        if (i) return i;
        if (netif_msg_ifup(np))
diff --git a/drivers/net/ne2k-pci.c b/drivers/net/ne2k-pci.c
index ced9fdb8335c..34bdba9eec79 100644
--- a/drivers/net/ne2k-pci.c
+++ b/drivers/net/ne2k-pci.c
@@ -231,12 +231,12 @@ static int __devinit ne2k_pci_init_one (struct pci_dev *pdev,
        irq = pdev->irq;
        if (!ioaddr || ((pci_resource_flags (pdev, 0) & IORESOURCE_IO) == 0)) {
-                printk (KERN_ERR PFX "no I/O resource at PCI BAR #0\n");
+                dev_err(&pdev->dev, "no I/O resource at PCI BAR #0\n");
                return -ENODEV;
        }
        if (request_region (ioaddr, NE_IO_EXTENT, DRV_NAME) == NULL) {
-                printk (KERN_ERR PFX "I/O resource 0x%x @ 0x%lx busy\n",
+                dev_err(&pdev->dev, "I/O resource 0x%x @ 0x%lx busy\n",
                        NE_IO_EXTENT, ioaddr);
                return -EBUSY;
        }
@@ -263,7 +263,7 @@ static int __devinit ne2k_pci_init_one (struct pci_dev *pdev,
        /* Allocate net_device, dev->priv; fill in 8390 specific dev fields. */
        dev = alloc_ei_netdev();
        if (!dev) {
-                printk (KERN_ERR PFX "cannot allocate ethernet device\n");
+                dev_err(&pdev->dev, "cannot allocate ethernet device\n");
                goto err_out_free_res;
        }
        SET_MODULE_OWNER(dev);
@@ -281,7 +281,8 @@ static int __devinit ne2k_pci_init_one (struct pci_dev *pdev,
                while ((inb(ioaddr + EN0_ISR) & ENISR_RESET) == 0)
                        /* Limit wait: '2' avoids jiffy roll-over. */
                        if (jiffies - reset_start_time > 2) {
-                                printk(KERN_ERR PFX "Card failure (no reset ack).\n");
+                                dev_err(&pdev->dev,
+                                        "Card failure (no reset ack).\n");
                                goto err_out_free_netdev;
                        }
@@ -420,7 +421,7 @@ static int ne2k_pci_set_fdx(struct net_device *dev)
 static int ne2k_pci_open(struct net_device *dev)
 {
-        int ret = request_irq(dev->irq, ei_interrupt, SA_SHIRQ, dev->name, dev);
+        int ret = request_irq(dev->irq, ei_interrupt, IRQF_SHARED, dev->name, dev);
        if (ret)
                return ret;
diff --git a/drivers/net/netx-eth.c b/drivers/net/netx-eth.c
new file mode 100644
index 000000000000..b1311ae82675
--- /dev/null
+++ b/drivers/net/netx-eth.c
@@ -0,0 +1,516 @@
+/*
+ * drivers/net/netx-eth.c
+ *
+ * Copyright (c) 2005 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+#include <linux/config.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/delay.h>
+#include <linux/netdevice.h>
+#include <linux/platform_device.h>
+#include <linux/etherdevice.h>
+#include <linux/skbuff.h>
+#include <linux/mii.h>
+#include <asm/io.h>
+#include <asm/hardware.h>
+#include <asm/arch/hardware.h>
+#include <asm/arch/netx-regs.h>
+#include <asm/arch/pfifo.h>
+#include <asm/arch/xc.h>
+#include <asm/arch/eth.h>
+/* XC Fifo Offsets */
+#define EMPTY_PTR_FIFO(xcno)    (0 + ((xcno) << 3))     /* Index of the empty pointer FIFO */
+#define IND_FIFO_PORT_HI(xcno)  (1 + ((xcno) << 3))     /* Index of the FIFO where received */
+                                                        /* Data packages are indicated by XC */
+#define IND_FIFO_PORT_LO(xcno)  (2 + ((xcno) << 3))     /* Index of the FIFO where received */
+                                                        /* Data packages are indicated by XC */
+#define REQ_FIFO_PORT_HI(xcno)  (3 + ((xcno) << 3))     /* Index of the FIFO where Data packages */
+                                                        /* have to be indicated by ARM which */
+                                                        /* shall be sent */
+#define REQ_FIFO_PORT_LO(xcno)  (4 + ((xcno) << 3))     /* Index of the FIFO where Data packages */
+                                                        /* have to be indicated by ARM which shall */
+                                                        /* be sent */
+#define CON_FIFO_PORT_HI(xcno)  (5 + ((xcno) << 3))     /* Index of the FIFO where sent Data packages */
+                                                        /* are confirmed */
+#define CON_FIFO_PORT_LO(xcno)  (6 + ((xcno) << 3))     /* Index of the FIFO where sent Data */
+                                                        /* packages are confirmed */
+#define PFIFO_MASK(xcno)        (0x7f << (xcno*8))
+#define FIFO_PTR_FRAMELEN_SHIFT 0
+#define FIFO_PTR_FRAMELEN_MASK  (0x7ff << 0)
+#define FIFO_PTR_FRAMELEN(len)  (((len) << 0) & FIFO_PTR_FRAMELEN_MASK)
+#define FIFO_PTR_TIMETRIG       (1<<11)
+#define FIFO_PTR_MULTI_REQ
+#define FIFO_PTR_ORIGIN         (1<<14)
+#define FIFO_PTR_VLAN           (1<<15)
+#define FIFO_PTR_FRAMENO_SHIFT  16
+#define FIFO_PTR_FRAMENO_MASK   (0x3f << 16)
+#define FIFO_PTR_FRAMENO(no)    (((no) << 16) & FIFO_PTR_FRAMENO_MASK)
+#define FIFO_PTR_SEGMENT_SHIFT  22
+#define FIFO_PTR_SEGMENT_MASK   (0xf << 22)
+#define FIFO_PTR_SEGMENT(seg)   (((seg) & 0xf) << 22)
+#define FIFO_PTR_ERROR_SHIFT    28
+#define FIFO_PTR_ERROR_MASK     (0xf << 28)
+#define ISR_LINK_STATUS_CHANGE (1<<4)
+#define ISR_IND_LO             (1<<3)
+#define ISR_CON_LO             (1<<2)
+#define ISR_IND_HI             (1<<1)
+#define ISR_CON_HI             (1<<0)
+#define ETH_MAC_LOCAL_CONFIG 0x1560
+#define ETH_MAC_4321         0x1564
+#define ETH_MAC_65           0x1568
+#define MAC_TRAFFIC_CLASS_ARRANGEMENT_SHIFT 16
+#define MAC_TRAFFIC_CLASS_ARRANGEMENT_MASK (0xf<<MAC_TRAFFIC_CLASS_ARRANGEMENT_SHIFT)
+#define MAC_TRAFFIC_CLASS_ARRANGEMENT(x) (((x)<<MAC_TRAFFIC_CLASS_ARRANGEMENT_SHIFT) & MAC_TRAFFIC_CLASS_ARRANGEMENT_MASK)
+#define LOCAL_CONFIG_LINK_STATUS_IRQ_EN (1<<24)
+#define LOCAL_CONFIG_CON_LO_IRQ_EN (1<<23)
+#define LOCAL_CONFIG_CON_HI_IRQ_EN (1<<22)
+#define LOCAL_CONFIG_IND_LO_IRQ_EN (1<<21)
+#define LOCAL_CONFIG_IND_HI_IRQ_EN (1<<20)
+#define CARDNAME "netx-eth"
+/* LSB must be zero */
+#define INTERNAL_PHY_ADR 0x1c
+struct netx_eth_priv {
+        void                    __iomem *sram_base, *xpec_base, *xmac_base;
+        int                     id;
+        struct net_device_stats stats;
+        struct mii_if_info      mii;
+        u32                     msg_enable;
+        struct xc               *xc;
+        spinlock_t              lock;
+};
+static void netx_eth_set_multicast_list(struct net_device *ndev)
+{
+        /* implement me */
+}
+static int
+netx_eth_hard_start_xmit(struct sk_buff *skb, struct net_device *ndev)
+{
+        struct netx_eth_priv *priv = netdev_priv(ndev);
+        unsigned char *buf = skb->data;
+        unsigned int len = skb->len;
+        spin_lock_irq(&priv->lock);
+        memcpy_toio(priv->sram_base + 1560, (void *)buf, len);
+        if (len < 60) {
+                memset_io(priv->sram_base + 1560 + len, 0, 60 - len);
+                len = 60;
+        }
+        pfifo_push(REQ_FIFO_PORT_LO(priv->id),
+                   FIFO_PTR_SEGMENT(priv->id) |
+                   FIFO_PTR_FRAMENO(1) |
+                   FIFO_PTR_FRAMELEN(len));
+        ndev->trans_start = jiffies;
+        priv->stats.tx_packets++;
+        priv->stats.tx_bytes += skb->len;
+        netif_stop_queue(ndev);
+        spin_unlock_irq(&priv->lock);
+        dev_kfree_skb(skb);
+        return 0;
+}
+static void netx_eth_receive(struct net_device *ndev)
+{
+        struct netx_eth_priv *priv = netdev_priv(ndev);
+        unsigned int val, frameno, seg, len;
+        unsigned char *data;
+        struct sk_buff *skb;
+        val = pfifo_pop(IND_FIFO_PORT_LO(priv->id));
+        frameno = (val & FIFO_PTR_FRAMENO_MASK) >> FIFO_PTR_FRAMENO_SHIFT;
+        seg = (val & FIFO_PTR_SEGMENT_MASK) >> FIFO_PTR_SEGMENT_SHIFT;
+        len = (val & FIFO_PTR_FRAMELEN_MASK) >> FIFO_PTR_FRAMELEN_SHIFT;
+        skb = dev_alloc_skb(len);
+        if (unlikely(skb == NULL)) {
+                printk(KERN_NOTICE "%s: Low memory, packet dropped.\n",
+                        ndev->name);
+                priv->stats.rx_dropped++;
+                return;
+        }
+        data = skb_put(skb, len);
+        memcpy_fromio(data, priv->sram_base + frameno * 1560, len);
+        pfifo_push(EMPTY_PTR_FIFO(priv->id),
+                FIFO_PTR_SEGMENT(seg) | FIFO_PTR_FRAMENO(frameno));
+        ndev->last_rx = jiffies;
+        skb->dev = ndev;
+        skb->protocol = eth_type_trans(skb, ndev);
+        netif_rx(skb);
+        priv->stats.rx_packets++;
+        priv->stats.rx_bytes += len;
+}
+static irqreturn_t
+netx_eth_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+{
+        struct net_device *ndev = dev_id;
+        struct netx_eth_priv *priv = netdev_priv(ndev);
+        int status;
+        unsigned long flags;
+        spin_lock_irqsave(&priv->lock, flags);
+        status = readl(NETX_PFIFO_XPEC_ISR(priv->id));
+        while (status) {
+                int fill_level;
+                writel(status, NETX_PFIFO_XPEC_ISR(priv->id));
+                if ((status & ISR_CON_HI) || (status & ISR_IND_HI))
+                        printk("%s: unexpected status: 0x%08x\n",
+                            __FUNCTION__, status);
+                fill_level =
+                    readl(NETX_PFIFO_FILL_LEVEL(IND_FIFO_PORT_LO(priv->id)));
+                while (fill_level--)
+                        netx_eth_receive(ndev);
+                if (status & ISR_CON_LO)
+                        netif_wake_queue(ndev);
+                if (status & ISR_LINK_STATUS_CHANGE)
+                        mii_check_media(&priv->mii, netif_msg_link(priv), 1);
+                status = readl(NETX_PFIFO_XPEC_ISR(priv->id));
+        }
+        spin_unlock_irqrestore(&priv->lock, flags);
+        return IRQ_HANDLED;
+}
+static struct net_device_stats *netx_eth_query_statistics(struct net_device *ndev)
+{
+        struct netx_eth_priv *priv = netdev_priv(ndev);
+        return &priv->stats;
+}
+static int netx_eth_open(struct net_device *ndev)
+{
+        struct netx_eth_priv *priv = netdev_priv(ndev);
+        if (request_irq
+            (ndev->irq, &netx_eth_interrupt, IRQF_SHARED, ndev->name, ndev))
+                return -EAGAIN;
+        writel(ndev->dev_addr[0] |
+               ndev->dev_addr[1]<<8 |
+               ndev->dev_addr[2]<<16 |
+               ndev->dev_addr[3]<<24,
+               priv->xpec_base + NETX_XPEC_RAM_START_OFS + ETH_MAC_4321);
+        writel(ndev->dev_addr[4] |
+               ndev->dev_addr[5]<<8,
+               priv->xpec_base + NETX_XPEC_RAM_START_OFS + ETH_MAC_65);
+        writel(LOCAL_CONFIG_LINK_STATUS_IRQ_EN |
+                LOCAL_CONFIG_CON_LO_IRQ_EN |
+                LOCAL_CONFIG_CON_HI_IRQ_EN |
+                LOCAL_CONFIG_IND_LO_IRQ_EN |
+                LOCAL_CONFIG_IND_HI_IRQ_EN,
+                priv->xpec_base + NETX_XPEC_RAM_START_OFS +
+                ETH_MAC_LOCAL_CONFIG);
+        mii_check_media(&priv->mii, netif_msg_link(priv), 1);
+        netif_start_queue(ndev);
+        return 0;
+}
+static int netx_eth_close(struct net_device *ndev)
+{
+        struct netx_eth_priv *priv = netdev_priv(ndev);
+        netif_stop_queue(ndev);
+        writel(0,
+            priv->xpec_base + NETX_XPEC_RAM_START_OFS + ETH_MAC_LOCAL_CONFIG);
+        free_irq(ndev->irq, ndev);
+        return 0;
+}
+static void netx_eth_timeout(struct net_device *ndev)
+{
+        struct netx_eth_priv *priv = netdev_priv(ndev);
+        int i;
+        printk(KERN_ERR "%s: transmit timed out, resetting\n", ndev->name);
+        spin_lock_irq(&priv->lock);
+        xc_reset(priv->xc);
+        xc_start(priv->xc);
+        for (i=2; i<=18; i++)
+                pfifo_push(EMPTY_PTR_FIFO(priv->id),
+                        FIFO_PTR_FRAMENO(i) | FIFO_PTR_SEGMENT(priv->id));
+        spin_unlock_irq(&priv->lock);
+        netif_wake_queue(ndev);
+}
+static int
+netx_eth_phy_read(struct net_device *ndev, int phy_id, int reg)
+{
+        unsigned int val;
+        val = MIIMU_SNRDY | MIIMU_PREAMBLE | MIIMU_PHYADDR(phy_id) |
+              MIIMU_REGADDR(reg) | MIIMU_PHY_NRES;
+        writel(val, NETX_MIIMU);
+        while (readl(NETX_MIIMU) & MIIMU_SNRDY);
+        return readl(NETX_MIIMU) >> 16;
+}
+static void
+netx_eth_phy_write(struct net_device *ndev, int phy_id, int reg, int value)
+{
+        unsigned int val;
+        val = MIIMU_SNRDY | MIIMU_PREAMBLE | MIIMU_PHYADDR(phy_id) |
+              MIIMU_REGADDR(reg) | MIIMU_PHY_NRES | MIIMU_OPMODE_WRITE |
+              MIIMU_DATA(value);
+        writel(val, NETX_MIIMU);
+        while (readl(NETX_MIIMU) & MIIMU_SNRDY);
+}
+static int netx_eth_enable(struct net_device *ndev)
+{
+        struct netx_eth_priv *priv = netdev_priv(ndev);
+        unsigned int mac4321, mac65;
+        int running, i;
+        ether_setup(ndev);
+        ndev->open = netx_eth_open;
+        ndev->stop = netx_eth_close;
+        ndev->hard_start_xmit = netx_eth_hard_start_xmit;
+        ndev->tx_timeout = netx_eth_timeout;
+        ndev->watchdog_timeo = msecs_to_jiffies(5000);
+        ndev->get_stats = netx_eth_query_statistics;
+        ndev->set_multicast_list = netx_eth_set_multicast_list;
+        priv->msg_enable       = NETIF_MSG_LINK;
+        priv->mii.phy_id_mask  = 0x1f;
+        priv->mii.reg_num_mask = 0x1f;
+        priv->mii.force_media  = 0;
+        priv->mii.full_duplex  = 0;
+        priv->mii.dev        = ndev;
+        priv->mii.mdio_read    = netx_eth_phy_read;
+        priv->mii.mdio_write   = netx_eth_phy_write;
+        priv->mii.phy_id = INTERNAL_PHY_ADR + priv->id;
+        running = xc_running(priv->xc);
+        xc_stop(priv->xc);
+        /* if the xc engine is already running, assume the bootloader has
+         * loaded the firmware for us
+         */
+        if (running) {
+                /* get Node Address from hardware */
+                mac4321 = readl(priv->xpec_base +
+                        NETX_XPEC_RAM_START_OFS + ETH_MAC_4321);
+                mac65 = readl(priv->xpec_base +
+                        NETX_XPEC_RAM_START_OFS + ETH_MAC_65);
+                ndev->dev_addr[0] = mac4321 & 0xff;
+                ndev->dev_addr[1] = (mac4321 >> 8) & 0xff;
+                ndev->dev_addr[2] = (mac4321 >> 16) & 0xff;
+                ndev->dev_addr[3] = (mac4321 >> 24) & 0xff;
+                ndev->dev_addr[4] = mac65 & 0xff;
+                ndev->dev_addr[5] = (mac65 >> 8) & 0xff;
+        } else {
+                if (xc_request_firmware(priv->xc)) {
+                        printk(CARDNAME ": requesting firmware failed\n");
+                        return -ENODEV;
+                }
+        }
+        xc_reset(priv->xc);
+        xc_start(priv->xc);
+        if (!is_valid_ether_addr(ndev->dev_addr))
+                printk("%s: Invalid ethernet MAC address.  Please "
+                       "set using ifconfig\n", ndev->name);
+        for (i=2; i<=18; i++)
+                pfifo_push(EMPTY_PTR_FIFO(priv->id),
+                        FIFO_PTR_FRAMENO(i) | FIFO_PTR_SEGMENT(priv->id));
+        return register_netdev(ndev);
+}
+static int netx_eth_drv_probe(struct platform_device *pdev)
+{
+        struct netx_eth_priv *priv;
+        struct net_device *ndev;
+        struct netxeth_platform_data *pdata;
+        int ret;
+        ndev = alloc_etherdev(sizeof (struct netx_eth_priv));
+        if (!ndev) {
+                printk("%s: could not allocate device.\n", CARDNAME);
+                ret = -ENOMEM;
+                goto exit;
+        }
+        SET_MODULE_OWNER(ndev);
+        SET_NETDEV_DEV(ndev, &pdev->dev);
+        platform_set_drvdata(pdev, ndev);
+        priv = netdev_priv(ndev);
+        pdata = (struct netxeth_platform_data *)pdev->dev.platform_data;
+        priv->xc = request_xc(pdata->xcno, &pdev->dev);
+        if (!priv->xc) {
+                dev_err(&pdev->dev, "unable to request xc engine\n");
+                ret = -ENODEV;
+                goto exit_free_netdev;
+        }
+        ndev->irq = priv->xc->irq;
+        priv->id = pdev->id;
+        priv->xpec_base = priv->xc->xpec_base;
+        priv->xmac_base = priv->xc->xmac_base;
+        priv->sram_base = priv->xc->sram_base;
+        ret = pfifo_request(PFIFO_MASK(priv->id));
+        if (ret) {
+                printk("unable to request PFIFO\n");
+                goto exit_free_xc;
+        }
+        ret = netx_eth_enable(ndev);
+        if (ret)
+                goto exit_free_pfifo;
+        return 0;
+exit_free_pfifo:
+        pfifo_free(PFIFO_MASK(priv->id));
+exit_free_xc:
+        free_xc(priv->xc);
+exit_free_netdev:
+        platform_set_drvdata(pdev, NULL);
+        free_netdev(ndev);
+exit:
+        return ret;
+}
+static int netx_eth_drv_remove(struct platform_device *pdev)
+{
+        struct net_device *ndev = dev_get_drvdata(&pdev->dev);
+        struct netx_eth_priv *priv = netdev_priv(ndev);
+        platform_set_drvdata(pdev, NULL);
+        unregister_netdev(ndev);
+        xc_stop(priv->xc);
+        free_xc(priv->xc);
+        free_netdev(ndev);
+        pfifo_free(PFIFO_MASK(priv->id));
+        return 0;
+}
+static int netx_eth_drv_suspend(struct platform_device *pdev, pm_message_t state)
+{
+        dev_err(&pdev->dev, "suspend not implemented\n");
+        return 0;
+}
+static int netx_eth_drv_resume(struct platform_device *pdev)
+{
+        dev_err(&pdev->dev, "resume not implemented\n");
+        return 0;
+}
+static struct platform_driver netx_eth_driver = {
+        .probe          = netx_eth_drv_probe,
+        .remove         = netx_eth_drv_remove,
+        .suspend        = netx_eth_drv_suspend,
+        .resume         = netx_eth_drv_resume,
+        .driver         = {
+                .name   = CARDNAME,
+                .owner  = THIS_MODULE,
+        },
+};
+static int __init netx_eth_init(void)
+{
+        unsigned int phy_control, val;
+        printk("NetX Ethernet driver\n");
+        phy_control = PHY_CONTROL_PHY_ADDRESS(INTERNAL_PHY_ADR>>1) |
+                      PHY_CONTROL_PHY1_MODE(PHY_MODE_ALL) |
+                      PHY_CONTROL_PHY1_AUTOMDIX |
+                      PHY_CONTROL_PHY1_EN |
+                      PHY_CONTROL_PHY0_MODE(PHY_MODE_ALL) |
+                      PHY_CONTROL_PHY0_AUTOMDIX |
+                      PHY_CONTROL_PHY0_EN |
+                      PHY_CONTROL_CLK_XLATIN;
+        val = readl(NETX_SYSTEM_IOC_ACCESS_KEY);
+        writel(val, NETX_SYSTEM_IOC_ACCESS_KEY);
+        writel(phy_control | PHY_CONTROL_RESET, NETX_SYSTEM_PHY_CONTROL);
+        udelay(100);
+        val = readl(NETX_SYSTEM_IOC_ACCESS_KEY);
+        writel(val, NETX_SYSTEM_IOC_ACCESS_KEY);
+        writel(phy_control, NETX_SYSTEM_PHY_CONTROL);
+        return platform_driver_register(&netx_eth_driver);
+}
+static void __exit netx_eth_cleanup(void)
+{
+        platform_driver_unregister(&netx_eth_driver);
+}
+module_init(netx_eth_init);
+module_exit(netx_eth_cleanup);
+MODULE_AUTHOR("Sascha Hauer, Pengutronix");
+MODULE_LICENSE("GPL");
diff --git a/drivers/net/ni5010.c b/drivers/net/ni5010.c
index a68bf474f6ed..d4be207d321a 100644
--- a/drivers/net/ni5010.c
+++ b/drivers/net/ni5010.c
@@ -1,17 +1,12 @@
 /*      ni5010.c: A network driver for the MiCom-Interlan NI5010 ethercard.
 *
- *      Copyright 1996,1997 Jan-Pascal van Best and Andreas Mohr.
+ *      Copyright 1996,1997,2006 Jan-Pascal van Best and Andreas Mohr.
 *
 *      This software may be used and distributed according to the terms
 *      of the GNU General Public License, incorporated herein by reference.
 *
 *      The authors may be reached as:
- *              jvbest@wi.leidenuniv.nl         a.mohr@mailto.de
+ *              janpascal@vanbest.org           andi@lisas.de
- *      or by snail mail as
- *              Jan-Pascal van Best             Andreas Mohr
- *              Klikspaanweg 58-4               Stauferstr. 6
- *              2324 LZ  Leiden                 D-71272 Renningen
- *              The Netherlands                 Germany
 *
 *      Sources:
 *              Donald Becker's "skeleton.c"
@@ -27,8 +22,9 @@
 *      970503  v0.93: Fixed auto-irq failure on warm reboot (JB)
 *      970623  v1.00: First kernel version (AM)
 *      970814  v1.01: Added detection of onboard receive buffer size (AM)
+ *      060611  v1.02: slight cleanup: email addresses, driver modernization.
 *      Bugs:
- *              - None known...
+ *              - not SMP-safe (no locking of I/O accesses)
 *              - Note that you have to patch ifconfig for the new /proc/net/dev
 *              format. It gives incorrect stats otherwise.
 *
@@ -39,7 +35,7 @@
 *              Complete merge with Andreas' driver
 *              Implement ring buffers (Is this useful? You can't squeeze
 *                      too many packet in a 2k buffer!)
- *              Implement DMA (Again, is this useful? Some docs says DMA is
+ *              Implement DMA (Again, is this useful? Some docs say DMA is
 *                      slower than programmed I/O)
 *
 *      Compile with:
@@ -47,7 +43,7 @@
 *                      -DMODULE -c ni5010.c 
 *
 *      Insert with e.g.:
- *              insmod ni5010.o io=0x300 irq=5  
+ *              insmod ni5010.ko io=0x300 irq=5
 */
 #include <linux/module.h>
@@ -69,15 +65,15 @@
 #include "ni5010.h"
-static const char *boardname = "NI5010";
+static const char boardname[] = "NI5010";
-static char *version =
+static char version[] __initdata =
-        "ni5010.c: v1.00 06/23/97 Jan-Pascal van Best and Andreas Mohr\n";
+        "ni5010.c: v1.02 20060611 Jan-Pascal van Best and Andreas Mohr\n";
        
 /* bufsize_rcv == 0 means autoprobing */
 static unsigned int bufsize_rcv;
-#define jumpered_interrupts     /* IRQ line jumpered on board */
+#define JUMPERED_INTERRUPTS     /* IRQ line jumpered on board */
-#undef jumpered_dma             /* No DMA used */
+#undef JUMPERED_DMA             /* No DMA used */
 #undef FULL_IODETECT            /* Only detect in portlist */
 #ifndef FULL_IODETECT
@@ -281,7 +277,7 @@ static int __init ni5010_probe1(struct net_device *dev, int ioaddr)
        PRINTK2((KERN_DEBUG "%s: I/O #4 passed!\n", dev->name));
-#ifdef jumpered_interrupts
+#ifdef JUMPERED_INTERRUPTS
        if (dev->irq == 0xff)
                ;
        else if (dev->irq < 2) {
@@ -305,7 +301,7 @@ static int __init ni5010_probe1(struct net_device *dev, int ioaddr)
        } else if (dev->irq == 2) {
                dev->irq = 9;
        }
-#endif  /* jumpered_irq */
+#endif  /* JUMPERED_INTERRUPTS */
        PRINTK2((KERN_DEBUG "%s: I/O #9 passed!\n", dev->name));
        /* DMA is not supported (yet?), so no use detecting it */
@@ -334,7 +330,7 @@ static int __init ni5010_probe1(struct net_device *dev, int ioaddr)
                outw(0, IE_GP);         /* Point GP at start of packet */
                outb(0, IE_RBUF);       /* set buffer byte 0 to 0 again */
        }
-        printk("// bufsize rcv/xmt=%d/%d\n", bufsize_rcv, NI5010_BUFSIZE);
+        printk("-> bufsize rcv/xmt=%d/%d\n", bufsize_rcv, NI5010_BUFSIZE);
        memset(dev->priv, 0, sizeof(struct ni5010_local));
        
        dev->open               = ni5010_open;
@@ -354,11 +350,9 @@ static int __init ni5010_probe1(struct net_device *dev, int ioaddr)
        outb(0xff, EDLC_XCLR);  /* Kill all pending xmt interrupts */
        printk(KERN_INFO "%s: NI5010 found at 0x%x, using IRQ %d", dev->name, ioaddr, dev->irq);
-        if (dev->dma) printk(" & DMA %d", dev->dma);
+        if (dev->dma)
+                printk(" & DMA %d", dev->dma);
        printk(".\n");
-        printk(KERN_INFO "Join the NI5010 driver development team!\n");
-        printk(KERN_INFO "Mail to a.mohr@mailto.de or jvbest@wi.leidenuniv.nl\n");
        return 0;
 out:
        release_region(dev->base_addr, NI5010_IO_EXTENT);
@@ -371,7 +365,7 @@ out:
 *
 * This routine should set everything up anew at each open, even
 * registers that "should" only need to be set once at boot, so that
- * there is non-reboot way to recover if something goes wrong.
+ * there is a non-reboot way to recover if something goes wrong.
 */
   
 static int ni5010_open(struct net_device *dev)
@@ -390,13 +384,13 @@ static int ni5010_open(struct net_device *dev)
         * Always allocate the DMA channel after the IRQ,
         * and clean up on failure.
         */
-#ifdef jumpered_dma
+#ifdef JUMPERED_DMA
        if (request_dma(dev->dma, cardname)) {
                printk(KERN_WARNING "%s: Cannot get dma %#2x\n", dev->name, dev->dma);
                free_irq(dev->irq, NULL);
                return -EAGAIN;
        }
-#endif  /* jumpered_dma */
+#endif  /* JUMPERED_DMA */
        PRINTK3((KERN_DEBUG "%s: passed open() #2\n", dev->name));
        /* Reset the hardware here.  Don't forget to set the station address. */
@@ -633,7 +627,7 @@ static int ni5010_close(struct net_device *dev)
        int ioaddr = dev->base_addr;
        PRINTK2((KERN_DEBUG "%s: entering ni5010_close\n", dev->name));
-#ifdef jumpered_interrupts      
+#ifdef JUMPERED_INTERRUPTS
        free_irq(dev->irq, NULL);
 #endif
        /* Put card in held-RESET state */
@@ -771,7 +765,7 @@ module_param(irq, int, 0);
 MODULE_PARM_DESC(io, "ni5010 I/O base address");
 MODULE_PARM_DESC(irq, "ni5010 IRQ number");
-int init_module(void)
+static int __init ni5010_init_module(void)
 {
        PRINTK2((KERN_DEBUG "%s: entering init_module\n", boardname));
        /*
@@ -792,13 +786,15 @@ int init_module(void)
        return 0;
 }
-void cleanup_module(void)
+static void __exit ni5010_cleanup_module(void)
 {
        PRINTK2((KERN_DEBUG "%s: entering cleanup_module\n", boardname));
        unregister_netdev(dev_ni5010);
        release_region(dev_ni5010->base_addr, NI5010_IO_EXTENT);
        free_netdev(dev_ni5010);
 }
+module_init(ni5010_init_module);
+module_exit(ni5010_cleanup_module);
 #endif /* MODULE */
 MODULE_LICENSE("GPL");
diff --git a/drivers/net/ns83820.c b/drivers/net/ns83820.c
index 706aed7d717f..0e76859c90a2 100644
--- a/drivers/net/ns83820.c
+++ b/drivers/net/ns83820.c
@@ -96,7 +96,6 @@
 //#define dprintk               printk
 #define dprintk(x...)           do { } while (0)
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/types.h>
@@ -804,7 +803,7 @@ static int ns83820_setup_rx(struct net_device *ndev)
                writel(dev->IMR_cache, dev->base + IMR);
                writel(1, dev->base + IER);
-                spin_unlock_irq(&dev->misc_lock);
+                spin_unlock(&dev->misc_lock);
                kick_rx(ndev);
@@ -1013,8 +1012,6 @@ static void do_tx_done(struct net_device *ndev)
        struct ns83820 *dev = PRIV(ndev);
        u32 cmdsts, tx_done_idx, *desc;
-        spin_lock_irq(&dev->tx_lock);
        dprintk("do_tx_done(%p)\n", ndev);
        tx_done_idx = dev->tx_done_idx;
        desc = dev->tx_descs + (tx_done_idx * DESC_SIZE);
@@ -1070,7 +1067,6 @@ static void do_tx_done(struct net_device *ndev)
                netif_start_queue(ndev);
                netif_wake_queue(ndev);
        }
-        spin_unlock_irq(&dev->tx_lock);
 }
 static void ns83820_cleanup_tx(struct ns83820 *dev)
@@ -1282,11 +1278,13 @@ static struct ethtool_ops ops = {
        .get_link = ns83820_get_link
 };
+/* this function is called in irq context from the ISR */
 static void ns83820_mib_isr(struct ns83820 *dev)
 {
-        spin_lock(&dev->misc_lock);
+        unsigned long flags;
+        spin_lock_irqsave(&dev->misc_lock, flags);
        ns83820_update_stats(dev);
-        spin_unlock(&dev->misc_lock);
+        spin_unlock_irqrestore(&dev->misc_lock, flags);
 }
 static void ns83820_do_isr(struct net_device *ndev, u32 isr);
@@ -1308,6 +1306,8 @@ static irqreturn_t ns83820_irq(int foo, void *data, struct pt_regs *regs)
 static void ns83820_do_isr(struct net_device *ndev, u32 isr)
 {
        struct ns83820 *dev = PRIV(ndev);
+        unsigned long flags;
 #ifdef DEBUG
        if (isr & ~(ISR_PHY | ISR_RXDESC | ISR_RXEARLY | ISR_RXOK | ISR_RXERR | ISR_TXIDLE | ISR_TXOK | ISR_TXDESC))
                Dprintk("odd isr? 0x%08x\n", isr);
@@ -1322,10 +1322,10 @@ static void ns83820_do_isr(struct net_device *ndev, u32 isr)
        if ((ISR_RXDESC | ISR_RXOK) & isr) {
                prefetch(dev->rx_info.next_rx_desc);
-                spin_lock_irq(&dev->misc_lock);
+                spin_lock_irqsave(&dev->misc_lock, flags);
                dev->IMR_cache &= ~(ISR_RXDESC | ISR_RXOK);
                writel(dev->IMR_cache, dev->base + IMR);
-                spin_unlock_irq(&dev->misc_lock);
+                spin_unlock_irqrestore(&dev->misc_lock, flags);
                tasklet_schedule(&dev->rx_tasklet);
                //rx_irq(ndev);
@@ -1371,16 +1371,18 @@ static void ns83820_do_isr(struct net_device *ndev, u32 isr)
         * work has accumulated
         */
        if ((ISR_TXDESC | ISR_TXIDLE | ISR_TXOK | ISR_TXERR) & isr) {
+                spin_lock_irqsave(&dev->tx_lock, flags);
                do_tx_done(ndev);
+                spin_unlock_irqrestore(&dev->tx_lock, flags);
                /* Disable TxOk if there are no outstanding tx packets.
                 */
                if ((dev->tx_done_idx == dev->tx_free_idx) &&
                    (dev->IMR_cache & ISR_TXOK)) {
-                        spin_lock_irq(&dev->misc_lock);
+                        spin_lock_irqsave(&dev->misc_lock, flags);
                        dev->IMR_cache &= ~ISR_TXOK;
                        writel(dev->IMR_cache, dev->base + IMR);
-                        spin_unlock_irq(&dev->misc_lock);
+                        spin_unlock_irqrestore(&dev->misc_lock, flags);
                }
        }
@@ -1391,10 +1393,10 @@ static void ns83820_do_isr(struct net_device *ndev, u32 isr)
         * nature are expected, we must enable TxOk.
         */
        if ((ISR_TXIDLE & isr) && (dev->tx_done_idx != dev->tx_free_idx)) {
-                spin_lock_irq(&dev->misc_lock);
+                spin_lock_irqsave(&dev->misc_lock, flags);
                dev->IMR_cache |= ISR_TXOK;
                writel(dev->IMR_cache, dev->base + IMR);
-                spin_unlock_irq(&dev->misc_lock);
+                spin_unlock_irqrestore(&dev->misc_lock, flags);
        }
        /* MIB interrupt: one of the statistics counters is about to overflow */
@@ -1456,7 +1458,7 @@ static void ns83820_tx_timeout(struct net_device *ndev)
        u32 tx_done_idx, *desc;
        unsigned long flags;
-        local_irq_save(flags);
+        spin_lock_irqsave(&dev->tx_lock, flags);
        tx_done_idx = dev->tx_done_idx;
        desc = dev->tx_descs + (tx_done_idx * DESC_SIZE);
@@ -1483,7 +1485,7 @@ static void ns83820_tx_timeout(struct net_device *ndev)
                ndev->name,
                tx_done_idx, dev->tx_free_idx, le32_to_cpu(desc[DESC_CMDSTS]));
-        local_irq_restore(flags);
+        spin_unlock_irqrestore(&dev->tx_lock, flags);
 }
 static void ns83820_tx_watch(unsigned long data)
@@ -1833,7 +1835,7 @@ static int __devinit ns83820_init_one(struct pci_dev *pci_dev, const struct pci_
        } else if (!pci_set_dma_mask(pci_dev, DMA_32BIT_MASK)) {
                using_dac = 0;
        } else {
-                printk(KERN_WARNING "ns83820.c: pci_set_dma_mask failed!\n");
+                dev_warn(&pci_dev->dev, "pci_set_dma_mask failed!\n");
                return -ENODEV;
        }
@@ -1856,7 +1858,7 @@ static int __devinit ns83820_init_one(struct pci_dev *pci_dev, const struct pci_
        err = pci_enable_device(pci_dev);
        if (err) {
-                printk(KERN_INFO "ns83820: pci_enable_dev failed: %d\n", err);
+                dev_info(&pci_dev->dev, "pci_enable_dev failed: %d\n", err);
                goto out_free;
        }
@@ -1882,11 +1884,11 @@ static int __devinit ns83820_init_one(struct pci_dev *pci_dev, const struct pci_
        dev->IMR_cache = 0;
-        err = request_irq(pci_dev->irq, ns83820_irq, SA_SHIRQ,
+        err = request_irq(pci_dev->irq, ns83820_irq, IRQF_SHARED,
                          DRV_NAME, ndev);
        if (err) {
-                printk(KERN_INFO "ns83820: unable to register irq %d\n",
+                dev_info(&pci_dev->dev, "unable to register irq %d, err %d\n",
-                        pci_dev->irq);
+                        pci_dev->irq, err);
                goto out_disable;
        }
@@ -1900,7 +1902,7 @@ static int __devinit ns83820_init_one(struct pci_dev *pci_dev, const struct pci_
        rtnl_lock();
        err = dev_alloc_name(ndev, ndev->name);
        if (err < 0) {
-                printk(KERN_INFO "ns83820: unable to get netdev name: %d\n", err);
+                dev_info(&pci_dev->dev, "unable to get netdev name: %d\n", err);
                goto out_free_irq;
        }
diff --git a/drivers/net/pci-skeleton.c b/drivers/net/pci-skeleton.c
index a7bb54df75a8..e0e293964042 100644
--- a/drivers/net/pci-skeleton.c
+++ b/drivers/net/pci-skeleton.c
@@ -85,7 +85,6 @@ IVc. Errata
 */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/pci.h>
@@ -602,7 +601,7 @@ static int __devinit netdrv_init_board (struct pci_dev *pdev,
        /* dev zeroed in alloc_etherdev */
        dev = alloc_etherdev (sizeof (*tp));
        if (dev == NULL) {
-                printk (KERN_ERR PFX "unable to alloc new ethernet\n");
+                dev_err(&pdev->dev, "unable to alloc new ethernet\n");
                DPRINTK ("EXIT, returning -ENOMEM\n");
                return -ENOMEM;
        }
@@ -632,14 +631,14 @@ static int __devinit netdrv_init_board (struct pci_dev *pdev,
        /* make sure PCI base addr 0 is PIO */
        if (!(pio_flags & IORESOURCE_IO)) {
-                printk (KERN_ERR PFX "region #0 not a PIO resource, aborting\n");
+                dev_err(&pdev->dev, "region #0 not a PIO resource, aborting\n");
                rc = -ENODEV;
                goto err_out;
        }
        /* make sure PCI base addr 1 is MMIO */
        if (!(mmio_flags & IORESOURCE_MEM)) {
-                printk (KERN_ERR PFX "region #1 not an MMIO resource, aborting\n");
+                dev_err(&pdev->dev, "region #1 not an MMIO resource, aborting\n");
                rc = -ENODEV;
                goto err_out;
        }
@@ -647,12 +646,12 @@ static int __devinit netdrv_init_board (struct pci_dev *pdev,
        /* check for weird/broken PCI region reporting */
        if ((pio_len < NETDRV_MIN_IO_SIZE) ||
            (mmio_len < NETDRV_MIN_IO_SIZE)) {
-                printk (KERN_ERR PFX "Invalid PCI region size(s), aborting\n");
+                dev_err(&pdev->dev, "Invalid PCI region size(s), aborting\n");
                rc = -ENODEV;
                goto err_out;
        }
-        rc = pci_request_regions (pdev, "pci-skeleton");
+        rc = pci_request_regions (pdev, MODNAME);
        if (rc)
                goto err_out;
@@ -664,7 +663,7 @@ static int __devinit netdrv_init_board (struct pci_dev *pdev,
        /* ioremap MMIO region */
        ioaddr = ioremap (mmio_start, mmio_len);
        if (ioaddr == NULL) {
-                printk (KERN_ERR PFX "cannot remap MMIO, aborting\n");
+                dev_err(&pdev->dev, "cannot remap MMIO, aborting\n");
                rc = -EIO;
                goto err_out_free_res;
        }
@@ -700,9 +699,10 @@ static int __devinit netdrv_init_board (struct pci_dev *pdev,
                }
        /* if unknown chip, assume array element #0, original RTL-8139 in this case */
-        printk (KERN_DEBUG PFX "PCI device %s: unknown chip version, assuming RTL-8139\n",
+        dev_printk (KERN_DEBUG, &pdev->dev,
-                pci_name(pdev));
+                "unknown chip version, assuming RTL-8139\n");
-        printk (KERN_DEBUG PFX "PCI device %s: TxConfig = 0x%lx\n", pci_name(pdev), NETDRV_R32 (TxConfig));
+        dev_printk (KERN_DEBUG, &pdev->dev, "TxConfig = 0x%lx\n",
+                NETDRV_R32 (TxConfig));
        tp->chipset = 0;
 match:
@@ -1076,7 +1076,7 @@ static int netdrv_open (struct net_device *dev)
        DPRINTK ("ENTER\n");
-        retval = request_irq (dev->irq, netdrv_interrupt, SA_SHIRQ, dev->name, dev);
+        retval = request_irq (dev->irq, netdrv_interrupt, IRQF_SHARED, dev->name, dev);
        if (retval) {
                DPRINTK ("EXIT, returning %d\n", retval);
                return retval;
diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c
index 2ea66aca648b..297e9f805366 100644
--- a/drivers/net/pcmcia/axnet_cs.c
+++ b/drivers/net/pcmcia/axnet_cs.c
@@ -535,7 +535,7 @@ static int axnet_open(struct net_device *dev)
    link->open++;
-    request_irq(dev->irq, ei_irq_wrapper, SA_SHIRQ, "axnet_cs", dev);
+    request_irq(dev->irq, ei_irq_wrapper, IRQF_SHARED, "axnet_cs", dev);
    info->link_status = 0x00;
    init_timer(&info->watchdog);
diff --git a/drivers/net/pcmcia/com20020_cs.c b/drivers/net/pcmcia/com20020_cs.c
index 441de824ab6b..48434d7924eb 100644
--- a/drivers/net/pcmcia/com20020_cs.c
+++ b/drivers/net/pcmcia/com20020_cs.c
@@ -387,7 +387,10 @@ static int com20020_resume(struct pcmcia_device *link)
 }
 static struct pcmcia_device_id com20020_ids[] = {
-        PCMCIA_DEVICE_PROD_ID12("Contemporary Control Systems, Inc.", "PCM20 Arcnet Adapter", 0x59991666, 0x95dfffaf),
+        PCMCIA_DEVICE_PROD_ID12("Contemporary Control Systems, Inc.",
+                        "PCM20 Arcnet Adapter", 0x59991666, 0x95dfffaf),
+        PCMCIA_DEVICE_PROD_ID12("SoHard AG",
+                        "SH ARC PCMCIA", 0xf8991729, 0x69dff0c7),
        PCMCIA_DEVICE_NULL
 };
 MODULE_DEVICE_TABLE(pcmcia, com20020_ids);
diff --git a/drivers/net/pcmcia/fmvj18x_cs.c b/drivers/net/pcmcia/fmvj18x_cs.c
index 09b11761cdfa..ea93b8f18605 100644
--- a/drivers/net/pcmcia/fmvj18x_cs.c
+++ b/drivers/net/pcmcia/fmvj18x_cs.c
@@ -831,8 +831,7 @@ static int fjn_start_xmit(struct sk_buff *skb, struct net_device *dev)
    
    if (length < ETH_ZLEN)
    {
-        skb = skb_padto(skb, ETH_ZLEN);
+        if (skb_padto(skb, ETH_ZLEN))
-        if (skb == NULL)
                return 0;
        length = ETH_ZLEN;
    }
diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/pcmcia/pcnet_cs.c
index 661bfe54ff5d..0ecebfc31f07 100644
--- a/drivers/net/pcmcia/pcnet_cs.c
+++ b/drivers/net/pcmcia/pcnet_cs.c
@@ -998,7 +998,7 @@ static int pcnet_open(struct net_device *dev)
    link->open++;
    set_misc_reg(dev);
-    request_irq(dev->irq, ei_irq_wrapper, SA_SHIRQ, dev_info, dev);
+    request_irq(dev->irq, ei_irq_wrapper, IRQF_SHARED, dev_info, dev);
    info->phy_id = info->eth_phy;
    info->link_status = 0x00;
diff --git a/drivers/net/pcmcia/smc91c92_cs.c b/drivers/net/pcmcia/smc91c92_cs.c
index e74bf5014ef6..a73d54553030 100644
--- a/drivers/net/pcmcia/smc91c92_cs.c
+++ b/drivers/net/pcmcia/smc91c92_cs.c
@@ -1883,7 +1883,7 @@ static void smc_reset(struct net_device *dev)
    /* Set the Window 1 control, configuration and station addr registers.
       No point in writing the I/O base register ;-> */
    SMC_SELECT_BANK(1);
-    /* Automatically release succesfully transmitted packets,
+    /* Automatically release successfully transmitted packets,
       Accept link errors, counter and Tx error interrupts. */
    outw(CTL_AUTO_RELEASE | CTL_TE_ENABLE | CTL_CR_ENABLE,
         ioaddr + CONTROL);
diff --git a/drivers/net/pcmcia/xirc2ps_cs.c b/drivers/net/pcmcia/xirc2ps_cs.c
index 71f45056a70c..9bae77ce1314 100644
--- a/drivers/net/pcmcia/xirc2ps_cs.c
+++ b/drivers/net/pcmcia/xirc2ps_cs.c
@@ -1359,7 +1359,7 @@ do_start_xmit(struct sk_buff *skb, struct net_device *dev)
    kio_addr_t ioaddr = dev->base_addr;
    int okay;
    unsigned freespace;
-    unsigned pktlen = skb? skb->len : 0;
+    unsigned pktlen = skb->len;
    DEBUG(1, "do_start_xmit(skb=%p, dev=%p) len=%u\n",
          skb, dev, pktlen);
@@ -1374,8 +1374,7 @@ do_start_xmit(struct sk_buff *skb, struct net_device *dev)
     */
    if (pktlen < ETH_ZLEN)
    {
-        skb = skb_padto(skb, ETH_ZLEN);
+        if (skb_padto(skb, ETH_ZLEN))
-        if (skb == NULL)
                return 0;
        pktlen = ETH_ZLEN;
    }
diff --git a/drivers/net/pcnet32.c b/drivers/net/pcnet32.c
index fc08c4af506c..4daafe303358 100644
--- a/drivers/net/pcnet32.c
+++ b/drivers/net/pcnet32.c
@@ -58,18 +58,15 @@ static const char *const version =
 * PCI device identifiers for "new style" Linux PCI Device Drivers
 */
 static struct pci_device_id pcnet32_pci_tbl[] = {
-        { PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_LANCE_HOME,
+        { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_LANCE_HOME), },
-          PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+        { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_LANCE), },
-        { PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_LANCE,
-          PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
        /*
         * Adapters that were sold with IBM's RS/6000 or pSeries hardware have
         * the incorrect vendor id.
         */
-        { PCI_VENDOR_ID_TRIDENT, PCI_DEVICE_ID_AMD_LANCE,
+        { PCI_DEVICE(PCI_VENDOR_ID_TRIDENT, PCI_DEVICE_ID_AMD_LANCE),
-          PCI_ANY_ID, PCI_ANY_ID,
+          .class = (PCI_CLASS_NETWORK_ETHERNET << 8), .class_mask = 0xffff00, },
-          PCI_CLASS_NETWORK_ETHERNET << 8, 0xffff00, 0},
        { }     /* terminate list */
 };
@@ -188,6 +185,23 @@ static int homepna[MAX_UNITS];
 #define PCNET32_TOTAL_SIZE      0x20
+#define CSR0            0
+#define CSR0_INIT       0x1
+#define CSR0_START      0x2
+#define CSR0_STOP       0x4
+#define CSR0_TXPOLL     0x8
+#define CSR0_INTEN      0x40
+#define CSR0_IDON       0x0100
+#define CSR0_NORMAL     (CSR0_START | CSR0_INTEN)
+#define PCNET32_INIT_LOW        1
+#define PCNET32_INIT_HIGH       2
+#define CSR3            3
+#define CSR4            4
+#define CSR5            5
+#define CSR5_SUSPEND    0x0001
+#define CSR15           15
+#define PCNET32_MC_FILTER       8
 /* The PCNET32 Rx and Tx ring descriptors. */
 struct pcnet32_rx_head {
        u32     base;
@@ -277,7 +291,6 @@ struct pcnet32_private {
        u32                     phymask;
 };
-static void pcnet32_probe_vlbus(void);
 static int pcnet32_probe_pci(struct pci_dev *, const struct pci_device_id *);
 static int pcnet32_probe1(unsigned long, int, struct pci_dev *);
 static int pcnet32_open(struct net_device *);
@@ -309,12 +322,6 @@ static int pcnet32_alloc_ring(struct net_device *dev, char *name);
 static void pcnet32_free_ring(struct net_device *dev);
 static void pcnet32_check_media(struct net_device *dev, int verbose);
-enum pci_flags_bit {
-        PCI_USES_IO = 1, PCI_USES_MEM = 2, PCI_USES_MASTER = 4,
-        PCI_ADDR0 = 0x10 << 0, PCI_ADDR1 = 0x10 << 1, PCI_ADDR2 =
-            0x10 << 2, PCI_ADDR3 = 0x10 << 3,
-};
 static u16 pcnet32_wio_read_csr(unsigned long addr, int index)
 {
        outw(index, addr + PCNET32_WIO_RAP);
@@ -425,6 +432,238 @@ static struct pcnet32_access pcnet32_dwio = {
        .reset = pcnet32_dwio_reset
 };
+static void pcnet32_netif_stop(struct net_device *dev)
+{
+        dev->trans_start = jiffies;
+        netif_poll_disable(dev);
+        netif_tx_disable(dev);
+}
+static void pcnet32_netif_start(struct net_device *dev)
+{
+        netif_wake_queue(dev);
+        netif_poll_enable(dev);
+}
+/*
+ * Allocate space for the new sized tx ring.
+ * Free old resources
+ * Save new resources.
+ * Any failure keeps old resources.
+ * Must be called with lp->lock held.
+ */
+static void pcnet32_realloc_tx_ring(struct net_device *dev,
+                                    struct pcnet32_private *lp,
+                                    unsigned int size)
+{
+        dma_addr_t new_ring_dma_addr;
+        dma_addr_t *new_dma_addr_list;
+        struct pcnet32_tx_head *new_tx_ring;
+        struct sk_buff **new_skb_list;
+        pcnet32_purge_tx_ring(dev);
+        new_tx_ring = pci_alloc_consistent(lp->pci_dev,
+                                           sizeof(struct pcnet32_tx_head) *
+                                           (1 << size),
+                                           &new_ring_dma_addr);
+        if (new_tx_ring == NULL) {
+                if (netif_msg_drv(lp))
+                        printk("\n" KERN_ERR
+                               "%s: Consistent memory allocation failed.\n",
+                               dev->name);
+                return;
+        }
+        memset(new_tx_ring, 0, sizeof(struct pcnet32_tx_head) * (1 << size));
+        new_dma_addr_list = kcalloc((1 << size), sizeof(dma_addr_t),
+                                GFP_ATOMIC);
+        if (!new_dma_addr_list) {
+                if (netif_msg_drv(lp))
+                        printk("\n" KERN_ERR
+                               "%s: Memory allocation failed.\n", dev->name);
+                goto free_new_tx_ring;
+        }
+        new_skb_list = kcalloc((1 << size), sizeof(struct sk_buff *),
+                                GFP_ATOMIC);
+        if (!new_skb_list) {
+                if (netif_msg_drv(lp))
+                        printk("\n" KERN_ERR
+                               "%s: Memory allocation failed.\n", dev->name);
+                goto free_new_lists;
+        }
+        kfree(lp->tx_skbuff);
+        kfree(lp->tx_dma_addr);
+        pci_free_consistent(lp->pci_dev,
+                            sizeof(struct pcnet32_tx_head) *
+                            lp->tx_ring_size, lp->tx_ring,
+                            lp->tx_ring_dma_addr);
+        lp->tx_ring_size = (1 << size);
+        lp->tx_mod_mask = lp->tx_ring_size - 1;
+        lp->tx_len_bits = (size << 12);
+        lp->tx_ring = new_tx_ring;
+        lp->tx_ring_dma_addr = new_ring_dma_addr;
+        lp->tx_dma_addr = new_dma_addr_list;
+        lp->tx_skbuff = new_skb_list;
+        return;
+    free_new_lists:
+        kfree(new_dma_addr_list);
+    free_new_tx_ring:
+        pci_free_consistent(lp->pci_dev,
+                            sizeof(struct pcnet32_tx_head) *
+                            (1 << size),
+                            new_tx_ring,
+                            new_ring_dma_addr);
+        return;
+}
+/*
+ * Allocate space for the new sized rx ring.
+ * Re-use old receive buffers.
+ *   alloc extra buffers
+ *   free unneeded buffers
+ *   free unneeded buffers
+ * Save new resources.
+ * Any failure keeps old resources.
+ * Must be called with lp->lock held.
+ */
+static void pcnet32_realloc_rx_ring(struct net_device *dev,
+                                    struct pcnet32_private *lp,
+                                    unsigned int size)
+{
+        dma_addr_t new_ring_dma_addr;
+        dma_addr_t *new_dma_addr_list;
+        struct pcnet32_rx_head *new_rx_ring;
+        struct sk_buff **new_skb_list;
+        int new, overlap;
+        new_rx_ring = pci_alloc_consistent(lp->pci_dev,
+                                           sizeof(struct pcnet32_rx_head) *
+                                           (1 << size),
+                                           &new_ring_dma_addr);
+        if (new_rx_ring == NULL) {
+                if (netif_msg_drv(lp))
+                        printk("\n" KERN_ERR
+                               "%s: Consistent memory allocation failed.\n",
+                               dev->name);
+                return;
+        }
+        memset(new_rx_ring, 0, sizeof(struct pcnet32_rx_head) * (1 << size));
+        new_dma_addr_list = kcalloc((1 << size), sizeof(dma_addr_t),
+                                GFP_ATOMIC);
+        if (!new_dma_addr_list) {
+                if (netif_msg_drv(lp))
+                        printk("\n" KERN_ERR
+                               "%s: Memory allocation failed.\n", dev->name);
+                goto free_new_rx_ring;
+        }
+        new_skb_list = kcalloc((1 << size), sizeof(struct sk_buff *),
+                                GFP_ATOMIC);
+        if (!new_skb_list) {
+                if (netif_msg_drv(lp))
+                        printk("\n" KERN_ERR
+                               "%s: Memory allocation failed.\n", dev->name);
+                goto free_new_lists;
+        }
+        /* first copy the current receive buffers */
+        overlap = min(size, lp->rx_ring_size);
+        for (new = 0; new < overlap; new++) {
+                new_rx_ring[new] = lp->rx_ring[new];
+                new_dma_addr_list[new] = lp->rx_dma_addr[new];
+                new_skb_list[new] = lp->rx_skbuff[new];
+        }
+        /* now allocate any new buffers needed */
+        for (; new < size; new++ ) {
+                struct sk_buff *rx_skbuff;
+                new_skb_list[new] = dev_alloc_skb(PKT_BUF_SZ);
+                if (!(rx_skbuff = new_skb_list[new])) {
+                        /* keep the original lists and buffers */
+                        if (netif_msg_drv(lp))
+                                printk(KERN_ERR
+                                       "%s: pcnet32_realloc_rx_ring dev_alloc_skb failed.\n",
+                                       dev->name);
+                        goto free_all_new;
+                }
+                skb_reserve(rx_skbuff, 2);
+                new_dma_addr_list[new] =
+                            pci_map_single(lp->pci_dev, rx_skbuff->data,
+                                           PKT_BUF_SZ - 2, PCI_DMA_FROMDEVICE);
+                new_rx_ring[new].base = (u32) le32_to_cpu(new_dma_addr_list[new]);
+                new_rx_ring[new].buf_length = le16_to_cpu(2 - PKT_BUF_SZ);
+                new_rx_ring[new].status = le16_to_cpu(0x8000);
+        }
+        /* and free any unneeded buffers */
+        for (; new < lp->rx_ring_size; new++) {
+                if (lp->rx_skbuff[new]) {
+                        pci_unmap_single(lp->pci_dev, lp->rx_dma_addr[new],
+                                         PKT_BUF_SZ - 2, PCI_DMA_FROMDEVICE);
+                        dev_kfree_skb(lp->rx_skbuff[new]);
+                }
+        }
+        kfree(lp->rx_skbuff);
+        kfree(lp->rx_dma_addr);
+        pci_free_consistent(lp->pci_dev,
+                            sizeof(struct pcnet32_rx_head) *
+                            lp->rx_ring_size, lp->rx_ring,
+                            lp->rx_ring_dma_addr);
+        lp->rx_ring_size = (1 << size);
+        lp->rx_mod_mask = lp->rx_ring_size - 1;
+        lp->rx_len_bits = (size << 4);
+        lp->rx_ring = new_rx_ring;
+        lp->rx_ring_dma_addr = new_ring_dma_addr;
+        lp->rx_dma_addr = new_dma_addr_list;
+        lp->rx_skbuff = new_skb_list;
+        return;
+    free_all_new:
+        for (; --new >= lp->rx_ring_size; ) {
+                if (new_skb_list[new]) {
+                        pci_unmap_single(lp->pci_dev, new_dma_addr_list[new],
+                                         PKT_BUF_SZ - 2, PCI_DMA_FROMDEVICE);
+                        dev_kfree_skb(new_skb_list[new]);
+                }
+        }
+        kfree(new_skb_list);
+    free_new_lists:
+        kfree(new_dma_addr_list);
+    free_new_rx_ring:
+        pci_free_consistent(lp->pci_dev,
+                            sizeof(struct pcnet32_rx_head) *
+                            (1 << size),
+                            new_rx_ring,
+                            new_ring_dma_addr);
+        return;
+}
+static void pcnet32_purge_rx_ring(struct net_device *dev)
+{
+        struct pcnet32_private *lp = dev->priv;
+        int i;
+        /* free all allocated skbuffs */
+        for (i = 0; i < lp->rx_ring_size; i++) {
+                lp->rx_ring[i].status = 0;      /* CPU owns buffer */
+                wmb();          /* Make sure adapter sees owner change */
+                if (lp->rx_skbuff[i]) {
+                        pci_unmap_single(lp->pci_dev, lp->rx_dma_addr[i],
+                                         PKT_BUF_SZ - 2, PCI_DMA_FROMDEVICE);
+                        dev_kfree_skb_any(lp->rx_skbuff[i]);
+                }
+                lp->rx_skbuff[i] = NULL;
+                lp->rx_dma_addr[i] = 0;
+        }
+}
 #ifdef CONFIG_NET_POLL_CONTROLLER
 static void pcnet32_poll_controller(struct net_device *dev)
 {
@@ -525,10 +764,10 @@ static void pcnet32_get_ringparam(struct net_device *dev,
 {
        struct pcnet32_private *lp = dev->priv;
-        ering->tx_max_pending = TX_MAX_RING_SIZE - 1;
+        ering->tx_max_pending = TX_MAX_RING_SIZE;
-        ering->tx_pending = lp->tx_ring_size - 1;
+        ering->tx_pending = lp->tx_ring_size;
-        ering->rx_max_pending = RX_MAX_RING_SIZE - 1;
+        ering->rx_max_pending = RX_MAX_RING_SIZE;
-        ering->rx_pending = lp->rx_ring_size - 1;
+        ering->rx_pending = lp->rx_ring_size;
 }
 static int pcnet32_set_ringparam(struct net_device *dev,
@@ -536,56 +775,53 @@ static int pcnet32_set_ringparam(struct net_device *dev,
 {
        struct pcnet32_private *lp = dev->priv;
        unsigned long flags;
+        unsigned int size;
+        ulong ioaddr = dev->base_addr;
        int i;
        if (ering->rx_mini_pending || ering->rx_jumbo_pending)
                return -EINVAL;
        if (netif_running(dev))
-                pcnet32_close(dev);
+                pcnet32_netif_stop(dev);
        spin_lock_irqsave(&lp->lock, flags);
-        pcnet32_free_ring(dev);
+        lp->a.write_csr(ioaddr, CSR0, CSR0_STOP);       /* stop the chip */
-        lp->tx_ring_size =
-            min(ering->tx_pending, (unsigned int)TX_MAX_RING_SIZE);
+        size = min(ering->tx_pending, (unsigned int)TX_MAX_RING_SIZE);
-        lp->rx_ring_size =
-            min(ering->rx_pending, (unsigned int)RX_MAX_RING_SIZE);
        /* set the minimum ring size to 4, to allow the loopback test to work
         * unchanged.
         */
        for (i = 2; i <= PCNET32_LOG_MAX_TX_BUFFERS; i++) {
-                if (lp->tx_ring_size <= (1 << i))
+                if (size <= (1 << i))
                        break;
        }
-        lp->tx_ring_size = (1 << i);
+        if ((1 << i) != lp->tx_ring_size)
-        lp->tx_mod_mask = lp->tx_ring_size - 1;
+                pcnet32_realloc_tx_ring(dev, lp, i);
-        lp->tx_len_bits = (i << 12);
+        
+        size = min(ering->rx_pending, (unsigned int)RX_MAX_RING_SIZE);
        for (i = 2; i <= PCNET32_LOG_MAX_RX_BUFFERS; i++) {
-                if (lp->rx_ring_size <= (1 << i))
+                if (size <= (1 << i))
                        break;
        }
-        lp->rx_ring_size = (1 << i);
+        if ((1 << i) != lp->rx_ring_size)
-        lp->rx_mod_mask = lp->rx_ring_size - 1;
+                pcnet32_realloc_rx_ring(dev, lp, i);
-        lp->rx_len_bits = (i << 4);
+        
+        dev->weight = lp->rx_ring_size / 2;
-        if (pcnet32_alloc_ring(dev, dev->name)) {
+        if (netif_running(dev)) {
-                pcnet32_free_ring(dev);
+                pcnet32_netif_start(dev);
-                spin_unlock_irqrestore(&lp->lock, flags);
+                pcnet32_restart(dev, CSR0_NORMAL);
-                return -ENOMEM;
        }
        spin_unlock_irqrestore(&lp->lock, flags);
-        if (pcnet32_debug & NETIF_MSG_DRV)
+        if (netif_msg_drv(lp))
-                printk(KERN_INFO PFX
+                printk(KERN_INFO
                       "%s: Ring Param Settings: RX: %d, TX: %d\n", dev->name,
                       lp->rx_ring_size, lp->tx_ring_size);
-        if (netif_running(dev))
-                pcnet32_open(dev);
        return 0;
 }
@@ -639,29 +875,27 @@ static int pcnet32_loopback_test(struct net_device *dev, uint64_t * data1)
        unsigned long flags;
        unsigned long ticks;
-        *data1 = 1;             /* status of test, default to fail */
        rc = 1;                 /* default to fail */
        if (netif_running(dev))
                pcnet32_close(dev);
        spin_lock_irqsave(&lp->lock, flags);
+        lp->a.write_csr(ioaddr, CSR0, CSR0_STOP);       /* stop the chip */
+        numbuffs = min(numbuffs, (int)min(lp->rx_ring_size, lp->tx_ring_size));
        /* Reset the PCNET32 */
        lp->a.reset(ioaddr);
+        lp->a.write_csr(ioaddr, CSR4, 0x0915);
        /* switch pcnet32 to 32bit mode */
        lp->a.write_bcr(ioaddr, 20, 2);
-        lp->init_block.mode =
-            le16_to_cpu((lp->options & PCNET32_PORT_PORTSEL) << 7);
-        lp->init_block.filter[0] = 0;
-        lp->init_block.filter[1] = 0;
        /* purge & init rings but don't actually restart */
        pcnet32_restart(dev, 0x0000);
-        lp->a.write_csr(ioaddr, 0, 0x0004);     /* Set STOP bit */
+        lp->a.write_csr(ioaddr, CSR0, CSR0_STOP);       /* Set STOP bit */
        /* Initialize Transmit buffers. */
        size = data_len + 15;
@@ -703,14 +937,15 @@ static int pcnet32_loopback_test(struct net_device *dev, uint64_t * data1)
                }
        }
-        x = a->read_bcr(ioaddr, 32);    /* set internal loopback in BSR32 */
+        x = a->read_bcr(ioaddr, 32);    /* set internal loopback in BCR32 */
-        x = x | 0x0002;
+        a->write_bcr(ioaddr, 32, x | 0x0002);
-        a->write_bcr(ioaddr, 32, x);
-        lp->a.write_csr(ioaddr, 15, 0x0044);    /* set int loopback in CSR15 */
+        /* set int loopback in CSR15 */
+        x = a->read_csr(ioaddr, CSR15) & 0xfffc;
+        lp->a.write_csr(ioaddr, CSR15, x | 0x0044);
        teststatus = le16_to_cpu(0x8000);
-        lp->a.write_csr(ioaddr, 0, 0x0002);     /* Set STRT bit */
+        lp->a.write_csr(ioaddr, CSR0, CSR0_START);      /* Set STRT bit */
        /* Check status of descriptors */
        for (x = 0; x < numbuffs; x++) {
@@ -718,7 +953,7 @@ static int pcnet32_loopback_test(struct net_device *dev, uint64_t * data1)
                rmb();
                while ((lp->rx_ring[x].status & teststatus) && (ticks < 200)) {
                        spin_unlock_irqrestore(&lp->lock, flags);
-                        mdelay(1);
+                        msleep(1);
                        spin_lock_irqsave(&lp->lock, flags);
                        rmb();
                        ticks++;
@@ -731,7 +966,7 @@ static int pcnet32_loopback_test(struct net_device *dev, uint64_t * data1)
                }
        }
-        lp->a.write_csr(ioaddr, 0, 0x0004);     /* Set STOP bit */
+        lp->a.write_csr(ioaddr, CSR0, CSR0_STOP);       /* Set STOP bit */
        wmb();
        if (netif_msg_hw(lp) && netif_msg_pktdata(lp)) {
                printk(KERN_DEBUG "%s: RX loopback packets:\n", dev->name);
@@ -764,25 +999,24 @@ static int pcnet32_loopback_test(struct net_device *dev, uint64_t * data1)
                }
                x++;
        }
-        if (!rc) {
-                *data1 = 0;
-        }
      clean_up:
+        *data1 = rc;
        pcnet32_purge_tx_ring(dev);
-        x = a->read_csr(ioaddr, 15) & 0xFFFF;
-        a->write_csr(ioaddr, 15, (x & ~0x0044));        /* reset bits 6 and 2 */
-        x = a->read_bcr(ioaddr, 32);    /* reset internal loopback */
+        x = a->read_csr(ioaddr, CSR15);
-        x = x & ~0x0002;
+        a->write_csr(ioaddr, CSR15, (x & ~0x0044));     /* reset bits 6 and 2 */
-        a->write_bcr(ioaddr, 32, x);
-        spin_unlock_irqrestore(&lp->lock, flags);
+        x = a->read_bcr(ioaddr, 32);    /* reset internal loopback */
+        a->write_bcr(ioaddr, 32, (x & ~0x0002));
        if (netif_running(dev)) {
+                spin_unlock_irqrestore(&lp->lock, flags);
                pcnet32_open(dev);
        } else {
+                pcnet32_purge_rx_ring(dev);
                lp->a.write_bcr(ioaddr, 20, 4); /* return to 16bit mode */
+                spin_unlock_irqrestore(&lp->lock, flags);
        }
        return (rc);
@@ -845,6 +1079,43 @@ static int pcnet32_phys_id(struct net_device *dev, u32 data)
        return 0;
 }
+/*
+ * lp->lock must be held.
+ */
+static int pcnet32_suspend(struct net_device *dev, unsigned long *flags,
+                int can_sleep)
+{
+        int csr5;
+        struct pcnet32_private *lp = dev->priv;
+        struct pcnet32_access *a = &lp->a;
+        ulong ioaddr = dev->base_addr;
+        int ticks;
+        /* set SUSPEND (SPND) - CSR5 bit 0 */
+        csr5 = a->read_csr(ioaddr, CSR5);
+        a->write_csr(ioaddr, CSR5, csr5 | CSR5_SUSPEND);
+        /* poll waiting for bit to be set */
+        ticks = 0;
+        while (!(a->read_csr(ioaddr, CSR5) & CSR5_SUSPEND)) {
+                spin_unlock_irqrestore(&lp->lock, *flags);
+                if (can_sleep)
+                        msleep(1);
+                else
+                        mdelay(1);
+                spin_lock_irqsave(&lp->lock, *flags);
+                ticks++;
+                if (ticks > 200) {
+                        if (netif_msg_hw(lp))
+                                printk(KERN_DEBUG
+                                       "%s: Error getting into suspend!\n",
+                                       dev->name);
+                        return 0;
+                }
+        }
+        return 1;
+}
 #define PCNET32_REGS_PER_PHY    32
 #define PCNET32_MAX_PHYS        32
 static int pcnet32_get_regs_len(struct net_device *dev)
@@ -863,32 +1134,13 @@ static void pcnet32_get_regs(struct net_device *dev, struct ethtool_regs *regs,
        struct pcnet32_private *lp = dev->priv;
        struct pcnet32_access *a = &lp->a;
        ulong ioaddr = dev->base_addr;
-        int ticks;
        unsigned long flags;
        spin_lock_irqsave(&lp->lock, flags);
-        csr0 = a->read_csr(ioaddr, 0);
+        csr0 = a->read_csr(ioaddr, CSR0);
-        if (!(csr0 & 0x0004)) { /* If not stopped */
+        if (!(csr0 & CSR0_STOP))        /* If not stopped */
-                /* set SUSPEND (SPND) - CSR5 bit 0 */
+                pcnet32_suspend(dev, &flags, 1);
-                a->write_csr(ioaddr, 5, 0x0001);
-                /* poll waiting for bit to be set */
-                ticks = 0;
-                while (!(a->read_csr(ioaddr, 5) & 0x0001)) {
-                        spin_unlock_irqrestore(&lp->lock, flags);
-                        mdelay(1);
-                        spin_lock_irqsave(&lp->lock, flags);
-                        ticks++;
-                        if (ticks > 200) {
-                                if (netif_msg_hw(lp))
-                                        printk(KERN_DEBUG
-                                               "%s: Error getting into suspend!\n",
-                                               dev->name);
-                                break;
-                        }
-                }
-        }
        /* read address PROM */
        for (i = 0; i < 16; i += 2)
@@ -925,9 +1177,12 @@ static void pcnet32_get_regs(struct net_device *dev, struct ethtool_regs *regs,
                }
        }
-        if (!(csr0 & 0x0004)) { /* If not stopped */
+        if (!(csr0 & CSR0_STOP)) {      /* If not stopped */
+                int csr5;
                /* clear SUSPEND (SPND) - CSR5 bit 0 */
-                a->write_csr(ioaddr, 5, 0x0000);
+                csr5 = a->read_csr(ioaddr, CSR5);
+                a->write_csr(ioaddr, CSR5, csr5 & (~CSR5_SUSPEND));
        }
        spin_unlock_irqrestore(&lp->lock, flags);
@@ -958,7 +1213,7 @@ static struct ethtool_ops pcnet32_ethtool_ops = {
 /* only probes for non-PCI devices, the rest are handled by
 * pci_register_driver via pcnet32_probe_pci */
-static void __devinit pcnet32_probe_vlbus(void)
+static void __devinit pcnet32_probe_vlbus(unsigned int *pcnet32_portlist)
 {
        unsigned int *port, ioaddr;
@@ -1442,7 +1697,7 @@ static int pcnet32_alloc_ring(struct net_device *dev, char *name)
                                           lp->tx_ring_size,
                                           &lp->tx_ring_dma_addr);
        if (lp->tx_ring == NULL) {
-                if (pcnet32_debug & NETIF_MSG_DRV)
+                if (netif_msg_drv(lp))
                        printk("\n" KERN_ERR PFX
                               "%s: Consistent memory allocation failed.\n",
                               name);
@@ -1454,52 +1709,48 @@ static int pcnet32_alloc_ring(struct net_device *dev, char *name)
                                           lp->rx_ring_size,
                                           &lp->rx_ring_dma_addr);
        if (lp->rx_ring == NULL) {
-                if (pcnet32_debug & NETIF_MSG_DRV)
+                if (netif_msg_drv(lp))
                        printk("\n" KERN_ERR PFX
                               "%s: Consistent memory allocation failed.\n",
                               name);
                return -ENOMEM;
        }
-        lp->tx_dma_addr = kmalloc(sizeof(dma_addr_t) * lp->tx_ring_size,
+        lp->tx_dma_addr = kcalloc(lp->tx_ring_size, sizeof(dma_addr_t),
                                  GFP_ATOMIC);
        if (!lp->tx_dma_addr) {
-                if (pcnet32_debug & NETIF_MSG_DRV)
+                if (netif_msg_drv(lp))
                        printk("\n" KERN_ERR PFX
                               "%s: Memory allocation failed.\n", name);
                return -ENOMEM;
        }
-        memset(lp->tx_dma_addr, 0, sizeof(dma_addr_t) * lp->tx_ring_size);
-        lp->rx_dma_addr = kmalloc(sizeof(dma_addr_t) * lp->rx_ring_size,
+        lp->rx_dma_addr = kcalloc(lp->rx_ring_size, sizeof(dma_addr_t),
                                  GFP_ATOMIC);
        if (!lp->rx_dma_addr) {
-                if (pcnet32_debug & NETIF_MSG_DRV)
+                if (netif_msg_drv(lp))
                        printk("\n" KERN_ERR PFX
                               "%s: Memory allocation failed.\n", name);
                return -ENOMEM;
        }
-        memset(lp->rx_dma_addr, 0, sizeof(dma_addr_t) * lp->rx_ring_size);
-        lp->tx_skbuff = kmalloc(sizeof(struct sk_buff *) * lp->tx_ring_size,
+        lp->tx_skbuff = kcalloc(lp->tx_ring_size, sizeof(struct sk_buff *),
                                GFP_ATOMIC);
        if (!lp->tx_skbuff) {
-                if (pcnet32_debug & NETIF_MSG_DRV)
+                if (netif_msg_drv(lp))
                        printk("\n" KERN_ERR PFX
                               "%s: Memory allocation failed.\n", name);
                return -ENOMEM;
        }
-        memset(lp->tx_skbuff, 0, sizeof(struct sk_buff *) * lp->tx_ring_size);
-        lp->rx_skbuff = kmalloc(sizeof(struct sk_buff *) * lp->rx_ring_size,
+        lp->rx_skbuff = kcalloc(lp->rx_ring_size, sizeof(struct sk_buff *),
                                GFP_ATOMIC);
        if (!lp->rx_skbuff) {
-                if (pcnet32_debug & NETIF_MSG_DRV)
+                if (netif_msg_drv(lp))
                        printk("\n" KERN_ERR PFX
                               "%s: Memory allocation failed.\n", name);
                return -ENOMEM;
        }
-        memset(lp->rx_skbuff, 0, sizeof(struct sk_buff *) * lp->rx_ring_size);
        return 0;
 }
@@ -1547,7 +1798,7 @@ static int pcnet32_open(struct net_device *dev)
        unsigned long flags;
        if (request_irq(dev->irq, &pcnet32_interrupt,
-                        lp->shared_irq ? SA_SHIRQ : 0, dev->name,
+                        lp->shared_irq ? IRQF_SHARED : 0, dev->name,
                        (void *)dev)) {
                return -EAGAIN;
        }
@@ -1763,16 +2014,7 @@ static int pcnet32_open(struct net_device *dev)
      err_free_ring:
        /* free any allocated skbuffs */
-        for (i = 0; i < lp->rx_ring_size; i++) {
+        pcnet32_purge_rx_ring(dev);
-                lp->rx_ring[i].status = 0;
-                if (lp->rx_skbuff[i]) {
-                        pci_unmap_single(lp->pci_dev, lp->rx_dma_addr[i],
-                                         PKT_BUF_SZ - 2, PCI_DMA_FROMDEVICE);
-                        dev_kfree_skb(lp->rx_skbuff[i]);
-                }
-                lp->rx_skbuff[i] = NULL;
-                lp->rx_dma_addr[i] = 0;
-        }
        /*
         * Switch back to 16bit mode to avoid problems with dumb
@@ -2354,7 +2596,6 @@ static int pcnet32_close(struct net_device *dev)
 {
        unsigned long ioaddr = dev->base_addr;
        struct pcnet32_private *lp = dev->priv;
-        int i;
        unsigned long flags;
        del_timer_sync(&lp->watchdog_timer);
@@ -2385,31 +2626,8 @@ static int pcnet32_close(struct net_device *dev)
        spin_lock_irqsave(&lp->lock, flags);
-        /* free all allocated skbuffs */
+        pcnet32_purge_rx_ring(dev);
-        for (i = 0; i < lp->rx_ring_size; i++) {
+        pcnet32_purge_tx_ring(dev);
-                lp->rx_ring[i].status = 0;
-                wmb();          /* Make sure adapter sees owner change */
-                if (lp->rx_skbuff[i]) {
-                        pci_unmap_single(lp->pci_dev, lp->rx_dma_addr[i],
-                                         PKT_BUF_SZ - 2, PCI_DMA_FROMDEVICE);
-                        dev_kfree_skb(lp->rx_skbuff[i]);
-                }
-                lp->rx_skbuff[i] = NULL;
-                lp->rx_dma_addr[i] = 0;
-        }
-        for (i = 0; i < lp->tx_ring_size; i++) {
-                lp->tx_ring[i].status = 0;      /* CPU owns buffer */
-                wmb();          /* Make sure adapter sees owner change */
-                if (lp->tx_skbuff[i]) {
-                        pci_unmap_single(lp->pci_dev, lp->tx_dma_addr[i],
-                                         lp->tx_skbuff[i]->len,
-                                         PCI_DMA_TODEVICE);
-                        dev_kfree_skb(lp->tx_skbuff[i]);
-                }
-                lp->tx_skbuff[i] = NULL;
-                lp->tx_dma_addr[i] = 0;
-        }
        spin_unlock_irqrestore(&lp->lock, flags);
@@ -2439,6 +2657,7 @@ static void pcnet32_load_multicast(struct net_device *dev)
        volatile struct pcnet32_init_block *ib = &lp->init_block;
        volatile u16 *mcast_table = (u16 *) & ib->filter;
        struct dev_mc_list *dmi = dev->mc_list;
+        unsigned long ioaddr = dev->base_addr;
        char *addrs;
        int i;
        u32 crc;
@@ -2447,6 +2666,10 @@ static void pcnet32_load_multicast(struct net_device *dev)
        if (dev->flags & IFF_ALLMULTI) {
                ib->filter[0] = 0xffffffff;
                ib->filter[1] = 0xffffffff;
+                lp->a.write_csr(ioaddr, PCNET32_MC_FILTER, 0xffff);
+                lp->a.write_csr(ioaddr, PCNET32_MC_FILTER+1, 0xffff);
+                lp->a.write_csr(ioaddr, PCNET32_MC_FILTER+2, 0xffff);
+                lp->a.write_csr(ioaddr, PCNET32_MC_FILTER+3, 0xffff);
                return;
        }
        /* clear the multicast filter */
@@ -2468,6 +2691,9 @@ static void pcnet32_load_multicast(struct net_device *dev)
                    le16_to_cpu(le16_to_cpu(mcast_table[crc >> 4]) |
                                (1 << (crc & 0xf)));
        }
+        for (i = 0; i < 4; i++)
+                lp->a.write_csr(ioaddr, PCNET32_MC_FILTER + i,
+                                le16_to_cpu(mcast_table[i]));
        return;
 }
@@ -2478,8 +2704,11 @@ static void pcnet32_set_multicast_list(struct net_device *dev)
 {
        unsigned long ioaddr = dev->base_addr, flags;
        struct pcnet32_private *lp = dev->priv;
+        int csr15, suspended;
        spin_lock_irqsave(&lp->lock, flags);
+        suspended = pcnet32_suspend(dev, &flags, 0);
+        csr15 = lp->a.read_csr(ioaddr, CSR15);
        if (dev->flags & IFF_PROMISC) {
                /* Log any net taps. */
                if (netif_msg_hw(lp))
@@ -2488,15 +2717,24 @@ static void pcnet32_set_multicast_list(struct net_device *dev)
                lp->init_block.mode =
                    le16_to_cpu(0x8000 | (lp->options & PCNET32_PORT_PORTSEL) <<
                                7);
+                lp->a.write_csr(ioaddr, CSR15, csr15 | 0x8000);
        } else {
                lp->init_block.mode =
                    le16_to_cpu((lp->options & PCNET32_PORT_PORTSEL) << 7);
+                lp->a.write_csr(ioaddr, CSR15, csr15 & 0x7fff);
                pcnet32_load_multicast(dev);
        }
-        lp->a.write_csr(ioaddr, 0, 0x0004);     /* Temporarily stop the lance. */
+        if (suspended) {
-        pcnet32_restart(dev, 0x0042);   /*  Resume normal operation */
+                int csr5;
-        netif_wake_queue(dev);
+                /* clear SUSPEND (SPND) - CSR5 bit 0 */
+                csr5 = lp->a.read_csr(ioaddr, CSR5);
+                lp->a.write_csr(ioaddr, CSR5, csr5 & (~CSR5_SUSPEND));
+        } else { 
+                lp->a.write_csr(ioaddr, CSR0, CSR0_STOP);
+                pcnet32_restart(dev, CSR0_NORMAL);
+                netif_wake_queue(dev);
+        }
        spin_unlock_irqrestore(&lp->lock, flags);
 }
@@ -2736,7 +2974,7 @@ static int __init pcnet32_init_module(void)
        /* should we find any remaining VLbus devices ? */
        if (pcnet32vlb)
-                pcnet32_probe_vlbus();
+                pcnet32_probe_vlbus(pcnet32_portlist);
        if (cards_found && (pcnet32_debug & NETIF_MSG_PROBE))
                printk(KERN_INFO PFX "%d cards_found.\n", cards_found);
diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
index cda3e53d6917..2ba6d3a40e2e 100644
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -44,6 +44,11 @@ config CICADA_PHY
        depends on PHYLIB
        ---help---
          Currently supports the cis8204
+config VITESSE_PHY
+        tristate "Drivers for the Vitesse PHYs"
+        depends on PHYLIB
+        ---help---
+          Currently supports the vsc8244
 config SMSC_PHY
        tristate "Drivers for SMSC PHYs"
diff --git a/drivers/net/phy/Makefile b/drivers/net/phy/Makefile
index d9614134cc06..a00e61942525 100644
--- a/drivers/net/phy/Makefile
+++ b/drivers/net/phy/Makefile
@@ -9,3 +9,4 @@ obj-$(CONFIG_CICADA_PHY)	+= cicada.o
 obj-$(CONFIG_LXT_PHY)           += lxt.o
 obj-$(CONFIG_QSEMI_PHY)         += qsemi.o
 obj-$(CONFIG_SMSC_PHY)          += smsc.o
+obj-$(CONFIG_VITESSE_PHY)       += vitesse.o
diff --git a/drivers/net/phy/cicada.c b/drivers/net/phy/cicada.c
index 7d8d534255c0..ae60e6e4107c 100644
--- a/drivers/net/phy/cicada.c
+++ b/drivers/net/phy/cicada.c
@@ -13,7 +13,6 @@
 * option) any later version.
 *
 */
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/string.h>
@@ -104,7 +103,22 @@ static int cis820x_config_intr(struct phy_device *phydev)
        return err;
 }
-/* Cicada 820x */
+/* Cicada 8201, a.k.a Vitesse VSC8201 */
+static struct phy_driver cis8201_driver = {
+        .phy_id         = 0x000fc410,
+        .name           = "Cicada Cis8201",
+        .phy_id_mask    = 0x000ffff0,
+        .features       = PHY_GBIT_FEATURES,
+        .flags          = PHY_HAS_INTERRUPT,
+        .config_init    = &cis820x_config_init,
+        .config_aneg    = &genphy_config_aneg,
+        .read_status    = &genphy_read_status,
+        .ack_interrupt  = &cis820x_ack_interrupt,
+        .config_intr    = &cis820x_config_intr,
+        .driver         = { .owner = THIS_MODULE,},
+};
+/* Cicada 8204 */
 static struct phy_driver cis8204_driver = {
        .phy_id         = 0x000fc440,
        .name           = "Cicada Cis8204",
@@ -119,15 +133,30 @@ static struct phy_driver cis8204_driver = {
        .driver         = { .owner = THIS_MODULE,},
 };
-static int __init cis8204_init(void)
+static int __init cicada_init(void)
 {
-        return phy_driver_register(&cis8204_driver);
+        int ret;
+        ret = phy_driver_register(&cis8204_driver);
+        if (ret)
+                goto err1;
+        ret = phy_driver_register(&cis8201_driver);
+        if (ret)
+                goto err2;
+        return 0;
+err2:
+        phy_driver_unregister(&cis8204_driver);
+err1:
+        return ret;
 }
-static void __exit cis8204_exit(void)
+static void __exit cicada_exit(void)
 {
        phy_driver_unregister(&cis8204_driver);
+        phy_driver_unregister(&cis8201_driver);
 }
-module_init(cis8204_init);
+module_init(cicada_init);
-module_exit(cis8204_exit);
+module_exit(cicada_exit);
diff --git a/drivers/net/phy/davicom.c b/drivers/net/phy/davicom.c
index 5e9002e444c5..aa7983f55838 100644
--- a/drivers/net/phy/davicom.c
+++ b/drivers/net/phy/davicom.c
@@ -13,7 +13,6 @@
 * option) any later version.
 *
 */
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/string.h>
diff --git a/drivers/net/phy/lxt.c b/drivers/net/phy/lxt.c
index bef79e454c33..69d2325f848c 100644
--- a/drivers/net/phy/lxt.c
+++ b/drivers/net/phy/lxt.c
@@ -13,7 +13,6 @@
 * option) any later version.
 *
 */
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/string.h>
@@ -123,9 +122,9 @@ static int lxt971_config_intr(struct phy_device *phydev)
 }
 static struct phy_driver lxt970_driver = {
-        .phy_id         = 0x07810000,
+        .phy_id         = 0x78100000,
        .name           = "LXT970",
-        .phy_id_mask    = 0x0fffffff,
+        .phy_id_mask    = 0xfffffff0,
        .features       = PHY_BASIC_FEATURES,
        .flags          = PHY_HAS_INTERRUPT,
        .config_init    = lxt970_config_init,
@@ -137,9 +136,9 @@ static struct phy_driver lxt970_driver = {
 };
 static struct phy_driver lxt971_driver = {
-        .phy_id         = 0x0001378e,
+        .phy_id         = 0x001378e0,
        .name           = "LXT971",
-        .phy_id_mask    = 0x0fffffff,
+        .phy_id_mask    = 0xfffffff0,
        .features       = PHY_BASIC_FEATURES,
        .flags          = PHY_HAS_INTERRUPT,
        .config_aneg    = genphy_config_aneg,
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index a2d6386d13bc..0ad253282d0d 100644
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -13,7 +13,6 @@
 * option) any later version.
 *
 */
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/string.h>
diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c
index 1b236bdf6b92..1dde390c164d 100644
--- a/drivers/net/phy/mdio_bus.c
+++ b/drivers/net/phy/mdio_bus.c
@@ -13,7 +13,6 @@
 * option) any later version.
 *
 */
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/string.h>
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 33cec2dab942..7d5c2233c252 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -14,7 +14,6 @@
 * option) any later version.
 *
 */
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/string.h>
@@ -557,7 +556,7 @@ int phy_start_interrupts(struct phy_device *phydev)
        INIT_WORK(&phydev->phy_queue, phy_change, phydev);
        if (request_irq(phydev->irq, phy_interrupt,
-                                SA_SHIRQ,
+                                IRQF_SHARED,
                                "phy_interrupt",
                                phydev) < 0) {
                printk(KERN_WARNING "%s: Can't get IRQ %d (PHY)\n",
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index 7da0e3dd5fe3..1bc1e032c5d6 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -14,7 +14,6 @@
 * option) any later version.
 *
 */
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/string.h>
diff --git a/drivers/net/phy/qsemi.c b/drivers/net/phy/qsemi.c
index 65d995b02b25..2b50e1739aa5 100644
--- a/drivers/net/phy/qsemi.c
+++ b/drivers/net/phy/qsemi.c
@@ -13,7 +13,6 @@
 * option) any later version.
 *
 */
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/string.h>
diff --git a/drivers/net/phy/vitesse.c b/drivers/net/phy/vitesse.c
new file mode 100644
index 000000000000..ffd215d9a9be
--- /dev/null
+++ b/drivers/net/phy/vitesse.c
@@ -0,0 +1,112 @@
+/*
+ * Driver for Vitesse PHYs
+ *
+ * Author: Kriston Carson
+ *
+ * Copyright (c) 2005 Freescale Semiconductor, Inc.
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ *
+ */
+#include <linux/config.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/mii.h>
+#include <linux/ethtool.h>
+#include <linux/phy.h>
+/* Vitesse Extended Control Register 1 */
+#define MII_VSC8244_EXT_CON1           0x17
+#define MII_VSC8244_EXTCON1_INIT       0x0000
+/* Vitesse Interrupt Mask Register */
+#define MII_VSC8244_IMASK               0x19
+#define MII_VSC8244_IMASK_IEN           0x8000
+#define MII_VSC8244_IMASK_SPEED         0x4000
+#define MII_VSC8244_IMASK_LINK          0x2000
+#define MII_VSC8244_IMASK_DUPLEX        0x1000
+#define MII_VSC8244_IMASK_MASK          0xf000
+/* Vitesse Interrupt Status Register */
+#define MII_VSC8244_ISTAT               0x1a
+#define MII_VSC8244_ISTAT_STATUS        0x8000
+#define MII_VSC8244_ISTAT_SPEED         0x4000
+#define MII_VSC8244_ISTAT_LINK          0x2000
+#define MII_VSC8244_ISTAT_DUPLEX        0x1000
+/* Vitesse Auxiliary Control/Status Register */
+#define MII_VSC8244_AUX_CONSTAT         0x1c
+#define MII_VSC8244_AUXCONSTAT_INIT     0x0004
+#define MII_VSC8244_AUXCONSTAT_DUPLEX   0x0020
+#define MII_VSC8244_AUXCONSTAT_SPEED    0x0018
+#define MII_VSC8244_AUXCONSTAT_GBIT     0x0010
+#define MII_VSC8244_AUXCONSTAT_100      0x0008
+MODULE_DESCRIPTION("Vitesse PHY driver");
+MODULE_AUTHOR("Kriston Carson");
+MODULE_LICENSE("GPL");
+static int vsc824x_config_init(struct phy_device *phydev)
+{
+        int err;
+        err = phy_write(phydev, MII_VSC8244_AUX_CONSTAT,
+                        MII_VSC8244_AUXCONSTAT_INIT);
+        if (err < 0)
+                return err;
+        err = phy_write(phydev, MII_VSC8244_EXT_CON1,
+                        MII_VSC8244_EXTCON1_INIT);
+        return err;
+}
+static int vsc824x_ack_interrupt(struct phy_device *phydev)
+{
+        int err = phy_read(phydev, MII_VSC8244_ISTAT);
+        return (err < 0) ? err : 0;
+}
+static int vsc824x_config_intr(struct phy_device *phydev)
+{
+        int err;
+        if (phydev->interrupts == PHY_INTERRUPT_ENABLED)
+                err = phy_write(phydev, MII_VSC8244_IMASK,
+                                MII_VSC8244_IMASK_MASK);
+        else
+                err = phy_write(phydev, MII_VSC8244_IMASK, 0);
+        return err;
+}
+/* Vitesse 824x */
+static struct phy_driver vsc8244_driver = {
+        .phy_id         = 0x000fc6c2,
+        .name           = "Vitesse VSC8244",
+        .phy_id_mask    = 0x000fffc0,
+        .features       = PHY_GBIT_FEATURES,
+        .flags          = PHY_HAS_INTERRUPT,
+        .config_init    = &vsc824x_config_init,
+        .config_aneg    = &genphy_config_aneg,
+        .read_status    = &genphy_read_status,
+        .ack_interrupt  = &vsc824x_ack_interrupt,
+        .config_intr    = &vsc824x_config_intr,
+        .driver         = { .owner = THIS_MODULE,},
+};
+static int __init vsc8244_init(void)
+{
+        return phy_driver_register(&vsc8244_driver);
+}
+static void __exit vsc8244_exit(void)
+{
+        phy_driver_unregister(&vsc8244_driver);
+}
+module_init(vsc8244_init);
+module_exit(vsc8244_exit);
diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c
index 01cd8ec751ea..0ec6e9d57b94 100644
--- a/drivers/net/ppp_generic.c
+++ b/drivers/net/ppp_generic.c
@@ -22,13 +22,11 @@
 * ==FILEVERSION 20041108==
 */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/kmod.h>
 #include <linux/init.h>
 #include <linux/list.h>
-#include <linux/devfs_fs_kernel.h>
 #include <linux/netdevice.h>
 #include <linux/poll.h>
 #include <linux/ppp_defs.h>
@@ -863,10 +861,6 @@ static int __init ppp_init(void)
                        goto out_chrdev;
                }
                class_device_create(ppp_class, NULL, MKDEV(PPP_MAJOR, 0), NULL, "ppp");
-                err = devfs_mk_cdev(MKDEV(PPP_MAJOR, 0),
-                                S_IFCHR|S_IRUSR|S_IWUSR, "ppp");
-                if (err)
-                        goto out_class;
        }
 out:
@@ -874,9 +868,6 @@ out:
                printk(KERN_ERR "failed to register PPP device (%d)\n", err);
        return err;
-out_class:
-        class_device_destroy(ppp_class, MKDEV(PPP_MAJOR,0));
-        class_destroy(ppp_class);
 out_chrdev:
        unregister_chrdev(PPP_MAJOR, "ppp");
        goto out;
@@ -2578,8 +2569,7 @@ ppp_find_channel(int unit)
        list_for_each_entry(pch, &new_channels, list) {
                if (pch->file.index == unit) {
-                        list_del(&pch->list);
+                        list_move(&pch->list, &all_channels);
-                        list_add(&pch->list, &all_channels);
                        return pch;
                }
        }
@@ -2682,7 +2672,6 @@ static void __exit ppp_cleanup(void)
        cardmap_destroy(&all_ppp_units);
        if (unregister_chrdev(PPP_MAJOR, "ppp") != 0)
                printk(KERN_ERR "PPP: failed to unregister PPP device\n");
-        devfs_remove("ppp");
        class_device_destroy(ppp_class, MKDEV(PPP_MAJOR, 0));
        class_destroy(ppp_class);
 }
diff --git a/drivers/net/ppp_mppe.c b/drivers/net/ppp_mppe.c
index 1985d1b57c45..51ff9a9d1bb5 100644
--- a/drivers/net/ppp_mppe.c
+++ b/drivers/net/ppp_mppe.c
@@ -43,7 +43,6 @@
 *                    deprecated in 2.6
 */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/version.h>
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index 9945cc6b8d90..4c2f575faad7 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -1406,7 +1406,7 @@ rtl8169_init_board(struct pci_dev *pdev, struct net_device **dev_out,
        dev = alloc_etherdev(sizeof (*tp));
        if (dev == NULL) {
                if (netif_msg_drv(&debug))
-                        printk(KERN_ERR PFX "unable to alloc new ethernet\n");
+                        dev_err(&pdev->dev, "unable to alloc new ethernet\n");
                goto err_out;
        }
@@ -1418,10 +1418,8 @@ rtl8169_init_board(struct pci_dev *pdev, struct net_device **dev_out,
        /* enable device (incl. PCI PM wakeup and hotplug setup) */
        rc = pci_enable_device(pdev);
        if (rc < 0) {
-                if (netif_msg_probe(tp)) {
+                if (netif_msg_probe(tp))
-                        printk(KERN_ERR PFX "%s: enable failure\n",
+                        dev_err(&pdev->dev, "enable failure\n");
-                               pci_name(pdev));
-                }
                goto err_out_free_dev;
        }
@@ -1437,37 +1435,32 @@ rtl8169_init_board(struct pci_dev *pdev, struct net_device **dev_out,
                pci_read_config_word(pdev, pm_cap + PCI_PM_CTRL, &pwr_command);
                acpi_idle_state = pwr_command & PCI_PM_CTRL_STATE_MASK;
        } else {
-                if (netif_msg_probe(tp)) {
+                if (netif_msg_probe(tp))
-                        printk(KERN_ERR PFX
+                        dev_err(&pdev->dev,
                               "PowerManagement capability not found.\n");
-                }
        }
        /* make sure PCI base addr 1 is MMIO */
        if (!(pci_resource_flags(pdev, 1) & IORESOURCE_MEM)) {
-                if (netif_msg_probe(tp)) {
+                if (netif_msg_probe(tp))
-                        printk(KERN_ERR PFX
+                        dev_err(&pdev->dev,
                               "region #1 not an MMIO resource, aborting\n");
-                }
                rc = -ENODEV;
                goto err_out_mwi;
        }
        /* check for weird/broken PCI region reporting */
        if (pci_resource_len(pdev, 1) < R8169_REGS_SIZE) {
-                if (netif_msg_probe(tp)) {
+                if (netif_msg_probe(tp))
-                        printk(KERN_ERR PFX
+                        dev_err(&pdev->dev,
                               "Invalid PCI region size(s), aborting\n");
-                }
                rc = -ENODEV;
                goto err_out_mwi;
        }
        rc = pci_request_regions(pdev, MODULENAME);
        if (rc < 0) {
-                if (netif_msg_probe(tp)) {
+                if (netif_msg_probe(tp))
-                        printk(KERN_ERR PFX "%s: could not request regions.\n",
+                        dev_err(&pdev->dev, "could not request regions.\n");
-                               pci_name(pdev));
-                }
                goto err_out_mwi;
        }
@@ -1480,10 +1473,9 @@ rtl8169_init_board(struct pci_dev *pdev, struct net_device **dev_out,
        } else {
                rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
                if (rc < 0) {
-                        if (netif_msg_probe(tp)) {
+                        if (netif_msg_probe(tp))
-                                printk(KERN_ERR PFX
+                                dev_err(&pdev->dev,
                                       "DMA configuration failed.\n");
-                        }
                        goto err_out_free_res;
                }
        }
@@ -1494,7 +1486,7 @@ rtl8169_init_board(struct pci_dev *pdev, struct net_device **dev_out,
        ioaddr = ioremap(pci_resource_start(pdev, 1), R8169_REGS_SIZE);
        if (ioaddr == NULL) {
                if (netif_msg_probe(tp))
-                        printk(KERN_ERR PFX "cannot remap MMIO, aborting\n");
+                        dev_err(&pdev->dev, "cannot remap MMIO, aborting\n");
                rc = -EIO;
                goto err_out_free_res;
        }
@@ -1526,9 +1518,9 @@ rtl8169_init_board(struct pci_dev *pdev, struct net_device **dev_out,
        if (i < 0) {
                /* Unknown chip: assume array element #0, original RTL-8169 */
                if (netif_msg_probe(tp)) {
-                        printk(KERN_DEBUG PFX "PCI device %s: "
+                        dev_printk(KERN_DEBUG, &pdev->dev,
                               "unknown chip version, assuming %s\n",
-                               pci_name(pdev), rtl_chip_info[0].name);
+                               rtl_chip_info[0].name);
                }
                i++;
        }
@@ -1726,7 +1718,7 @@ static int rtl8169_open(struct net_device *dev)
        rtl8169_set_rxbufsize(tp, dev);
        retval =
-            request_irq(dev->irq, rtl8169_interrupt, SA_SHIRQ, dev->name, dev);
+            request_irq(dev->irq, rtl8169_interrupt, IRQF_SHARED, dev->name, dev);
        if (retval < 0)
                goto out;
@@ -2172,7 +2164,7 @@ static int rtl8169_xmit_frags(struct rtl8169_private *tp, struct sk_buff *skb,
 static inline u32 rtl8169_tso_csum(struct sk_buff *skb, struct net_device *dev)
 {
        if (dev->features & NETIF_F_TSO) {
-                u32 mss = skb_shinfo(skb)->tso_size;
+                u32 mss = skb_shinfo(skb)->gso_size;
                if (mss)
                        return LargeSend | ((mss & MSSMask) << MSSShift);
@@ -2222,8 +2214,7 @@ static int rtl8169_start_xmit(struct sk_buff *skb, struct net_device *dev)
                len = skb->len;
                if (unlikely(len < ETH_ZLEN)) {
-                        skb = skb_padto(skb, ETH_ZLEN);
+                        if (skb_padto(skb, ETH_ZLEN))
-                        if (!skb)
                                goto err_update_stats;
                        len = ETH_ZLEN;
                }
diff --git a/drivers/net/rrunner.c b/drivers/net/rrunner.c
index 19c2df9c86fe..c3ed734cbe39 100644
--- a/drivers/net/rrunner.c
+++ b/drivers/net/rrunner.c
@@ -28,7 +28,6 @@
 #define RX_DMA_SKBUFF 1
 #define PKT_COPY_THRESHOLD 512
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/errno.h>
@@ -1253,7 +1252,7 @@ static int rr_open(struct net_device *dev)
        readl(&regs->HostCtrl);
        spin_unlock_irqrestore(&rrpriv->lock, flags);
-        if (request_irq(dev->irq, rr_interrupt, SA_SHIRQ, dev->name, dev)) {
+        if (request_irq(dev->irq, rr_interrupt, IRQF_SHARED, dev->name, dev)) {
                printk(KERN_WARNING "%s: Requested IRQ %d is busy\n",
                       dev->name, dev->irq);
                ecode = -EAGAIN;
diff --git a/drivers/net/rrunner.h b/drivers/net/rrunner.h
index 10baae55953a..2c3c91ebd99f 100644
--- a/drivers/net/rrunner.h
+++ b/drivers/net/rrunner.h
@@ -1,7 +1,6 @@
 #ifndef _RRUNNER_H_
 #define _RRUNNER_H_
-#include <linux/config.h>
 #include <linux/interrupt.h>
 #if ((BITS_PER_LONG != 32) && (BITS_PER_LONG != 64))
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index 11daed495b97..c6b77acb35ef 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -44,7 +44,6 @@
 *     aggregated as a single large packet
 ************************************************************************/
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/errno.h>
@@ -3762,7 +3761,7 @@ static int s2io_open(struct net_device *dev)
        /* After proper initialization of H/W, register ISR */
        if (sp->intr_type == MSI) {
                err = request_irq((int) sp->pdev->irq, s2io_msi_handle, 
-                        SA_SHIRQ, sp->name, dev);
+                        IRQF_SHARED, sp->name, dev);
                if (err) {
                        DBG_PRINT(ERR_DBG, "%s: MSI registration \
 failed\n", dev->name);
@@ -3800,7 +3799,7 @@ failed\n", dev->name, i);
                }
        }
        if (sp->intr_type == INTA) {
-                err = request_irq((int) sp->pdev->irq, s2io_isr, SA_SHIRQ,
+                err = request_irq((int) sp->pdev->irq, s2io_isr, IRQF_SHARED,
                                sp->name, dev);
                if (err) {
                        DBG_PRINT(ERR_DBG, "%s: ISR registration failed\n",
@@ -3959,8 +3958,8 @@ static int s2io_xmit(struct sk_buff *skb, struct net_device *dev)
        txdp->Control_1 = 0;
        txdp->Control_2 = 0;
 #ifdef NETIF_F_TSO
-        mss = skb_shinfo(skb)->tso_size;
+        mss = skb_shinfo(skb)->gso_size;
-        if (mss) {
+        if (skb_shinfo(skb)->gso_type & (SKB_GSO_TCPV4 | SKB_GSO_TCPV6)) {
                txdp->Control_1 |= TXD_TCP_LSO_EN;
                txdp->Control_1 |= TXD_TCP_LSO_MSS(mss);
        }
@@ -3980,10 +3979,10 @@ static int s2io_xmit(struct sk_buff *skb, struct net_device *dev)
        }
        frg_len = skb->len - skb->data_len;
-        if (skb_shinfo(skb)->ufo_size) {
+        if (skb_shinfo(skb)->gso_type == SKB_GSO_UDP) {
                int ufo_size;
-                ufo_size = skb_shinfo(skb)->ufo_size;
+                ufo_size = skb_shinfo(skb)->gso_size;
                ufo_size &= ~7;
                txdp->Control_1 |= TXD_UFO_EN;
                txdp->Control_1 |= TXD_UFO_MSS(ufo_size);
@@ -4009,7 +4008,7 @@ static int s2io_xmit(struct sk_buff *skb, struct net_device *dev)
        txdp->Host_Control = (unsigned long) skb;
        txdp->Control_1 |= TXD_BUFFER0_SIZE(frg_len);
-        if (skb_shinfo(skb)->ufo_size)
+        if (skb_shinfo(skb)->gso_type == SKB_GSO_UDP)
                txdp->Control_1 |= TXD_UFO_EN;
        frg_cnt = skb_shinfo(skb)->nr_frags;
@@ -4024,12 +4023,12 @@ static int s2io_xmit(struct sk_buff *skb, struct net_device *dev)
                    (sp->pdev, frag->page, frag->page_offset,
                     frag->size, PCI_DMA_TODEVICE);
                txdp->Control_1 = TXD_BUFFER0_SIZE(frag->size);
-                if (skb_shinfo(skb)->ufo_size)
+                if (skb_shinfo(skb)->gso_type == SKB_GSO_UDP)
                        txdp->Control_1 |= TXD_UFO_EN;
        }
        txdp->Control_1 |= TXD_GATHER_CODE_LAST;
-        if (skb_shinfo(skb)->ufo_size)
+        if (skb_shinfo(skb)->gso_type == SKB_GSO_UDP)
                frg_cnt++; /* as Txd0 was used for inband header */
        tx_fifo = mac_control->tx_FIFO_start[queue];
@@ -4043,7 +4042,7 @@ static int s2io_xmit(struct sk_buff *skb, struct net_device *dev)
        if (mss)
                val64 |= TX_FIFO_SPECIAL_FUNC;
 #endif
-        if (skb_shinfo(skb)->ufo_size)
+        if (skb_shinfo(skb)->gso_type == SKB_GSO_UDP)
                val64 |= TX_FIFO_SPECIAL_FUNC;
        writeq(val64, &tx_fifo->List_Control);
@@ -7021,6 +7020,9 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)
 #ifdef NETIF_F_TSO
        dev->features |= NETIF_F_TSO;
 #endif
+#ifdef NETIF_F_TSO6
+        dev->features |= NETIF_F_TSO6;
+#endif
        if (sp->device_type & XFRAME_II_DEVICE) {
                dev->features |= NETIF_F_UFO;
                dev->features |= NETIF_F_HW_CSUM;
diff --git a/drivers/net/s2io.h b/drivers/net/s2io.h
index 3203732a668d..c43f52179708 100644
--- a/drivers/net/s2io.h
+++ b/drivers/net/s2io.h
@@ -652,7 +652,7 @@ typedef struct fifo_info {
        nic_t *nic;
 }fifo_info_t;
-/* Infomation related to the Tx and Rx FIFOs and Rings of Xena
+/* Information related to the Tx and Rx FIFOs and Rings of Xena
 * is maintained in this structure.
 */
 typedef struct mac_info {
diff --git a/drivers/net/sb1250-mac.c b/drivers/net/sb1250-mac.c
index f2be9f83f091..9ab1618e82a4 100644
--- a/drivers/net/sb1250-mac.c
+++ b/drivers/net/sb1250-mac.c
@@ -31,7 +31,6 @@
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
 #include <linux/init.h>
-#include <linux/config.h>
 #include <linux/bitops.h>
 #include <asm/processor.h>              /* Processor type for cache alignment. */
 #include <asm/io.h>
@@ -2451,7 +2450,7 @@ static int sbmac_open(struct net_device *dev)
         */
        __raw_readq(sc->sbm_isr);
-        if (request_irq(dev->irq, &sbmac_intr, SA_SHIRQ, dev->name, dev))
+        if (request_irq(dev->irq, &sbmac_intr, IRQF_SHARED, dev->name, dev))
                return -EBUSY;
        /*
diff --git a/drivers/net/seeq8005.c b/drivers/net/seeq8005.c
index bcef03feb2fc..efd0f235020f 100644
--- a/drivers/net/seeq8005.c
+++ b/drivers/net/seeq8005.c
@@ -396,8 +396,7 @@ static int seeq8005_send_packet(struct sk_buff *skb, struct net_device *dev)
        unsigned char *buf;
        if (length < ETH_ZLEN) {
-                skb = skb_padto(skb, ETH_ZLEN);
+                if (skb_padto(skb, ETH_ZLEN))
-                if (skb == NULL)
                        return 0;
                length = ETH_ZLEN;
        }
diff --git a/drivers/net/shaper.c b/drivers/net/shaper.c
index 88e212043a43..c7832e69f177 100644
--- a/drivers/net/shaper.c
+++ b/drivers/net/shaper.c
@@ -69,7 +69,6 @@
 *                               2000/03 Andi Kleen
 */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/fcntl.h>
diff --git a/drivers/net/sis190.c b/drivers/net/sis190.c
index 31dd3f036fa8..df0cbebb3277 100644
--- a/drivers/net/sis190.c
+++ b/drivers/net/sis190.c
@@ -1054,7 +1054,7 @@ static int sis190_open(struct net_device *dev)
        sis190_request_timer(dev);
-        rc = request_irq(dev->irq, sis190_interrupt, SA_SHIRQ, dev->name, dev);
+        rc = request_irq(dev->irq, sis190_interrupt, IRQF_SHARED, dev->name, dev);
        if (rc < 0)
                goto err_release_timer_2;
@@ -1156,8 +1156,7 @@ static int sis190_start_xmit(struct sk_buff *skb, struct net_device *dev)
        dma_addr_t mapping;
        if (unlikely(skb->len < ETH_ZLEN)) {
-                skb = skb_padto(skb, ETH_ZLEN);
+                if (skb_padto(skb, ETH_ZLEN)) {
-                if (!skb) {
                        tp->stats.tx_dropped++;
                        goto out;
                }
diff --git a/drivers/net/sis900.c b/drivers/net/sis900.c
index d05874172209..29ee7ffedfff 100644
--- a/drivers/net/sis900.c
+++ b/drivers/net/sis900.c
@@ -1013,7 +1013,7 @@ sis900_open(struct net_device *net_dev)
        /* Equalizer workaround Rule */
        sis630_set_eq(net_dev, sis_priv->chipset_rev);
-        ret = request_irq(net_dev->irq, &sis900_interrupt, SA_SHIRQ,
+        ret = request_irq(net_dev->irq, &sis900_interrupt, IRQF_SHARED,
                                                net_dev->name, net_dev);
        if (ret)
                return ret;
diff --git a/drivers/net/sk98lin/skge.c b/drivers/net/sk98lin/skge.c
index 38a26df4095f..ee62845d3ac9 100644
--- a/drivers/net/sk98lin/skge.c
+++ b/drivers/net/sk98lin/skge.c
@@ -570,9 +570,9 @@ SK_BOOL	DualNet;
        spin_unlock_irqrestore(&pAC->SlowPathLock, Flags);
        if (pAC->GIni.GIMacsFound == 2) {
-                 Ret = request_irq(dev->irq, SkGeIsr, SA_SHIRQ, "sk98lin", dev);
+                 Ret = request_irq(dev->irq, SkGeIsr, IRQF_SHARED, "sk98lin", dev);
        } else if (pAC->GIni.GIMacsFound == 1) {
-                Ret = request_irq(dev->irq, SkGeIsrOnePort, SA_SHIRQ,
+                Ret = request_irq(dev->irq, SkGeIsrOnePort, IRQF_SHARED,
                        "sk98lin", dev);
        } else {
                printk(KERN_WARNING "sk98lin: Illegal number of ports: %d\n",
@@ -1525,7 +1525,7 @@ struct sk_buff	*pMessage)	/* pointer to send-message              */
        ** This is to resolve faulty padding by the HW with 0xaa bytes.
        */
        if (BytesSend < C_LEN_ETHERNET_MINSIZE) {
-                if ((pMessage = skb_padto(pMessage, C_LEN_ETHERNET_MINSIZE)) == NULL) {
+                if (skb_padto(pMessage, C_LEN_ETHERNET_MINSIZE)) {
                        spin_unlock_irqrestore(&pTxPort->TxDesRingLock, Flags);
                        return 0;
                }
@@ -5073,9 +5073,9 @@ static int skge_resume(struct pci_dev *pdev)
        pci_enable_device(pdev);
        pci_set_master(pdev);
        if (pAC->GIni.GIMacsFound == 2)
-                ret = request_irq(dev->irq, SkGeIsr, SA_SHIRQ, "sk98lin", dev);
+                ret = request_irq(dev->irq, SkGeIsr, IRQF_SHARED, "sk98lin", dev);
        else
-                ret = request_irq(dev->irq, SkGeIsrOnePort, SA_SHIRQ, "sk98lin", dev);
+                ret = request_irq(dev->irq, SkGeIsrOnePort, IRQF_SHARED, "sk98lin", dev);
        if (ret) {
                printk(KERN_WARNING "sk98lin: unable to acquire IRQ %d\n", dev->irq);
                pAC->AllocFlag &= ~SK_ALLOC_IRQ;
diff --git a/drivers/net/sk98lin/skvpd.c b/drivers/net/sk98lin/skvpd.c
index 17786056c66a..1e662aaebf84 100644
--- a/drivers/net/sk98lin/skvpd.c
+++ b/drivers/net/sk98lin/skvpd.c
@@ -22,7 +22,7 @@
 ******************************************************************************/
 /*
-        Please refer skvpd.txt for infomation how to include this module
+        Please refer skvpd.txt for information how to include this module
 */
 static const char SysKonnectFileId[] =
        "@(#)$Id: skvpd.c,v 1.37 2003/01/13 10:42:45 rschmidt Exp $ (C) SK";
diff --git a/drivers/net/sk_mca.c b/drivers/net/sk_mca.c
index e5d6d95960c7..799e09801934 100644
--- a/drivers/net/sk_mca.c
+++ b/drivers/net/sk_mca.c
@@ -824,7 +824,7 @@ static int skmca_open(struct net_device *dev)
        /* register resources - only necessary for IRQ */
        result =
            request_irq(priv->realirq, irq_handler,
-                        SA_SHIRQ | SA_SAMPLE_RANDOM, "sk_mca", dev);
+                        IRQF_SHARED | IRQF_SAMPLE_RANDOM, "sk_mca", dev);
        if (result != 0) {
                printk("%s: failed to register irq %d\n", dev->name,
                       dev->irq);
diff --git a/drivers/net/skfp/h/sba.h b/drivers/net/skfp/h/sba.h
index df716cd5784a..638cf0283bc4 100644
--- a/drivers/net/skfp/h/sba.h
+++ b/drivers/net/skfp/h/sba.h
@@ -13,7 +13,7 @@
 ******************************************************************************/
 /*
- * Synchronous Bandwith Allocation (SBA) structs
+ * Synchronous Bandwidth Allocation (SBA) structs
 */
 
 #ifndef _SBA_
diff --git a/drivers/net/skfp/skfddi.c b/drivers/net/skfp/skfddi.c
index c7fb6133047e..b5714a60237d 100644
--- a/drivers/net/skfp/skfddi.c
+++ b/drivers/net/skfp/skfddi.c
@@ -497,7 +497,7 @@ static int skfp_open(struct net_device *dev)
        PRINTK(KERN_INFO "entering skfp_open\n");
        /* Register IRQ - support shared interrupts by passing device ptr */
-        err = request_irq(dev->irq, (void *) skfp_interrupt, SA_SHIRQ,
+        err = request_irq(dev->irq, (void *) skfp_interrupt, IRQF_SHARED,
                          dev->name, dev);
        if (err)
                return err;
diff --git a/drivers/net/skge.c b/drivers/net/skge.c
index 536dd1cf7f79..82200bfaa8ed 100644
--- a/drivers/net/skge.c
+++ b/drivers/net/skge.c
@@ -24,7 +24,6 @@
 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
-#include <linux/config.h>
 #include <linux/in.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
@@ -2310,8 +2309,7 @@ static int skge_xmit_frame(struct sk_buff *skb, struct net_device *dev)
        u64 map;
        unsigned long flags;
-        skb = skb_padto(skb, ETH_ZLEN);
+        if (skb_padto(skb, ETH_ZLEN))
-        if (!skb)
                return NETDEV_TX_OK;
        if (!spin_trylock_irqsave(&skge->tx_lock, flags))
@@ -3343,7 +3341,7 @@ static int __devinit skge_probe(struct pci_dev *pdev,
                goto err_out_free_hw;
        }
-        err = request_irq(pdev->irq, skge_intr, SA_SHIRQ, DRV_NAME, hw);
+        err = request_irq(pdev->irq, skge_intr, IRQF_SHARED, DRV_NAME, hw);
        if (err) {
                printk(KERN_ERR PFX "%s: cannot assign irq %d\n",
                       pci_name(pdev), pdev->irq);
@@ -3355,8 +3353,8 @@ static int __devinit skge_probe(struct pci_dev *pdev,
        if (err)
                goto err_out_free_irq;
-        printk(KERN_INFO PFX DRV_VERSION " addr 0x%lx irq %d chip %s rev %d\n",
+        printk(KERN_INFO PFX DRV_VERSION " addr 0x%llx irq %d chip %s rev %d\n",
-               pci_resource_start(pdev, 0), pdev->irq,
+               (unsigned long long)pci_resource_start(pdev, 0), pdev->irq,
               skge_board_name(hw), hw->chip_rev);
        if ((dev = skge_devinit(hw, 0, using_dac)) == NULL)
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index fba1e4d4d83d..418f169a6a31 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -23,7 +23,6 @@
 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
-#include <linux/config.h>
 #include <linux/crc32.h>
 #include <linux/kernel.h>
 #include <linux/version.h>
@@ -1160,7 +1159,7 @@ static unsigned tx_le_req(const struct sk_buff *skb)
        count = sizeof(dma_addr_t) / sizeof(u32);
        count += skb_shinfo(skb)->nr_frags * count;
-        if (skb_shinfo(skb)->tso_size)
+        if (skb_shinfo(skb)->gso_size)
                ++count;
        if (skb->ip_summed == CHECKSUM_HW)
@@ -1232,7 +1231,7 @@ static int sky2_xmit_frame(struct sk_buff *skb, struct net_device *dev)
        }
        /* Check for TCP Segmentation Offload */
-        mss = skb_shinfo(skb)->tso_size;
+        mss = skb_shinfo(skb)->gso_size;
        if (mss != 0) {
                /* just drop the packet if non-linear expansion fails */
                if (skb_header_cloned(skb) &&
@@ -3189,7 +3188,7 @@ static int __devinit sky2_test_msi(struct sky2_hw *hw)
        sky2_write32(hw, B0_IMSK, Y2_IS_IRQ_SW);
-        err = request_irq(pdev->irq, sky2_test_intr, SA_SHIRQ, DRV_NAME, hw);
+        err = request_irq(pdev->irq, sky2_test_intr, IRQF_SHARED, DRV_NAME, hw);
        if (err) {
                printk(KERN_ERR PFX "%s: cannot assign irq %d\n",
                       pci_name(pdev), pdev->irq);
@@ -3311,9 +3310,9 @@ static int __devinit sky2_probe(struct pci_dev *pdev,
        if (err)
                goto err_out_iounmap;
-        printk(KERN_INFO PFX "v%s addr 0x%lx irq %d Yukon-%s (0x%x) rev %d\n",
+        printk(KERN_INFO PFX "v%s addr 0x%llx irq %d Yukon-%s (0x%x) rev %d\n",
-               DRV_VERSION, pci_resource_start(pdev, 0), pdev->irq,
+               DRV_VERSION, (unsigned long long)pci_resource_start(pdev, 0),
-               yukon2_name[hw->chip_id - CHIP_ID_YUKON_XL],
+               pdev->irq, yukon2_name[hw->chip_id - CHIP_ID_YUKON_XL],
               hw->chip_id, hw->chip_rev);
        dev = sky2_init_netdev(hw, 0, using_dac);
@@ -3349,7 +3348,7 @@ static int __devinit sky2_probe(struct pci_dev *pdev,
                        goto err_out_unregister;
        }
-        err = request_irq(pdev->irq,  sky2_intr, SA_SHIRQ, DRV_NAME, hw);
+        err = request_irq(pdev->irq,  sky2_intr, IRQF_SHARED, DRV_NAME, hw);
        if (err) {
                printk(KERN_ERR PFX "%s: cannot assign irq %d\n",
                       pci_name(pdev), pdev->irq);
diff --git a/drivers/net/slhc.c b/drivers/net/slhc.c
index c6fbb1ede0ed..3a1b7131681c 100644
--- a/drivers/net/slhc.c
+++ b/drivers/net/slhc.c
@@ -50,7 +50,6 @@
 *      driver code belonging close to PPP and SLIP
 */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/string.h>
diff --git a/drivers/net/slip.c b/drivers/net/slip.c
index b2e18d28850d..1588cb7f6c83 100644
--- a/drivers/net/slip.c
+++ b/drivers/net/slip.c
@@ -55,7 +55,6 @@
 */
 #define SL_CHECK_TRANSMIT
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
diff --git a/drivers/net/slip.h b/drivers/net/slip.h
index ab3efe66a642..29d87dd45a24 100644
--- a/drivers/net/slip.h
+++ b/drivers/net/slip.h
@@ -22,7 +22,6 @@
 #ifndef _LINUX_SLIP_H
 #define _LINUX_SLIP_H
-#include <linux/config.h>
 #if defined(CONFIG_INET) && defined(CONFIG_SLIP_COMPRESSED)
 # define SL_INCLUDE_CSLIP
diff --git a/drivers/net/smc-ultra.c b/drivers/net/smc-ultra.c
index 5b4e8529d4ab..45449353a958 100644
--- a/drivers/net/smc-ultra.c
+++ b/drivers/net/smc-ultra.c
@@ -57,7 +57,6 @@
 static const char version[] =
        "smc-ultra.c:v2.02 2/3/98 Donald Becker (becker@cesdis.gsfc.nasa.gov)\n";
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
diff --git a/drivers/net/smc-ultra32.c b/drivers/net/smc-ultra32.c
index ff9bd97746dc..85be22a05973 100644
--- a/drivers/net/smc-ultra32.c
+++ b/drivers/net/smc-ultra32.c
@@ -290,7 +290,7 @@ out:
 static int ultra32_open(struct net_device *dev)
 {
        int ioaddr = dev->base_addr - ULTRA32_NIC_OFFSET; /* ASIC addr */
-        int irq_flags = (inb(ioaddr + ULTRA32_CFG5) & 0x08) ? 0 : SA_SHIRQ;
+        int irq_flags = (inb(ioaddr + ULTRA32_CFG5) & 0x08) ? 0 : IRQF_SHARED;
        int retval;
        retval = request_irq(dev->irq, ei_interrupt, irq_flags, dev->name, dev);
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index bdd8702ead54..d37bd860b336 100644
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -2081,7 +2081,7 @@ static int __init smc911x_probe(struct net_device *dev, unsigned long ioaddr)
        lp->ctl_rspeed = 100;
        /* Grab the IRQ */
-        retval = request_irq(dev->irq, &smc911x_interrupt, SA_SHIRQ, dev->name, dev);
+        retval = request_irq(dev->irq, &smc911x_interrupt, IRQF_SHARED, dev->name, dev);
        if (retval)
                goto err_out;
diff --git a/drivers/net/smc9194.c b/drivers/net/smc9194.c
index 6cf16f322ad5..8b0321f1976c 100644
--- a/drivers/net/smc9194.c
+++ b/drivers/net/smc9194.c
@@ -523,8 +523,7 @@ static int smc_wait_to_send_packet( struct sk_buff * skb, struct net_device * de
        length = skb->len;
        if (length < ETH_ZLEN) {
-                skb = skb_padto(skb, ETH_ZLEN);
+                if (skb_padto(skb, ETH_ZLEN)) {
-                if (skb == NULL) {
                        netif_wake_queue(dev);
                        return 0;
                }
diff --git a/drivers/net/smc91x.c b/drivers/net/smc91x.c
index 0e9833adf9fe..3d8dcb6c8758 100644
--- a/drivers/net/smc91x.c
+++ b/drivers/net/smc91x.c
@@ -66,7 +66,6 @@ static const char version[] =
 #endif
-#include <linux/config.h>
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h
index f72a4f57905a..b4028049ed76 100644
--- a/drivers/net/smc91x.h
+++ b/drivers/net/smc91x.h
@@ -207,7 +207,7 @@ SMC_outw(u16 val, void __iomem *ioaddr, int reg)
                   machine_is_omap_h2() \
                || machine_is_omap_h3() \
                || (machine_is_omap_innovator() && !cpu_is_omap1510()) \
-        ) ? SA_TRIGGER_FALLING : SA_TRIGGER_RISING)
+        ) ? IRQF_TRIGGER_FALLING : IRQF_TRIGGER_RISING)
 #elif   defined(CONFIG_SH_SH4202_MICRODEV)
@@ -260,15 +260,17 @@ SMC_outw(u16 val, void __iomem *ioaddr, int reg)
 #define RPC_LSA_DEFAULT         RPC_LED_TX_RX
 #define RPC_LSB_DEFAULT         RPC_LED_100_10
-#elif   defined(CONFIG_MACH_LPD7A400) || defined(CONFIG_MACH_LPD7A404)
+#elif   defined(CONFIG_MACH_LPD79520) \
+     || defined(CONFIG_MACH_LPD7A400) \
+     || defined(CONFIG_MACH_LPD7A404)
-/* The LPD7A40X_IOBARRIER is necessary to overcome a mismatch between
+/* The LPD7X_IOBARRIER is necessary to overcome a mismatch between the
- * the way that the CPU handles chip selects and the way that the SMC
+ * way that the CPU handles chip selects and the way that the SMC chip
- * chip expects the chip select to operate.  Refer to
+ * expects the chip select to operate.  Refer to
 * Documentation/arm/Sharp-LH/IOBarrier for details.  The read from
- * IOBARRIER is a byte as a least-common denominator of possible
+ * IOBARRIER is a byte, in order that we read the least-common
- * regions to use as the barrier.  It would be wasteful to read 32
+ * denominator.  It would be wasteful to read 32 bits from an 8-bit
- * bits from a byte oriented region.
+ * accessible region.
 *
 * There is no explicit protection against interrupts intervening
 * between the writew and the IOBARRIER.  In SMC ISR there is a
@@ -287,25 +289,35 @@ SMC_outw(u16 val, void __iomem *ioaddr, int reg)
 #define SMC_CAN_USE_16BIT       1
 #define SMC_CAN_USE_32BIT       0
 #define SMC_NOWAIT              0
-#define LPD7A40X_IOBARRIER      readb (IOBARRIER_VIRT)
+#define LPD7X_IOBARRIER         readb (IOBARRIER_VIRT)
-#define SMC_inw(a,r)            readw ((void*) ((a) + (r)))
+#define SMC_inw(a,r)\
-#define SMC_insw(a,r,p,l)       readsw ((void*) ((a) + (r)), p, l)
+   ({ unsigned short v = readw ((void*) ((a) + (r))); LPD7X_IOBARRIER; v; })
-#define SMC_outw(v,a,r)      ({ writew ((v), (a) + (r)); LPD7A40X_IOBARRIER; })
+#define SMC_outw(v,a,r)   ({ writew ((v), (a) + (r)); LPD7X_IOBARRIER; })
-#define SMC_outsw               LPD7A40X_SMC_outsw
+#define SMC_insw                LPD7_SMC_insw
+static inline void LPD7_SMC_insw (unsigned char* a, int r,
+                                  unsigned char* p, int l)
+{
+        unsigned short* ps = (unsigned short*) p;
+        while (l-- > 0) {
+                *ps++ = readw (a + r);
+                LPD7X_IOBARRIER;
+        }
+}
-static inline void LPD7A40X_SMC_outsw(unsigned long a, int r,
+#define SMC_outsw               LPD7_SMC_outsw
-                                     unsigned char* p, int l)
+static inline void LPD7_SMC_outsw (unsigned char* a, int r,
+                                   unsigned char* p, int l)
 {
        unsigned short* ps = (unsigned short*) p;
        while (l-- > 0) {
                writew (*ps++, a + r);
-                LPD7A40X_IOBARRIER;
+                LPD7X_IOBARRIER;
        }
 }
-#define SMC_INTERRUPT_PREAMBLE  LPD7A40X_IOBARRIER
+#define SMC_INTERRUPT_PREAMBLE  LPD7X_IOBARRIER
 #define RPC_LSA_DEFAULT         RPC_LED_TX_RX
 #define RPC_LSB_DEFAULT         RPC_LED_100_10
@@ -528,7 +540,7 @@ smc_pxa_dma_irq(int dma, void *dummy, struct pt_regs *regs)
 #endif
 #ifndef SMC_IRQ_FLAGS
-#define SMC_IRQ_FLAGS           SA_TRIGGER_RISING
+#define SMC_IRQ_FLAGS           IRQF_TRIGGER_RISING
 #endif
 #ifndef SMC_INTERRUPT_PREAMBLE
diff --git a/drivers/net/sonic.c b/drivers/net/sonic.c
index 90b818a8de6e..cab0dd958492 100644
--- a/drivers/net/sonic.c
+++ b/drivers/net/sonic.c
@@ -231,8 +231,7 @@ static int sonic_send_packet(struct sk_buff *skb, struct net_device *dev)
        length = skb->len;
        if (length < ETH_ZLEN) {
-                skb = skb_padto(skb, ETH_ZLEN);
+                if (skb_padto(skb, ETH_ZLEN))
-                if (skb == NULL)
                        return 0;
                length = ETH_ZLEN;
        }
diff --git a/drivers/net/sonic.h b/drivers/net/sonic.h
index cede969a8baa..7f5c4ebcc17a 100644
--- a/drivers/net/sonic.h
+++ b/drivers/net/sonic.h
@@ -22,7 +22,6 @@
 #ifndef SONIC_H
 #define SONIC_H
-#include <linux/config.h>
 /*
 * SONIC register offsets
diff --git a/drivers/net/spider_net.c b/drivers/net/spider_net.c
index 394339d5e87c..fb1d5a8a45cf 100644
--- a/drivers/net/spider_net.c
+++ b/drivers/net/spider_net.c
@@ -21,7 +21,6 @@
 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
-#include <linux/config.h>
 #include <linux/compiler.h>
 #include <linux/crc32.h>
 #include <linux/delay.h>
@@ -1745,7 +1744,7 @@ spider_net_open(struct net_device *netdev)
        result = -EBUSY;
        if (request_irq(netdev->irq, spider_net_interrupt,
-                             SA_SHIRQ, netdev->name, netdev))
+                             IRQF_SHARED, netdev->name, netdev))
                goto register_int_failed;
        spider_net_enable_card(card);
diff --git a/drivers/net/starfire.c b/drivers/net/starfire.c
index 9b7805be21da..c0a62b00ffc8 100644
--- a/drivers/net/starfire.c
+++ b/drivers/net/starfire.c
@@ -22,131 +22,14 @@
        Support and updates available at
        http://www.scyld.com/network/starfire.html
+        [link no longer provides useful info -jgarzik]
-        -----------------------------------------------------------
-        Linux kernel-specific changes:
-        LK1.1.1 (jgarzik):
-        - Use PCI driver interface
-        - Fix MOD_xxx races
-        - softnet fixups
-        LK1.1.2 (jgarzik):
-        - Merge Becker version 0.15
-        LK1.1.3 (Andrew Morton)
-        - Timer cleanups
-        LK1.1.4 (jgarzik):
-        - Merge Becker version 1.03
-        LK1.2.1 (Ion Badulescu <ionut@cs.columbia.edu>)
-        - Support hardware Rx/Tx checksumming
-        - Use the GFP firmware taken from Adaptec's Netware driver
-        LK1.2.2 (Ion Badulescu)
-        - Backported to 2.2.x
-        LK1.2.3 (Ion Badulescu)
-        - Fix the flaky mdio interface
-        - More compat clean-ups
-        LK1.2.4 (Ion Badulescu)
-        - More 2.2.x initialization fixes
-        LK1.2.5 (Ion Badulescu)
-        - Several fixes from Manfred Spraul
-        LK1.2.6 (Ion Badulescu)
-        - Fixed ifup/ifdown/ifup problem in 2.4.x
-        LK1.2.7 (Ion Badulescu)
-        - Removed unused code
-        - Made more functions static and __init
-        LK1.2.8 (Ion Badulescu)
-        - Quell bogus error messages, inform about the Tx threshold
-        - Removed #ifdef CONFIG_PCI, this driver is PCI only
-        LK1.2.9 (Ion Badulescu)
-        - Merged Jeff Garzik's changes from 2.4.4-pre5
-        - Added 2.2.x compatibility stuff required by the above changes
-        LK1.2.9a (Ion Badulescu)
-        - More updates from Jeff Garzik
-        LK1.3.0 (Ion Badulescu)
-        - Merged zerocopy support
-        LK1.3.1 (Ion Badulescu)
-        - Added ethtool support
-        - Added GPIO (media change) interrupt support
-        LK1.3.2 (Ion Badulescu)
-        - Fixed 2.2.x compatibility issues introduced in 1.3.1
-        - Fixed ethtool ioctl returning uninitialized memory
-        LK1.3.3 (Ion Badulescu)
-        - Initialize the TxMode register properly
-        - Don't dereference dev->priv after freeing it
-        LK1.3.4 (Ion Badulescu)
-        - Fixed initialization timing problems
-        - Fixed interrupt mask definitions
-        LK1.3.5 (jgarzik)
-        - ethtool NWAY_RST, GLINK, [GS]MSGLVL support
-        LK1.3.6:
-        - Sparc64 support and fixes (Ion Badulescu)
-        - Better stats and error handling (Ion Badulescu)
-        - Use new pci_set_mwi() PCI API function (jgarzik)
-        LK1.3.7 (Ion Badulescu)
-        - minimal implementation of tx_timeout()
-        - correctly shutdown the Rx/Tx engines in netdev_close()
-        - added calls to netif_carrier_on/off
-        (patch from Stefan Rompf <srompf@isg.de>)
-        - VLAN support
-        LK1.3.8 (Ion Badulescu)
-        - adjust DMA burst size on sparc64
-        - 64-bit support
-        - reworked zerocopy support for 64-bit buffers
-        - working and usable interrupt mitigation/latency
-        - reduced Tx interrupt frequency for lower interrupt overhead
-        LK1.3.9 (Ion Badulescu)
-        - bugfix for mcast filter
-        - enable the right kind of Tx interrupts (TxDMADone, not TxDone)
-        LK1.4.0 (Ion Badulescu)
-        - NAPI support
-        LK1.4.1 (Ion Badulescu)
-        - flush PCI posting buffers after disabling Rx interrupts
-        - put the chip to a D3 slumber on driver unload
-        - added config option to enable/disable NAPI
-        LK1.4.2 (Ion Badulescu)
-        - finally added firmware (GPL'ed by Adaptec)
-        - removed compatibility code for 2.2.x
-        LK1.4.2.1 (Ion Badulescu)
-        - fixed 32/64 bit issues on i386 + CONFIG_HIGHMEM
-        - added 32-bit padding to outgoing skb's, removed previous workaround
-TODO:   - fix forced speed/duplexing code (broken a long time ago, when
-        somebody converted the driver to use the generic MII code)
-        - fix VLAN support
 */
 #define DRV_NAME        "starfire"
-#define DRV_VERSION     "1.03+LK1.4.2.1"
+#define DRV_VERSION     "2.0"
-#define DRV_RELDATE     "October 3, 2005"
+#define DRV_RELDATE     "June 27, 2006"
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/pci.h>
@@ -847,7 +730,6 @@ static int __devinit starfire_init_one(struct pci_dev *pdev,
                goto err_out_free_netdev;
        }
-        /* ioremap is borken in Linux-2.2.x/sparc64 */
        base = ioremap(ioaddr, io_size);
        if (!base) {
                printk(KERN_ERR DRV_NAME " %d: cannot remap %#x @ %#lx, aborting\n",
@@ -1071,7 +953,7 @@ static int netdev_open(struct net_device *dev)
        /* Do we ever need to reset the chip??? */
-        retval = request_irq(dev->irq, &intr_handler, SA_SHIRQ, dev->name, dev);
+        retval = request_irq(dev->irq, &intr_handler, IRQF_SHARED, dev->name, dev);
        if (retval)
                return retval;
@@ -1349,8 +1231,7 @@ static int start_tx(struct sk_buff *skb, struct net_device *dev)
 #if defined(ZEROCOPY) && defined(HAS_BROKEN_FIRMWARE)
        if (skb->ip_summed == CHECKSUM_HW) {
-                skb = skb_padto(skb, (skb->len + PADDING_MASK) & ~PADDING_MASK);
+                if (skb_padto(skb, (skb->len + PADDING_MASK) & ~PADDING_MASK))
-                if (skb == NULL)
                        return NETDEV_TX_OK;
        }
 #endif /* ZEROCOPY && HAS_BROKEN_FIRMWARE */
diff --git a/drivers/net/stnic.c b/drivers/net/stnic.c
index b6dfdf8f44da..74228348995d 100644
--- a/drivers/net/stnic.c
+++ b/drivers/net/stnic.c
@@ -7,7 +7,6 @@
 * Copyright (C) 1999 kaz Kojima
 */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
diff --git a/drivers/net/sun3lance.c b/drivers/net/sun3lance.c
index d4c0002b43db..2dcadb169a22 100644
--- a/drivers/net/sun3lance.c
+++ b/drivers/net/sun3lance.c
@@ -55,7 +55,7 @@ static char *version = "sun3lance.c: v1.2 1/12/2001  Sam Creasey (sammy@sammy.ne
 /* sun3/60 addr/irq for the lance chip.  If your sun is different,
   change this. */
 #define LANCE_OBIO 0x120000
-#define LANCE_IRQ IRQ3
+#define LANCE_IRQ IRQ_AUTO_3
 /* Debug level:
 *  0 = silent, print only serious errors
@@ -341,7 +341,7 @@ static int __init lance_probe( struct net_device *dev)
        REGA(CSR0) = CSR0_STOP; 
-        request_irq(LANCE_IRQ, lance_interrupt, SA_INTERRUPT, "SUN3 Lance", dev);
+        request_irq(LANCE_IRQ, lance_interrupt, IRQF_DISABLED, "SUN3 Lance", dev);
        dev->irq = (unsigned short)LANCE_IRQ;
diff --git a/drivers/net/sunbmac.c b/drivers/net/sunbmac.c
index cfaf47c63c58..d46891510767 100644
--- a/drivers/net/sunbmac.c
+++ b/drivers/net/sunbmac.c
@@ -72,8 +72,6 @@ MODULE_LICENSE("GPL");
 #define DIRQ(x)
 #endif
-static struct bigmac *root_bigmac_dev;
 #define DEFAULT_JAMSIZE    4 /* Toe jam */
 #define QEC_RESET_TRIES 200
@@ -491,7 +489,7 @@ static void bigmac_tcvr_init(struct bigmac *bp)
        }
 }
-static int bigmac_init(struct bigmac *, int);
+static int bigmac_init_hw(struct bigmac *, int);
 static int try_next_permutation(struct bigmac *bp, void __iomem *tregs)
 {
@@ -551,7 +549,7 @@ static void bigmac_timer(unsigned long data)
                                if (ret == -1) {
                                        printk(KERN_ERR "%s: Link down, cable problem?\n",
                                               bp->dev->name);
-                                        ret = bigmac_init(bp, 0);
+                                        ret = bigmac_init_hw(bp, 0);
                                        if (ret) {
                                                printk(KERN_ERR "%s: Error, cannot re-init the "
                                                       "BigMAC.\n", bp->dev->name);
@@ -621,7 +619,7 @@ static void bigmac_begin_auto_negotiation(struct bigmac *bp)
        add_timer(&bp->bigmac_timer);
 }
-static int bigmac_init(struct bigmac *bp, int from_irq)
+static int bigmac_init_hw(struct bigmac *bp, int from_irq)
 {
        void __iomem *gregs        = bp->gregs;
        void __iomem *cregs        = bp->creg;
@@ -752,7 +750,7 @@ static void bigmac_is_medium_rare(struct bigmac *bp, u32 qec_status, u32 bmac_st
        }
        printk(" RESET\n");
-        bigmac_init(bp, 1);
+        bigmac_init_hw(bp, 1);
 }
 /* BigMAC transmit complete service routines. */
@@ -920,13 +918,13 @@ static int bigmac_open(struct net_device *dev)
        struct bigmac *bp = (struct bigmac *) dev->priv;
        int ret;
-        ret = request_irq(dev->irq, &bigmac_interrupt, SA_SHIRQ, dev->name, bp);
+        ret = request_irq(dev->irq, &bigmac_interrupt, IRQF_SHARED, dev->name, bp);
        if (ret) {
                printk(KERN_ERR "BIGMAC: Can't order irq %d to go.\n", dev->irq);
                return ret;
        }
        init_timer(&bp->bigmac_timer);
-        ret = bigmac_init(bp, 0);
+        ret = bigmac_init_hw(bp, 0);
        if (ret)
                free_irq(dev->irq, bp);
        return ret;
@@ -950,7 +948,7 @@ static void bigmac_tx_timeout(struct net_device *dev)
 {
        struct bigmac *bp = (struct bigmac *) dev->priv;
-        bigmac_init(bp, 0);
+        bigmac_init_hw(bp, 0);
        netif_wake_queue(dev);
 }
@@ -1104,6 +1102,8 @@ static int __init bigmac_ether_init(struct sbus_dev *qec_sdev)
        bp->qec_sdev = qec_sdev;
        bp->bigmac_sdev = qec_sdev->child;
+        SET_NETDEV_DEV(dev, &bp->bigmac_sdev->ofdev.dev);
        spin_lock_init(&bp->lock);
        /* Verify the registers we expect, are actually there. */
@@ -1226,11 +1226,7 @@ static int __init bigmac_ether_init(struct sbus_dev *qec_sdev)
                goto fail_and_cleanup;
        }
-        /* Put us into the list of instances attached for later driver
+        dev_set_drvdata(&bp->bigmac_sdev->ofdev.dev, bp);
-         * exit.
-         */
-        bp->next_module = root_bigmac_dev;
-        root_bigmac_dev = bp;
        printk(KERN_INFO "%s: BigMAC 100baseT Ethernet ", dev->name);
        for (i = 0; i < 6; i++)
@@ -1266,69 +1262,68 @@ fail_and_cleanup:
 /* QEC can be the parent of either QuadEthernet or
 * a BigMAC.  We want the latter.
 */
-static int __init bigmac_match(struct sbus_dev *sdev)
+static int __devinit bigmac_sbus_probe(struct of_device *dev, const struct of_device_id *match)
 {
-        struct sbus_dev *child = sdev->child;
+        struct sbus_dev *sdev = to_sbus_device(&dev->dev);
+        struct device_node *dp = dev->node;
-        if (strcmp(sdev->prom_name, "qec") != 0)
+        if (!strcmp(dp->name, "be"))
-                return 0;
+                sdev = sdev->parent;
-        if (child == NULL)
+        return bigmac_ether_init(sdev);
-                return 0;
-        if (strcmp(child->prom_name, "be") != 0)
-                return 0;
-        return 1;
 }
-static int __init bigmac_probe(void)
+static int __devexit bigmac_sbus_remove(struct of_device *dev)
 {
-        struct sbus_bus *sbus;
+        struct bigmac *bp = dev_get_drvdata(&dev->dev);
-        struct sbus_dev *sdev = NULL;
+        struct net_device *net_dev = bp->dev;
-        static int called;
-        int cards = 0, v;
+        unregister_netdevice(net_dev);
-        root_bigmac_dev = NULL;
+        sbus_iounmap(bp->gregs, GLOB_REG_SIZE);
+        sbus_iounmap(bp->creg, CREG_REG_SIZE);
-        if (called)
+        sbus_iounmap(bp->bregs, BMAC_REG_SIZE);
-                return -ENODEV;
+        sbus_iounmap(bp->tregs, TCVR_REG_SIZE);
-        called++;
+        sbus_free_consistent(bp->bigmac_sdev,
+                             PAGE_SIZE,
-        for_each_sbus(sbus) {
+                             bp->bmac_block,
-                for_each_sbusdev(sdev, sbus) {
+                             bp->bblock_dvma);
-                        if (bigmac_match(sdev)) {
-                                cards++;
+        free_netdev(net_dev);
-                                if ((v = bigmac_ether_init(sdev)))
-                                        return v;
+        dev_set_drvdata(&dev->dev, NULL);
-                        }
-                }
-        }
-        if (!cards)
-                return -ENODEV;
        return 0;
 }
-static void __exit bigmac_cleanup(void)
+static struct of_device_id bigmac_sbus_match[] = {
-{
+        {
-        while (root_bigmac_dev) {
+                .name = "qec",
-                struct bigmac *bp = root_bigmac_dev;
+        },
-                struct bigmac *bp_nxt = root_bigmac_dev->next_module;
+        {
+                .name = "be",
+        },
+        {},
+};
-                sbus_iounmap(bp->gregs, GLOB_REG_SIZE);
+MODULE_DEVICE_TABLE(of, bigmac_sbus_match);
-                sbus_iounmap(bp->creg, CREG_REG_SIZE);
-                sbus_iounmap(bp->bregs, BMAC_REG_SIZE);
-                sbus_iounmap(bp->tregs, TCVR_REG_SIZE);
-                sbus_free_consistent(bp->bigmac_sdev,
-                                     PAGE_SIZE,
-                                     bp->bmac_block,
-                                     bp->bblock_dvma);
-                unregister_netdev(bp->dev);
+static struct of_platform_driver bigmac_sbus_driver = {
-                free_netdev(bp->dev);
+        .name           = "sunbmac",
-                root_bigmac_dev = bp_nxt;
+        .match_table    = bigmac_sbus_match,
-        }
+        .probe          = bigmac_sbus_probe,
+        .remove         = __devexit_p(bigmac_sbus_remove),
+};
+static int __init bigmac_init(void)
+{
+        return of_register_driver(&bigmac_sbus_driver, &sbus_bus_type);
+}
+static void __exit bigmac_exit(void)
+{
+        of_unregister_driver(&bigmac_sbus_driver);
 }
-module_init(bigmac_probe);
+module_init(bigmac_init);
-module_exit(bigmac_cleanup);
+module_exit(bigmac_exit);
diff --git a/drivers/net/sunbmac.h b/drivers/net/sunbmac.h
index b0dbc5187143..b563d3c2993e 100644
--- a/drivers/net/sunbmac.h
+++ b/drivers/net/sunbmac.h
@@ -332,7 +332,6 @@ struct bigmac {
        struct sbus_dev         *qec_sdev;
        struct sbus_dev         *bigmac_sdev;
        struct net_device       *dev;
-        struct bigmac           *next_module;
 };
 /* We use this to acquire receive skb's that we can DMA directly into. */
diff --git a/drivers/net/sundance.c b/drivers/net/sundance.c
index f13b2a195c70..ac17377b3e9f 100644
--- a/drivers/net/sundance.c
+++ b/drivers/net/sundance.c
@@ -16,91 +16,13 @@
        Support and updates available at
        http://www.scyld.com/network/sundance.html
+        [link no longer provides useful info -jgarzik]
-        Version LK1.01a (jgarzik):
-        - Replace some MII-related magic numbers with constants
-        Version LK1.02 (D-Link):
-        - Add new board to PCI ID list
-        - Fix multicast bug
-        Version LK1.03 (D-Link):
-        - New Rx scheme, reduce Rx congestion
-        - Option to disable flow control
-        Version LK1.04 (D-Link):
-        - Tx timeout recovery
-        - More support for ethtool.
-        Version LK1.04a:
-        - Remove unused/constant members from struct pci_id_info
-        (which then allows removal of 'drv_flags' from private struct)
-        (jgarzik)
-        - If no phy is found, fail to load that board (jgarzik)
-        - Always start phy id scan at id 1 to avoid problems (Donald Becker)
-        - Autodetect where mii_preable_required is needed,
-        default to not needed.  (Donald Becker)
-        Version LK1.04b:
-        - Remove mii_preamble_required module parameter (Donald Becker)
-        - Add per-interface mii_preamble_required (setting is autodetected)
-          (Donald Becker)
-        - Remove unnecessary cast from void pointer (jgarzik)
-        - Re-align comments in private struct (jgarzik)
-        Version LK1.04c (jgarzik):
-        - Support bitmapped message levels (NETIF_MSG_xxx), and the
-          two ethtool ioctls that get/set them
-        - Don't hand-code MII ethtool support, use standard API/lib
-        Version LK1.04d:
-        - Merge from Donald Becker's sundance.c: (Jason Lunz)
-                * proper support for variably-sized MTUs
-                * default to PIO, to fix chip bugs
-        - Add missing unregister_netdev (Jason Lunz)
-        - Add CONFIG_SUNDANCE_MMIO config option (jgarzik)
-        - Better rx buf size calculation (Donald Becker)
-        Version LK1.05 (D-Link):
-        - Fix DFE-580TX packet drop issue (for DL10050C)
-        - Fix reset_tx logic
-        Version LK1.06 (D-Link):
-        - Fix crash while unloading driver
-        Versin LK1.06b (D-Link):
-        - New tx scheme, adaptive tx_coalesce
-        
-        Version LK1.07 (D-Link):
-        - Fix tx bugs in big-endian machines
-        - Remove unused max_interrupt_work module parameter, the new 
-          NAPI-like rx scheme doesn't need it.
-        - Remove redundancy get_stats() in intr_handler(), those 
-          I/O access could affect performance in ARM-based system
-        - Add Linux software VLAN support
-        
-        Version LK1.08 (Philippe De Muyter phdm@macqel.be):
-        - Fix bug of custom mac address 
-        (StationAddr register only accept word write) 
-        Version LK1.09 (D-Link):
-        - Fix the flowctrl bug. 
-        - Set Pause bit in MII ANAR if flow control enabled.    
-        Version LK1.09a (ICPlus):
-        - Add the delay time in reading the contents of EEPROM
-        Version LK1.10 (Philippe De Muyter phdm@macqel.be):
-        - Make 'unblock interface after Tx underrun' work
-        Version LK1.11 (Pedro Alejandro Lopez-Valencia palopezv at gmail.com):
-        - Add support for IC Plus Corporation IP100A chipset
 */
 #define DRV_NAME        "sundance"
-#define DRV_VERSION     "1.01+LK1.11"
+#define DRV_VERSION     "1.1"
-#define DRV_RELDATE     "14-Jun-2006"
+#define DRV_RELDATE     "27-Jun-2006"
 /* The user-configurable values.
@@ -282,15 +204,15 @@ IVc. Errata
 #define USE_IO_OPS 1
 #endif
-static struct pci_device_id sundance_pci_tbl[] = {
+static const struct pci_device_id sundance_pci_tbl[] = {
-        {0x1186, 0x1002, 0x1186, 0x1002, 0, 0, 0},
+        { 0x1186, 0x1002, 0x1186, 0x1002, 0, 0, 0 },
-        {0x1186, 0x1002, 0x1186, 0x1003, 0, 0, 1},
+        { 0x1186, 0x1002, 0x1186, 0x1003, 0, 0, 1 },
-        {0x1186, 0x1002, 0x1186, 0x1012, 0, 0, 2},
+        { 0x1186, 0x1002, 0x1186, 0x1012, 0, 0, 2 },
-        {0x1186, 0x1002, 0x1186, 0x1040, 0, 0, 3},
+        { 0x1186, 0x1002, 0x1186, 0x1040, 0, 0, 3 },
-        {0x1186, 0x1002, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4},
+        { 0x1186, 0x1002, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 },
-        {0x13F0, 0x0201, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 5},
+        { 0x13F0, 0x0201, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 5 },
-        {0x13F0, 0x0200, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 6},
+        { 0x13F0, 0x0200, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 6 },
-        {0,}
+        { }
 };
 MODULE_DEVICE_TABLE(pci, sundance_pci_tbl);
@@ -301,7 +223,7 @@ enum {
 struct pci_id_info {
        const char *name;
 };
-static const struct pci_id_info pci_id_tbl[] = {
+static const struct pci_id_info pci_id_tbl[] __devinitdata = {
        {"D-Link DFE-550TX FAST Ethernet Adapter"},
        {"D-Link DFE-550FX 100Mbps Fiber-optics Adapter"},
        {"D-Link DFE-580TX 4 port Server Adapter"},
@@ -309,7 +231,7 @@ static const struct pci_id_info pci_id_tbl[] = {
        {"D-Link DL10050-based FAST Ethernet Adapter"},
        {"Sundance Technology Alta"},
        {"IC Plus Corporation IP100A FAST Ethernet Adapter"},
-        {NULL,},                        /* 0 terminated list. */
+        { }     /* terminate list. */
 };
 /* This driver was written to use PCI memory space, however x86-oriented
@@ -870,7 +792,7 @@ static int netdev_open(struct net_device *dev)
        /* Do we need to reset the chip??? */
-        i = request_irq(dev->irq, &intr_handler, SA_SHIRQ, dev->name, dev);
+        i = request_irq(dev->irq, &intr_handler, IRQF_SHARED, dev->name, dev);
        if (i)
                return i;
diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c
index 38cd30cb7c75..b70bbd748978 100644
--- a/drivers/net/sungem.c
+++ b/drivers/net/sungem.c
@@ -2220,7 +2220,7 @@ static int gem_do_start(struct net_device *dev)
        spin_unlock_irqrestore(&gp->lock, flags);
        if (request_irq(gp->pdev->irq, gem_interrupt,
-                                   SA_SHIRQ, dev->name, (void *)dev)) {
+                                   IRQF_SHARED, dev->name, (void *)dev)) {
                printk(KERN_ERR "%s: failed to request irq !\n", gp->dev->name);
                spin_lock_irqsave(&gp->lock, flags);
@@ -2880,17 +2880,20 @@ static int __devinit gem_get_device_address(struct gem *gp)
 #if defined(__sparc__)
        struct pci_dev *pdev = gp->pdev;
        struct pcidev_cookie *pcp = pdev->sysdata;
-        int node = -1;
+        int use_idprom = 1;
        if (pcp != NULL) {
-                node = pcp->prom_node;
+                unsigned char *addr;
-                if (prom_getproplen(node, "local-mac-address") == 6)
+                int len;
-                        prom_getproperty(node, "local-mac-address",
-                                         dev->dev_addr, 6);
+                addr = of_get_property(pcp->prom_node, "local-mac-address",
-                else
+                                       &len);
-                        node = -1;
+                if (addr && len == 6) {
+                        use_idprom = 0;
+                        memcpy(dev->dev_addr, addr, 6);
+                }
        }
-        if (node == -1)
+        if (use_idprom)
                memcpy(dev->dev_addr, idprom->id_ethaddr, 6);
 #elif defined(CONFIG_PPC_PMAC)
        unsigned char *addr;
diff --git a/drivers/net/sungem_phy.c b/drivers/net/sungem_phy.c
index 9282b4b0c022..278c7cb22216 100644
--- a/drivers/net/sungem_phy.c
+++ b/drivers/net/sungem_phy.c
@@ -19,7 +19,6 @@
 *    of darwin, still need to reverse engineer that
 */
-#include <linux/config.h>
 #include <linux/module.h>
diff --git a/drivers/net/sunhme.c b/drivers/net/sunhme.c
index 9f046cae2f71..8673fd4c08c7 100644
--- a/drivers/net/sunhme.c
+++ b/drivers/net/sunhme.c
@@ -1,9 +1,9 @@
-/* $Id: sunhme.c,v 1.124 2002/01/15 06:25:51 davem Exp $
+/* sunhme.c: Sparc HME/BigMac 10/100baseT half/full duplex auto switching,
- * sunhme.c: Sparc HME/BigMac 10/100baseT half/full duplex auto switching,
 *           auto carrier detecting ethernet driver.  Also known as the
 *           "Happy Meal Ethernet" found on SunSwift SBUS cards.
 *
- * Copyright (C) 1996, 1998, 1999, 2002, 2003 David S. Miller (davem@redhat.com)
+ * Copyright (C) 1996, 1998, 1999, 2002, 2003,
+                 2006 David S. Miller (davem@davemloft.net)
 *
 * Changes :
 * 2000/11/11 Willy Tarreau <willy AT meta-x.org>
@@ -13,7 +13,6 @@
 *     argument : macaddr=0x00,0x10,0x20,0x30,0x40,0x50
 */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
@@ -40,15 +39,13 @@
 #include <asm/dma.h>
 #include <asm/byteorder.h>
-#ifdef __sparc__
+#ifdef CONFIG_SPARC
 #include <asm/idprom.h>
 #include <asm/sbus.h>
 #include <asm/openprom.h>
 #include <asm/oplib.h>
+#include <asm/prom.h>
 #include <asm/auxio.h>
-#ifndef __sparc_v9__
-#include <asm/io-unit.h>
-#endif
 #endif
 #include <asm/uaccess.h>
@@ -57,7 +54,7 @@
 #ifdef CONFIG_PCI
 #include <linux/pci.h>
-#ifdef __sparc__
+#ifdef CONFIG_SPARC
 #include <asm/pbm.h>
 #endif
 #endif
@@ -65,9 +62,9 @@
 #include "sunhme.h"
 #define DRV_NAME        "sunhme"
-#define DRV_VERSION     "2.02"
+#define DRV_VERSION     "3.00"
-#define DRV_RELDATE     "8/24/03"
+#define DRV_RELDATE     "June 23, 2006"
-#define DRV_AUTHOR      "David S. Miller (davem@redhat.com)"
+#define DRV_AUTHOR      "David S. Miller (davem@davemloft.net)"
 static char version[] =
        DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE " " DRV_AUTHOR "\n";
@@ -83,8 +80,6 @@ static int macaddr[6];
 module_param_array(macaddr, int, NULL, 0);
 MODULE_PARM_DESC(macaddr, "Happy Meal MAC address to set");
-static struct happy_meal *root_happy_dev;
 #ifdef CONFIG_SBUS
 static struct quattro *qfe_sbus_list;
 #endif
@@ -181,26 +176,6 @@ static __inline__ void tx_dump_ring(struct happy_meal *hp)
 #define DEFAULT_IPG2       4 /* For all modes */
 #define DEFAULT_JAMSIZE    4 /* Toe jam */
-#if defined(CONFIG_PCI) && defined(MODULE)
-/* This happy_pci_ids is declared __initdata because it is only used
-   as an advisory to depmod.  If this is ported to the new PCI interface
-   where it could be referenced at any time due to hot plugging,
-   the __initdata reference should be removed. */
-static struct pci_device_id happymeal_pci_ids[] = {
-        {
-          .vendor       = PCI_VENDOR_ID_SUN,
-          .device       = PCI_DEVICE_ID_SUN_HAPPYMEAL,
-          .subvendor    = PCI_ANY_ID,
-          .subdevice    = PCI_ANY_ID,
-        },
-        { }                     /* Terminating entry */
-};
-MODULE_DEVICE_TABLE(pci, happymeal_pci_ids);
-#endif
 /* NOTE: In the descriptor writes one _must_ write the address
 *       member _first_.  The card must not be allowed to see
 *       the updated descriptor flags until the address is
@@ -1610,7 +1585,7 @@ static int happy_meal_init(struct happy_meal *hp)
        HMD(("happy_meal_init: old[%08x] bursts<",
             hme_read32(hp, gregs + GREG_CFG)));
-#ifndef __sparc__
+#ifndef CONFIG_SPARC
        /* It is always PCI and can handle 64byte bursts. */
        hme_write32(hp, gregs + GREG_CFG, GREG_CFG_BURST64);
 #else
@@ -1647,7 +1622,7 @@ static int happy_meal_init(struct happy_meal *hp)
                HMD(("XXX>"));
                hme_write32(hp, gregs + GREG_CFG, 0);
        }
-#endif /* __sparc__ */
+#endif /* CONFIG_SPARC */
        /* Turn off interrupts we do not want to hear. */
        HMD((", enable global interrupts, "));
@@ -2219,15 +2194,10 @@ static int happy_meal_open(struct net_device *dev)
         */
        if ((hp->happy_flags & (HFLAG_QUATTRO|HFLAG_PCI)) != HFLAG_QUATTRO) {
                if (request_irq(dev->irq, &happy_meal_interrupt,
-                                SA_SHIRQ, dev->name, (void *)dev)) {
+                                IRQF_SHARED, dev->name, (void *)dev)) {
                        HMD(("EAGAIN\n"));
-#ifdef __sparc__
-                        printk(KERN_ERR "happy_meal(SBUS): Can't order irq %s to go.\n",
-                               __irq_itoa(dev->irq));
-#else
                        printk(KERN_ERR "happy_meal(SBUS): Can't order irq %d to go.\n",
                               dev->irq);
-#endif
                        return -EAGAIN;
                }
@@ -2552,7 +2522,7 @@ static struct ethtool_ops hme_ethtool_ops = {
 static int hme_version_printed;
 #ifdef CONFIG_SBUS
-void __init quattro_get_ranges(struct quattro *qp)
+void __devinit quattro_get_ranges(struct quattro *qp)
 {
        struct sbus_dev *sdev = qp->quattro_dev;
        int err;
@@ -2568,7 +2538,7 @@ void __init quattro_get_ranges(struct quattro *qp)
        qp->nranges = (err / sizeof(struct linux_prom_ranges));
 }
-static void __init quattro_apply_ranges(struct quattro *qp, struct happy_meal *hp)
+static void __devinit quattro_apply_ranges(struct quattro *qp, struct happy_meal *hp)
 {
        struct sbus_dev *sdev = hp->happy_dev;
        int rng;
@@ -2595,16 +2565,12 @@ static void __init quattro_apply_ranges(struct quattro *qp, struct happy_meal *h
 *
 * Return NULL on failure.
 */
-static struct quattro * __init quattro_sbus_find(struct sbus_dev *goal_sdev)
+static struct quattro * __devinit quattro_sbus_find(struct sbus_dev *goal_sdev)
 {
-        struct sbus_bus *sbus;
        struct sbus_dev *sdev;
        struct quattro *qp;
        int i;
-        if (qfe_sbus_list == NULL)
-                goto found;
        for (qp = qfe_sbus_list; qp != NULL; qp = qp->next) {
                for (i = 0, sdev = qp->quattro_dev;
                     (sdev != NULL) && (i < 4);
@@ -2613,17 +2579,7 @@ static struct quattro * __init quattro_sbus_find(struct sbus_dev *goal_sdev)
                                return qp;
                }
        }
-        for_each_sbus(sbus) {
-                for_each_sbusdev(sdev, sbus) {
-                        if (sdev == goal_sdev)
-                                goto found;
-                }
-        }
-        /* Cannot find quattro parent, fail. */
-        return NULL;
-found:
        qp = kmalloc(sizeof(struct quattro), GFP_KERNEL);
        if (qp != NULL) {
                int i;
@@ -2652,7 +2608,7 @@ static void __init quattro_sbus_register_irqs(void)
                err = request_irq(sdev->irqs[0],
                                  quattro_sbus_interrupt,
-                                  SA_SHIRQ, "Quattro",
+                                  IRQF_SHARED, "Quattro",
                                  qp);
                if (err != 0) {
                        printk(KERN_ERR "Quattro: Fatal IRQ registery error %d.\n", err);
@@ -2660,6 +2616,17 @@ static void __init quattro_sbus_register_irqs(void)
                }
        }
 }
+static void quattro_sbus_free_irqs(void)
+{
+        struct quattro *qp;
+        for (qp = qfe_sbus_list; qp != NULL; qp = qp->next) {
+                struct sbus_dev *sdev = qp->quattro_dev;
+                free_irq(sdev->irqs[0], qp);
+        }
+}
 #endif /* CONFIG_SBUS */
 #ifdef CONFIG_PCI
@@ -2694,8 +2661,9 @@ static struct quattro * __init quattro_pci_find(struct pci_dev *pdev)
 #endif /* CONFIG_PCI */
 #ifdef CONFIG_SBUS
-static int __init happy_meal_sbus_init(struct sbus_dev *sdev, int is_qfe)
+static int __devinit happy_meal_sbus_probe_one(struct sbus_dev *sdev, int is_qfe)
 {
+        struct device_node *dp = sdev->ofdev.node;
        struct quattro *qp = NULL;
        struct happy_meal *hp;
        struct net_device *dev;
@@ -2718,6 +2686,7 @@ static int __init happy_meal_sbus_init(struct sbus_dev *sdev, int is_qfe)
        if (!dev)
                goto err_out;
        SET_MODULE_OWNER(dev);
+        SET_NETDEV_DEV(dev, &sdev->ofdev.dev);
        if (hme_version_printed++ == 0)
                printk(KERN_INFO "%s", version);
@@ -2733,13 +2702,16 @@ static int __init happy_meal_sbus_init(struct sbus_dev *sdev, int is_qfe)
                for (i = 0; i < 6; i++)
                        dev->dev_addr[i] = macaddr[i];
                macaddr[5]++;
-        } else if (qfe_slot != -1 &&
-                   prom_getproplen(sdev->prom_node,
-                                   "local-mac-address") == 6) {
-                prom_getproperty(sdev->prom_node, "local-mac-address",
-                                 dev->dev_addr, 6);
        } else {
-                memcpy(dev->dev_addr, idprom->id_ethaddr, 6);
+                unsigned char *addr;
+                int len;
+                addr = of_get_property(dp, "local-mac-address", &len);
+                if (qfe_slot != -1 && addr && len == 6)
+                        memcpy(dev->dev_addr, addr, 6);
+                else
+                        memcpy(dev->dev_addr, idprom->id_ethaddr, 6);
        }
        hp = dev->priv;
@@ -2750,9 +2722,8 @@ static int __init happy_meal_sbus_init(struct sbus_dev *sdev, int is_qfe)
        err = -ENODEV;
        if (sdev->num_registers != 5) {
-                printk(KERN_ERR "happymeal: Device does not have 5 regs, it has %d.\n",
+                printk(KERN_ERR "happymeal: Device needs 5 regs, has %d.\n",
                       sdev->num_registers);
-                printk(KERN_ERR "happymeal: Would you like that for here or to go?\n");
                goto err_out_free_netdev;
        }
@@ -2766,39 +2737,39 @@ static int __init happy_meal_sbus_init(struct sbus_dev *sdev, int is_qfe)
        hp->gregs = sbus_ioremap(&sdev->resource[0], 0,
                                 GREG_REG_SIZE, "HME Global Regs");
        if (!hp->gregs) {
-                printk(KERN_ERR "happymeal: Cannot map Happy Meal global registers.\n");
+                printk(KERN_ERR "happymeal: Cannot map global registers.\n");
                goto err_out_free_netdev;
        }
        hp->etxregs = sbus_ioremap(&sdev->resource[1], 0,
                                   ETX_REG_SIZE, "HME TX Regs");
        if (!hp->etxregs) {
-                printk(KERN_ERR "happymeal: Cannot map Happy Meal MAC Transmit registers.\n");
+                printk(KERN_ERR "happymeal: Cannot map MAC TX registers.\n");
                goto err_out_iounmap;
        }
        hp->erxregs = sbus_ioremap(&sdev->resource[2], 0,
                                   ERX_REG_SIZE, "HME RX Regs");
        if (!hp->erxregs) {
-                printk(KERN_ERR "happymeal: Cannot map Happy Meal MAC Receive registers.\n");
+                printk(KERN_ERR "happymeal: Cannot map MAC RX registers.\n");
                goto err_out_iounmap;
        }
        hp->bigmacregs = sbus_ioremap(&sdev->resource[3], 0,
                                      BMAC_REG_SIZE, "HME BIGMAC Regs");
        if (!hp->bigmacregs) {
-                printk(KERN_ERR "happymeal: Cannot map Happy Meal BIGMAC registers.\n");
+                printk(KERN_ERR "happymeal: Cannot map BIGMAC registers.\n");
                goto err_out_iounmap;
        }
        hp->tcvregs = sbus_ioremap(&sdev->resource[4], 0,
                                   TCVR_REG_SIZE, "HME Tranceiver Regs");
        if (!hp->tcvregs) {
-                printk(KERN_ERR "happymeal: Cannot map Happy Meal Tranceiver registers.\n");
+                printk(KERN_ERR "happymeal: Cannot map TCVR registers.\n");
                goto err_out_iounmap;
        }
-        hp->hm_revision = prom_getintdefault(sdev->prom_node, "hm-rev", 0xff);
+        hp->hm_revision = of_getintprop_default(dp, "hm-rev", 0xff);
        if (hp->hm_revision == 0xff)
                hp->hm_revision = 0xa0;
@@ -2812,8 +2783,8 @@ static int __init happy_meal_sbus_init(struct sbus_dev *sdev, int is_qfe)
                hp->happy_flags |= HFLAG_QUATTRO;
        /* Get the supported DVMA burst sizes from our Happy SBUS. */
-        hp->happy_bursts = prom_getintdefault(sdev->bus->prom_node,
+        hp->happy_bursts = of_getintprop_default(sdev->bus->ofdev.node,
-                                              "burst-sizes", 0x00);
+                                                 "burst-sizes", 0x00);
        hp->happy_block = sbus_alloc_consistent(hp->happy_dev,
                                                PAGE_SIZE,
@@ -2876,6 +2847,8 @@ static int __init happy_meal_sbus_init(struct sbus_dev *sdev, int is_qfe)
                goto err_out_free_consistent;
        }
+        dev_set_drvdata(&sdev->ofdev.dev, hp);
        if (qfe_slot != -1)
                printk(KERN_INFO "%s: Quattro HME slot %d (SBUS) 10/100baseT Ethernet ",
                       dev->name, qfe_slot);
@@ -2888,12 +2861,6 @@ static int __init happy_meal_sbus_init(struct sbus_dev *sdev, int is_qfe)
                       dev->dev_addr[i], i == 5 ? ' ' : ':');
        printk("\n");
-        /* We are home free at this point, link us in to the happy
-         * device list.
-         */
-        hp->next_module = root_happy_dev;
-        root_happy_dev = hp;
        return 0;
 err_out_free_consistent:
@@ -2923,7 +2890,7 @@ err_out:
 #endif
 #ifdef CONFIG_PCI
-#ifndef __sparc__
+#ifndef CONFIG_SPARC
 static int is_quattro_p(struct pci_dev *pdev)
 {
        struct pci_dev *busdev = pdev->bus->self;
@@ -3011,14 +2978,14 @@ static void get_hme_mac_nonsparc(struct pci_dev *pdev, unsigned char *dev_addr)
        get_random_bytes(&dev_addr[3], 3);
        return;
 }
-#endif /* !(__sparc__) */
+#endif /* !(CONFIG_SPARC) */
-static int __init happy_meal_pci_init(struct pci_dev *pdev)
+static int __devinit happy_meal_pci_probe(struct pci_dev *pdev,
+                                          const struct pci_device_id *ent)
 {
        struct quattro *qp = NULL;
-#ifdef __sparc__
+#ifdef CONFIG_SPARC
        struct pcidev_cookie *pcp;
-        int node;
 #endif
        struct happy_meal *hp;
        struct net_device *dev;
@@ -3029,15 +2996,14 @@ static int __init happy_meal_pci_init(struct pci_dev *pdev)
        int err;
        /* Now make sure pci_dev cookie is there. */
-#ifdef __sparc__
+#ifdef CONFIG_SPARC
        pcp = pdev->sysdata;
-        if (pcp == NULL || pcp->prom_node == -1) {
+        if (pcp == NULL) {
                printk(KERN_ERR "happymeal(PCI): Some PCI device info missing\n");
                return -ENODEV;
        }
-        node = pcp->prom_node;
        
-        prom_getstring(node, "name", prom_name, sizeof(prom_name));
+        strcpy(prom_name, pcp->prom_node->name);
 #else
        if (is_quattro_p(pdev))
                strcpy(prom_name, "SUNW,qfe");
@@ -3108,11 +3074,15 @@ static int __init happy_meal_pci_init(struct pci_dev *pdev)
                        dev->dev_addr[i] = macaddr[i];
                macaddr[5]++;
        } else {
-#ifdef __sparc__
+#ifdef CONFIG_SPARC
+                unsigned char *addr;
+                int len;
                if (qfe_slot != -1 &&
-                    prom_getproplen(node, "local-mac-address") == 6) {
+                    (addr = of_get_property(pcp->prom_node,
-                        prom_getproperty(node, "local-mac-address",
+                                            "local-mac-address", &len)) != NULL
-                                         dev->dev_addr, 6);
+                    && len == 6) {
+                        memcpy(dev->dev_addr, addr, 6);
                } else {
                        memcpy(dev->dev_addr, idprom->id_ethaddr, 6);
                }
@@ -3128,8 +3098,8 @@ static int __init happy_meal_pci_init(struct pci_dev *pdev)
        hp->bigmacregs = (hpreg_base + 0x6000UL);
        hp->tcvregs    = (hpreg_base + 0x7000UL);
-#ifdef __sparc__
+#ifdef CONFIG_SPARC
-        hp->hm_revision = prom_getintdefault(node, "hm-rev", 0xff);
+        hp->hm_revision = of_getintprop_default(pcp->prom_node, "hm-rev", 0xff);
        if (hp->hm_revision == 0xff) {
                unsigned char prev;
@@ -3153,7 +3123,7 @@ static int __init happy_meal_pci_init(struct pci_dev *pdev)
        /* And of course, indicate this is PCI. */
        hp->happy_flags |= HFLAG_PCI;
-#ifdef __sparc__
+#ifdef CONFIG_SPARC
        /* Assume PCI happy meals can handle all burst sizes. */
        hp->happy_bursts = DMA_BURSTBITS;
 #endif
@@ -3216,6 +3186,8 @@ static int __init happy_meal_pci_init(struct pci_dev *pdev)
                goto err_out_iounmap;
        }
+        dev_set_drvdata(&pdev->dev, hp);
        if (!qfe_slot) {
                struct pci_dev *qpdev = qp->quattro_dev;
@@ -3245,12 +3217,6 @@ static int __init happy_meal_pci_init(struct pci_dev *pdev)
        printk("\n");
-        /* We are home free at this point, link us in to the happy
-         * device list.
-         */
-        hp->next_module = root_happy_dev;
-        root_happy_dev = hp;
        return 0;
 err_out_iounmap:
@@ -3268,136 +3234,146 @@ err_out_clear_quattro:
 err_out:
        return err;
 }
-#endif
-#ifdef CONFIG_SBUS
+static void __devexit happy_meal_pci_remove(struct pci_dev *pdev)
-static int __init happy_meal_sbus_probe(void)
 {
-        struct sbus_bus *sbus;
+        struct happy_meal *hp = dev_get_drvdata(&pdev->dev);
-        struct sbus_dev *sdev;
+        struct net_device *net_dev = hp->dev;
-        int cards = 0;
-        char model[128];
+        unregister_netdev(net_dev);
-        for_each_sbus(sbus) {
+        pci_free_consistent(hp->happy_dev,
-                for_each_sbusdev(sdev, sbus) {
+                            PAGE_SIZE,
-                        char *name = sdev->prom_name;
+                            hp->happy_block,
+                            hp->hblock_dvma);
-                        if (!strcmp(name, "SUNW,hme")) {
+        iounmap(hp->gregs);
-                                cards++;
+        pci_release_regions(hp->happy_dev);
-                                prom_getstring(sdev->prom_node, "model",
-                                               model, sizeof(model));
+        free_netdev(net_dev);
-                                if (!strcmp(model, "SUNW,sbus-qfe"))
-                                        happy_meal_sbus_init(sdev, 1);
+        dev_set_drvdata(&pdev->dev, NULL);
-                                else
-                                        happy_meal_sbus_init(sdev, 0);
-                        } else if (!strcmp(name, "qfe") ||
-                                   !strcmp(name, "SUNW,qfe")) {
-                                cards++;
-                                happy_meal_sbus_init(sdev, 1);
-                        }
-                }
-        }
-        if (cards != 0)
-                quattro_sbus_register_irqs();
-        return cards;
 }
-#endif
-#ifdef CONFIG_PCI
+static struct pci_device_id happymeal_pci_ids[] = {
-static int __init happy_meal_pci_probe(void)
+        {
+          .vendor       = PCI_VENDOR_ID_SUN,
+          .device       = PCI_DEVICE_ID_SUN_HAPPYMEAL,
+          .subvendor    = PCI_ANY_ID,
+          .subdevice    = PCI_ANY_ID,
+        },
+        { }                     /* Terminating entry */
+};
+MODULE_DEVICE_TABLE(pci, happymeal_pci_ids);
+static struct pci_driver hme_pci_driver = {
+        .name           = "hme",
+        .id_table       = happymeal_pci_ids,
+        .probe          = happy_meal_pci_probe,
+        .remove         = __devexit_p(happy_meal_pci_remove),
+};
+static int __init happy_meal_pci_init(void)
 {
-        struct pci_dev *pdev = NULL;
+        return pci_module_init(&hme_pci_driver);
-        int cards = 0;
+}
-        while ((pdev = pci_find_device(PCI_VENDOR_ID_SUN,
+static void happy_meal_pci_exit(void)
-                                       PCI_DEVICE_ID_SUN_HAPPYMEAL, pdev)) != NULL) {
+{
-                if (pci_enable_device(pdev))
+        pci_unregister_driver(&hme_pci_driver);
-                        continue;
-                pci_set_master(pdev);
+        while (qfe_pci_list) {
-                cards++;
+                struct quattro *qfe = qfe_pci_list;
-                happy_meal_pci_init(pdev);
+                struct quattro *next = qfe->next;
+                kfree(qfe);
+                qfe_pci_list = next;
        }
-        return cards;
 }
 #endif
-static int __init happy_meal_probe(void)
+#ifdef CONFIG_SBUS
+static int __devinit hme_sbus_probe(struct of_device *dev, const struct of_device_id *match)
 {
-        static int called = 0;
+        struct sbus_dev *sdev = to_sbus_device(&dev->dev);
-        int cards;
+        struct device_node *dp = dev->node;
+        char *model = of_get_property(dp, "model", NULL);
+        int is_qfe = (match->data != NULL);
-        root_happy_dev = NULL;
+        if (!is_qfe && model && !strcmp(model, "SUNW,sbus-qfe"))
+                is_qfe = 1;
-        if (called)
+        return happy_meal_sbus_probe_one(sdev, is_qfe);
-                return -ENODEV;
+}
-        called++;
+static int __devexit hme_sbus_remove(struct of_device *dev)
+{
+        struct happy_meal *hp = dev_get_drvdata(&dev->dev);
+        struct net_device *net_dev = hp->dev;
+        unregister_netdevice(net_dev);
+        /* XXX qfe parent interrupt... */
+        sbus_iounmap(hp->gregs, GREG_REG_SIZE);
+        sbus_iounmap(hp->etxregs, ETX_REG_SIZE);
+        sbus_iounmap(hp->erxregs, ERX_REG_SIZE);
+        sbus_iounmap(hp->bigmacregs, BMAC_REG_SIZE);
+        sbus_iounmap(hp->tcvregs, TCVR_REG_SIZE);
+        sbus_free_consistent(hp->happy_dev,
+                             PAGE_SIZE,
+                             hp->happy_block,
+                             hp->hblock_dvma);
+        free_netdev(net_dev);
+        dev_set_drvdata(&dev->dev, NULL);
-        cards = 0;
-#ifdef CONFIG_SBUS
-        cards += happy_meal_sbus_probe();
-#endif
-#ifdef CONFIG_PCI
-        cards += happy_meal_pci_probe();
-#endif
-        if (!cards)
-                return -ENODEV;
        return 0;
 }
+static struct of_device_id hme_sbus_match[] = {
+        {
+                .name = "SUNW,hme",
+        },
+        {
+                .name = "SUNW,qfe",
+                .data = (void *) 1,
+        },
+        {
+                .name = "qfe",
+                .data = (void *) 1,
+        },
+        {},
+};
-static void __exit happy_meal_cleanup_module(void)
+MODULE_DEVICE_TABLE(of, hme_sbus_match);
-{
-#ifdef CONFIG_SBUS
-        struct quattro *last_seen_qfe = NULL;
-#endif
-        while (root_happy_dev) {
+static struct of_platform_driver hme_sbus_driver = {
-                struct happy_meal *hp = root_happy_dev;
+        .name           = "hme",
-                struct happy_meal *next = root_happy_dev->next_module;
+        .match_table    = hme_sbus_match,
-                struct net_device *dev = hp->dev;
+        .probe          = hme_sbus_probe,
+        .remove         = __devexit_p(hme_sbus_remove),
+};
-                /* Unregister netdev before unmapping registers as this
+static int __init happy_meal_sbus_init(void)
-                 * call can end up trying to access those registers.
+{
-                 */
+        int err;
-                unregister_netdev(dev);
-#ifdef CONFIG_SBUS
+        err = of_register_driver(&hme_sbus_driver, &sbus_bus_type);
-                if (!(hp->happy_flags & HFLAG_PCI)) {
+        if (!err)
-                        if (hp->happy_flags & HFLAG_QUATTRO) {
+                quattro_sbus_register_irqs();
-                                if (hp->qfe_parent != last_seen_qfe) {
-                                        free_irq(dev->irq, hp->qfe_parent);
-                                        last_seen_qfe = hp->qfe_parent;
-                                }
-                        }
-                        sbus_iounmap(hp->gregs, GREG_REG_SIZE);
+        return err;
-                        sbus_iounmap(hp->etxregs, ETX_REG_SIZE);
+}
-                        sbus_iounmap(hp->erxregs, ERX_REG_SIZE);
-                        sbus_iounmap(hp->bigmacregs, BMAC_REG_SIZE);
-                        sbus_iounmap(hp->tcvregs, TCVR_REG_SIZE);
-                        sbus_free_consistent(hp->happy_dev,
-                                             PAGE_SIZE,
-                                             hp->happy_block,
-                                             hp->hblock_dvma);
-                }
-#endif
-#ifdef CONFIG_PCI
-                if ((hp->happy_flags & HFLAG_PCI)) {
-                        pci_free_consistent(hp->happy_dev,
-                                            PAGE_SIZE,
-                                            hp->happy_block,
-                                            hp->hblock_dvma);
-                        iounmap(hp->gregs);
-                        pci_release_regions(hp->happy_dev);
-                }
-#endif
-                free_netdev(dev);
-                root_happy_dev = next;
+static void happy_meal_sbus_exit(void)
-        }
+{
+        of_unregister_driver(&hme_sbus_driver);
+        quattro_sbus_free_irqs();
-        /* Now cleanup the quattro lists. */
-#ifdef CONFIG_SBUS
        while (qfe_sbus_list) {
                struct quattro *qfe = qfe_sbus_list;
                struct quattro *next = qfe->next;
@@ -3406,18 +3382,39 @@ static void __exit happy_meal_cleanup_module(void)
                qfe_sbus_list = next;
        }
+}
 #endif
-#ifdef CONFIG_PCI
-        while (qfe_pci_list) {
-                struct quattro *qfe = qfe_pci_list;
-                struct quattro *next = qfe->next;
-                kfree(qfe);
+static int __init happy_meal_probe(void)
+{
+        int err = 0;
-                qfe_pci_list = next;
+#ifdef CONFIG_SBUS
+        err = happy_meal_sbus_init();
+#endif
+#ifdef CONFIG_PCI
+        if (!err) {
+                err = happy_meal_pci_init();
+#ifdef CONFIG_SBUS
+                if (err)
+                        happy_meal_sbus_exit();
+#endif
        }
 #endif
+        return err;
+}
+static void __exit happy_meal_exit(void)
+{
+#ifdef CONFIG_SBUS
+        happy_meal_sbus_exit();
+#endif
+#ifdef CONFIG_PCI
+        happy_meal_pci_exit();
+#endif
 }
 module_init(happy_meal_probe);
-module_exit(happy_meal_cleanup_module);
+module_exit(happy_meal_exit);
diff --git a/drivers/net/sunhme.h b/drivers/net/sunhme.h
index 34e9f953cea4..90f446db9ba2 100644
--- a/drivers/net/sunhme.h
+++ b/drivers/net/sunhme.h
@@ -8,7 +8,6 @@
 #ifndef _SUNHME_H
 #define _SUNHME_H
-#include <linux/config.h>
 #include <linux/pci.h>
 /* Happy Meal global registers. */
@@ -461,7 +460,6 @@ struct happy_meal {
        struct net_device        *dev;          /* Backpointer                       */
        struct quattro           *qfe_parent;   /* For Quattro cards                 */
        int                       qfe_ent;      /* Which instance on quattro         */
-        struct happy_meal         *next_module;
 };
 /* Here are the happy flags. */
diff --git a/drivers/net/sunlance.c b/drivers/net/sunlance.c
index b7d87d4690b4..1ef9fd39a79a 100644
--- a/drivers/net/sunlance.c
+++ b/drivers/net/sunlance.c
@@ -71,7 +71,6 @@
 static char lancestr[] = "LANCE";
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
@@ -266,7 +265,6 @@ struct lance_private {
        char                   *name;
        dma_addr_t              init_block_dvma;
        struct net_device      *dev;              /* Backpointer        */
-        struct lance_private   *next_module;
        struct sbus_dev        *sdev;
        struct timer_list       multicast_timer;
 };
@@ -298,8 +296,6 @@ int sparc_lance_debug = 2;
 #define LANCE_ADDR(x) ((long)(x) & ~0xff000000)
-static struct lance_private *root_lance_dev;
 /* Load the CSR registers */
 static void load_csrs(struct lance_private *lp)
 {
@@ -934,9 +930,9 @@ static int lance_open(struct net_device *dev)
        STOP_LANCE(lp);
-        if (request_irq(dev->irq, &lance_interrupt, SA_SHIRQ,
+        if (request_irq(dev->irq, &lance_interrupt, IRQF_SHARED,
                        lancestr, (void *) dev)) {
-                printk(KERN_ERR "Lance: Can't get irq %s\n", __irq_itoa(dev->irq));
+                printk(KERN_ERR "Lance: Can't get irq %d\n", dev->irq);
                return -EAGAIN;
        }
@@ -1327,9 +1323,9 @@ static struct ethtool_ops sparc_lance_ethtool_ops = {
        .get_link               = sparc_lance_get_link,
 };
-static int __init sparc_lance_init(struct sbus_dev *sdev,
+static int __init sparc_lance_probe_one(struct sbus_dev *sdev,
-                                   struct sbus_dma *ledma,
+                                        struct sbus_dma *ledma,
-                                   struct sbus_dev *lebuffer)
+                                        struct sbus_dev *lebuffer)
 {
        static unsigned version_printed;
        struct net_device *dev;
@@ -1473,6 +1469,7 @@ no_link_test:
        lp->dev = dev;
        SET_MODULE_OWNER(dev);
+        SET_NETDEV_DEV(dev, &sdev->ofdev.dev);
        dev->open = &lance_open;
        dev->stop = &lance_close;
        dev->hard_start_xmit = &lance_start_xmit;
@@ -1500,8 +1497,7 @@ no_link_test:
                goto fail;
        }
-        lp->next_module = root_lance_dev;
+        dev_set_drvdata(&sdev->ofdev.dev, lp);
-        root_lance_dev = lp;
        printk(KERN_INFO "%s: LANCE ", dev->name);
@@ -1536,88 +1532,112 @@ static inline struct sbus_dma *find_ledma(struct sbus_dev *sdev)
 #include <asm/machines.h>
 /* Find all the lance cards on the system and initialize them */
-static int __init sparc_lance_probe(void)
+static struct sbus_dev sun4_sdev;
+static int __init sparc_lance_init(void)
 {
-        static struct sbus_dev sdev;
-        static int called;
-        root_lance_dev = NULL;
-        if (called)
-                return -ENODEV;
-        called++;
        if ((idprom->id_machtype == (SM_SUN4|SM_4_330)) ||
            (idprom->id_machtype == (SM_SUN4|SM_4_470))) {
-                memset(&sdev, 0, sizeof(sdev));
+                memset(&sun4_sdev, 0, sizeof(sdev));
-                sdev.reg_addrs[0].phys_addr = sun4_eth_physaddr;
+                sun4_sdev.reg_addrs[0].phys_addr = sun4_eth_physaddr;
-                sdev.irqs[0] = 6;
+                sun4_sdev.irqs[0] = 6;
-                return sparc_lance_init(&sdev, NULL, NULL);
+                return sparc_lance_probe_one(&sun4_sdev, NULL, NULL);
        }
        return -ENODEV;
 }
-#else /* !CONFIG_SUN4 */
+static int __exit sunlance_sun4_remove(void)
-/* Find all the lance cards on the system and initialize them */
-static int __init sparc_lance_probe(void)
 {
-        struct sbus_bus *bus;
+        struct lance_private *lp = dev_get_drvdata(&sun4_sdev->dev);
-        struct sbus_dev *sdev = NULL;
+        struct net_device *net_dev = lp->dev;
-        struct sbus_dma *ledma = NULL;
-        static int called;
+        unregister_netdevice(net_dev);
-        int cards = 0, v;
+        lance_free_hwresources(root_lance_dev);
-        root_lance_dev = NULL;
+        free_netdev(net_dev);
-        if (called)
-                return -ENODEV;
+        dev_set_drvdata(&sun4_sdev->dev, NULL);
-        called++;
-        for_each_sbus (bus) {
-                for_each_sbusdev (sdev, bus) {
-                        if (strcmp(sdev->prom_name, "le") == 0) {
-                                cards++;
-                                if ((v = sparc_lance_init(sdev, NULL, NULL)))
-                                        return v;
-                                continue;
-                        }
-                        if (strcmp(sdev->prom_name, "ledma") == 0) {
-                                cards++;
-                                ledma = find_ledma(sdev);
-                                if ((v = sparc_lance_init(sdev->child,
-                                                          ledma, NULL)))
-                                        return v;
-                                continue;
-                        }
-                        if (strcmp(sdev->prom_name, "lebuffer") == 0){
-                                cards++;
-                                if ((v = sparc_lance_init(sdev->child,
-                                                          NULL, sdev)))
-                                        return v;
-                                continue;
-                        }
-                } /* for each sbusdev */
-        } /* for each sbus */
-        if (!cards)
-                return -ENODEV;
        return 0;
 }
-#endif /* !CONFIG_SUN4 */
-static void __exit sparc_lance_cleanup(void)
+#else /* !CONFIG_SUN4 */
+static int __devinit sunlance_sbus_probe(struct of_device *dev, const struct of_device_id *match)
 {
-        struct lance_private *lp;
+        struct sbus_dev *sdev = to_sbus_device(&dev->dev);
+        struct device_node *dp = dev->node;
+        int err;
+        if (!strcmp(dp->name, "le")) {
+                err = sparc_lance_probe_one(sdev, NULL, NULL);
+        } else if (!strcmp(dp->name, "ledma")) {
+                struct sbus_dma *ledma = find_ledma(sdev);
-        while (root_lance_dev) {
+                err = sparc_lance_probe_one(sdev->child, ledma, NULL);
-                lp = root_lance_dev->next_module;
+        } else {
+                BUG_ON(strcmp(dp->name, "lebuffer"));
-                unregister_netdev(root_lance_dev->dev);
+                err = sparc_lance_probe_one(sdev->child, NULL, sdev);
-                lance_free_hwresources(root_lance_dev);
-                free_netdev(root_lance_dev->dev);
-                root_lance_dev = lp;
        }
+        return err;
+}
+static int __devexit sunlance_sbus_remove(struct of_device *dev)
+{
+        struct lance_private *lp = dev_get_drvdata(&dev->dev);
+        struct net_device *net_dev = lp->dev;
+        unregister_netdevice(net_dev);
+        lance_free_hwresources(lp);
+        free_netdev(net_dev);
+        dev_set_drvdata(&dev->dev, NULL);
+        return 0;
+}
+static struct of_device_id sunlance_sbus_match[] = {
+        {
+                .name = "le",
+        },
+        {
+                .name = "ledma",
+        },
+        {
+                .name = "lebuffer",
+        },
+        {},
+};
+MODULE_DEVICE_TABLE(of, sunlance_sbus_match);
+static struct of_platform_driver sunlance_sbus_driver = {
+        .name           = "sunlance",
+        .match_table    = sunlance_sbus_match,
+        .probe          = sunlance_sbus_probe,
+        .remove         = __devexit_p(sunlance_sbus_remove),
+};
+/* Find all the lance cards on the system and initialize them */
+static int __init sparc_lance_init(void)
+{
+        return of_register_driver(&sunlance_sbus_driver, &sbus_bus_type);
+}
+#endif /* !CONFIG_SUN4 */
+static void __exit sparc_lance_exit(void)
+{
+#ifdef CONFIG_SUN4
+        sunlance_sun4_remove();
+#else
+        of_unregister_driver(&sunlance_sbus_driver);
+#endif
 }
-module_init(sparc_lance_probe);
+module_init(sparc_lance_init);
-module_exit(sparc_lance_cleanup);
+module_exit(sparc_lance_exit);
diff --git a/drivers/net/sunqe.c b/drivers/net/sunqe.c
index 1f2323be60d4..817a40b66638 100644
--- a/drivers/net/sunqe.c
+++ b/drivers/net/sunqe.c
@@ -1,10 +1,9 @@
-/* $Id: sunqe.c,v 1.55 2002/01/15 06:48:55 davem Exp $
+/* sunqe.c: Sparc QuadEthernet 10baseT SBUS card driver.
- * sunqe.c: Sparc QuadEthernet 10baseT SBUS card driver.
 *          Once again I am out to prove that every ethernet
 *          controller out there can be most efficiently programmed
 *          if you make it look like a LANCE.
 *
- * Copyright (C) 1996, 1999, 2003 David S. Miller (davem@redhat.com)
+ * Copyright (C) 1996, 1999, 2003, 2006 David S. Miller (davem@davemloft.net)
 */
 #include <linux/module.h>
@@ -41,9 +40,9 @@
 #include "sunqe.h"
 #define DRV_NAME        "sunqe"
-#define DRV_VERSION     "3.0"
+#define DRV_VERSION     "4.0"
-#define DRV_RELDATE     "8/24/03"
+#define DRV_RELDATE     "June 23, 2006"
-#define DRV_AUTHOR      "David S. Miller (davem@redhat.com)"
+#define DRV_AUTHOR      "David S. Miller (davem@davemloft.net)"
 static char version[] =
        DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE " " DRV_AUTHOR "\n";
@@ -755,298 +754,269 @@ static inline void qec_init_once(struct sunqec *qecp, struct sbus_dev *qsdev)
                    qecp->gregs + GLOB_RSIZE);
 }
-/* Four QE's per QEC card. */
+static u8 __init qec_get_burst(struct device_node *dp)
-static int __init qec_ether_init(struct net_device *dev, struct sbus_dev *sdev)
 {
-        static unsigned version_printed;
-        struct net_device *qe_devs[4];
-        struct sunqe *qeps[4];
-        struct sbus_dev *qesdevs[4];
-        struct sbus_dev *child;
-        struct sunqec *qecp = NULL;
        u8 bsizes, bsizes_more;
-        int i, j, res = -ENOMEM;
-        for (i = 0; i < 4; i++) {
+        /* Find and set the burst sizes for the QEC, since it
-                qe_devs[i] = alloc_etherdev(sizeof(struct sunqe));
+         * does the actual dma for all 4 channels.
-                if (!qe_devs[i])
+         */
-                        goto out;
+        bsizes = of_getintprop_default(dp, "burst-sizes", 0xff);
-        }
+        bsizes &= 0xff;
+        bsizes_more = of_getintprop_default(dp->parent, "burst-sizes", 0xff);
-        if (version_printed++ == 0)
+        if (bsizes_more != 0xff)
-                printk(KERN_INFO "%s", version);
+                bsizes &= bsizes_more;
+        if (bsizes == 0xff || (bsizes & DMA_BURST16) == 0 ||
+            (bsizes & DMA_BURST32)==0)
+                bsizes = (DMA_BURST32 - 1);
-        for (i = 0; i < 4; i++) {
+        return bsizes;
-                qeps[i] = (struct sunqe *) qe_devs[i]->priv;
+}
-                for (j = 0; j < 6; j++)
-                        qe_devs[i]->dev_addr[j] = idprom->id_ethaddr[j];
-                qeps[i]->channel = i;
-                spin_lock_init(&qeps[i]->lock);
-        }
-        qecp = kmalloc(sizeof(struct sunqec), GFP_KERNEL);
+static struct sunqec * __init get_qec(struct sbus_dev *child_sdev)
-        if (qecp == NULL)
+{
-                goto out1;
+        struct sbus_dev *qec_sdev = child_sdev->parent;
-        qecp->qec_sdev = sdev;
+        struct sunqec *qecp;
-        for (i = 0; i < 4; i++) {
+        for (qecp = root_qec_dev; qecp; qecp = qecp->next_module) {
-                qecp->qes[i] = qeps[i];
+                if (qecp->qec_sdev == qec_sdev)
-                qeps[i]->dev = qe_devs[i];
+                        break;
-                qeps[i]->parent = qecp;
        }
+        if (!qecp) {
+                qecp = kzalloc(sizeof(struct sunqec), GFP_KERNEL);
+                if (qecp) {
+                        u32 ctrl;
+                        qecp->qec_sdev = qec_sdev;
+                        qecp->gregs = sbus_ioremap(&qec_sdev->resource[0], 0,
+                                                   GLOB_REG_SIZE,
+                                                   "QEC Global Registers");
+                        if (!qecp->gregs)
+                                goto fail;
+                        /* Make sure the QEC is in MACE mode. */
+                        ctrl = sbus_readl(qecp->gregs + GLOB_CTRL);
+                        ctrl &= 0xf0000000;
+                        if (ctrl != GLOB_CTRL_MMODE) {
+                                printk(KERN_ERR "qec: Not in MACE mode!\n");
+                                goto fail;
+                        }
-        res = -ENODEV;
+                        if (qec_global_reset(qecp->gregs))
+                                goto fail;
-        for (i = 0, child = sdev->child; i < 4; i++, child = child->next) {
+                        qecp->qec_bursts = qec_get_burst(qec_sdev->ofdev.node);
-                /* Link in channel */
-                j = prom_getintdefault(child->prom_node, "channel#", -1);
-                if (j == -1)
-                        goto out2;
-                qesdevs[j] = child;
-        }
-        for (i = 0; i < 4; i++)
+                        qec_init_once(qecp, qec_sdev);
-                qeps[i]->qe_sdev = qesdevs[i];
-        /* Now map in the registers, QEC globals first. */
+                        if (request_irq(qec_sdev->irqs[0], &qec_interrupt,
-        qecp->gregs = sbus_ioremap(&sdev->resource[0], 0,
+                                        IRQF_SHARED, "qec", (void *) qecp)) {
-                                   GLOB_REG_SIZE, "QEC Global Registers");
+                                printk(KERN_ERR "qec: Can't register irq.\n");
-        if (!qecp->gregs) {
+                                goto fail;
-                printk(KERN_ERR "QuadEther: Cannot map QEC global registers.\n");
+                        }
-                goto out2;
-        }
-        /* Make sure the QEC is in MACE mode. */
+                        qecp->next_module = root_qec_dev;
-        if ((sbus_readl(qecp->gregs + GLOB_CTRL) & 0xf0000000) != GLOB_CTRL_MMODE) {
+                        root_qec_dev = qecp;
-                printk(KERN_ERR "QuadEther: AIEEE, QEC is not in MACE mode!\n");
+                }
-                goto out3;
        }
-        /* Reset the QEC. */
+        return qecp;
-        if (qec_global_reset(qecp->gregs))
-                goto out3;
-        /* Find and set the burst sizes for the QEC, since it does
+fail:
-         * the actual dma for all 4 channels.
+        if (qecp->gregs)
-         */
+                sbus_iounmap(qecp->gregs, GLOB_REG_SIZE);
-        bsizes = prom_getintdefault(sdev->prom_node, "burst-sizes", 0xff);
+        kfree(qecp);
-        bsizes &= 0xff;
+        return NULL;
-        bsizes_more = prom_getintdefault(sdev->bus->prom_node, "burst-sizes", 0xff);
+}
-        if (bsizes_more != 0xff)
+static int __init qec_ether_init(struct sbus_dev *sdev)
-                bsizes &= bsizes_more;
+{
-        if (bsizes == 0xff || (bsizes & DMA_BURST16) == 0 ||
+        static unsigned version_printed;
-           (bsizes & DMA_BURST32)==0)
+        struct net_device *dev;
-                bsizes = (DMA_BURST32 - 1);
+        struct sunqe *qe;
+        struct sunqec *qecp;
+        int i, res;
-        qecp->qec_bursts = bsizes;
+        if (version_printed++ == 0)
+                printk(KERN_INFO "%s", version);
-        /* Perform one time QEC initialization, we never touch the QEC
+        dev = alloc_etherdev(sizeof(struct sunqe));
-         * globals again after this.
+        if (!dev)
-         */
+                return -ENOMEM;
-        qec_init_once(qecp, sdev);
-        for (i = 0; i < 4; i++) {
-                struct sunqe *qe = qeps[i];
-                /* Map in QEC per-channel control registers. */
-                qe->qcregs = sbus_ioremap(&qe->qe_sdev->resource[0], 0,
-                                       CREG_REG_SIZE, "QEC Channel Registers");
-                if (!qe->qcregs) {
-                        printk(KERN_ERR "QuadEther: Cannot map QE %d's channel registers.\n", i);
-                        goto out4;
-                }
-                /* Map in per-channel AMD MACE registers. */
+        qe = netdev_priv(dev);
-                qe->mregs = sbus_ioremap(&qe->qe_sdev->resource[1], 0,
-                                      MREGS_REG_SIZE, "QE MACE Registers");
-                if (!qe->mregs) {
-                        printk(KERN_ERR "QuadEther: Cannot map QE %d's MACE registers.\n", i);
-                        goto out4;
-                }
-                qe->qe_block = sbus_alloc_consistent(qe->qe_sdev,
+        i = of_getintprop_default(sdev->ofdev.node, "channel#", -1);
-                                                  PAGE_SIZE,
+        if (i == -1) {
-                                                  &qe->qblock_dvma);
+                struct sbus_dev *td = sdev->parent->child;
-                qe->buffers = sbus_alloc_consistent(qe->qe_sdev,
+                i = 0;
-                                                 sizeof(struct sunqe_buffers),
+                while (td != sdev) {
-                                                 &qe->buffers_dvma);
+                        td = td->next;
-                if (qe->qe_block == NULL || qe->qblock_dvma == 0 ||
+                        i++;
-                    qe->buffers == NULL || qe->buffers_dvma == 0) {
-                        goto out4;
                }
-                /* Stop this QE. */
-                qe_stop(qe);
        }
+        qe->channel = i;
+        spin_lock_init(&qe->lock);
+        
+        res = -ENODEV;
+        qecp = get_qec(sdev);
+        if (!qecp)
+                goto fail;
-        for (i = 0; i < 4; i++) {
+        qecp->qes[qe->channel] = qe;
-                SET_MODULE_OWNER(qe_devs[i]);
+        qe->dev = dev;
-                qe_devs[i]->open = qe_open;
+        qe->parent = qecp;
-                qe_devs[i]->stop = qe_close;
+        qe->qe_sdev = sdev;
-                qe_devs[i]->hard_start_xmit = qe_start_xmit;
-                qe_devs[i]->get_stats = qe_get_stats;
-                qe_devs[i]->set_multicast_list = qe_set_multicast;
-                qe_devs[i]->tx_timeout = qe_tx_timeout;
-                qe_devs[i]->watchdog_timeo = 5*HZ;
-                qe_devs[i]->irq = sdev->irqs[0];
-                qe_devs[i]->dma = 0;
-                qe_devs[i]->ethtool_ops = &qe_ethtool_ops;
-        }
-        /* QEC receives interrupts from each QE, then it sends the actual
+        res = -ENOMEM;
-         * IRQ to the cpu itself.  Since QEC is the single point of
+        qe->qcregs = sbus_ioremap(&qe->qe_sdev->resource[0], 0,
-         * interrupt for all QE channels we register the IRQ handler
+                                  CREG_REG_SIZE, "QEC Channel Registers");
-         * for it now.
+        if (!qe->qcregs) {
-         */
+                printk(KERN_ERR "qe: Cannot map channel registers.\n");
-        if (request_irq(sdev->irqs[0], &qec_interrupt,
+                goto fail;
-                        SA_SHIRQ, "QuadEther", (void *) qecp)) {
-                printk(KERN_ERR "QuadEther: Can't register QEC master irq handler.\n");
-                res = -EAGAIN;
-                goto out4;
        }
-        for (i = 0; i < 4; i++) {
+        qe->mregs = sbus_ioremap(&qe->qe_sdev->resource[1], 0,
-                if (register_netdev(qe_devs[i]) != 0)
+                                 MREGS_REG_SIZE, "QE MACE Registers");
-                        goto out5;
+        if (!qe->mregs) {
+                printk(KERN_ERR "qe: Cannot map MACE registers.\n");
+                goto fail;
        }
-        /* Report the QE channels. */
+        qe->qe_block = sbus_alloc_consistent(qe->qe_sdev,
-        for (i = 0; i < 4; i++) {
+                                             PAGE_SIZE,
-                printk(KERN_INFO "%s: QuadEthernet channel[%d] ", qe_devs[i]->name, i);
+                                             &qe->qblock_dvma);
-                for (j = 0; j < 6; j++)
+        qe->buffers = sbus_alloc_consistent(qe->qe_sdev,
-                        printk ("%2.2x%c",
+                                            sizeof(struct sunqe_buffers),
-                                qe_devs[i]->dev_addr[j],
+                                            &qe->buffers_dvma);
-                                j == 5 ? ' ': ':');
+        if (qe->qe_block == NULL || qe->qblock_dvma == 0 ||
-                printk("\n");
+            qe->buffers == NULL || qe->buffers_dvma == 0)
-        }
+                goto fail;
+        /* Stop this QE. */
+        qe_stop(qe);
+        SET_MODULE_OWNER(dev);
+        SET_NETDEV_DEV(dev, &sdev->ofdev.dev);
+        dev->open = qe_open;
+        dev->stop = qe_close;
+        dev->hard_start_xmit = qe_start_xmit;
+        dev->get_stats = qe_get_stats;
+        dev->set_multicast_list = qe_set_multicast;
+        dev->tx_timeout = qe_tx_timeout;
+        dev->watchdog_timeo = 5*HZ;
+        dev->irq = sdev->irqs[0];
+        dev->dma = 0;
+        dev->ethtool_ops = &qe_ethtool_ops;
+        res = register_netdev(dev);
+        if (res)
+                goto fail;
+        dev_set_drvdata(&sdev->ofdev.dev, qe);
+        printk(KERN_INFO "%s: qe channel[%d] ", dev->name, qe->channel);
+        for (i = 0; i < 6; i++)
+                printk ("%2.2x%c",
+                        dev->dev_addr[i],
+                        i == 5 ? ' ': ':');
+        printk("\n");
-        /* We are home free at this point, link the qe's into
-         * the master list for later driver exit.
-         */
-        qecp->next_module = root_qec_dev;
-        root_qec_dev = qecp;
        return 0;
-out5:
+fail:
-        while (i--)
+        if (qe->qcregs)
-                unregister_netdev(qe_devs[i]);
+                sbus_iounmap(qe->qcregs, CREG_REG_SIZE);
-        free_irq(sdev->irqs[0], (void *)qecp);
+        if (qe->mregs)
-out4:
+                sbus_iounmap(qe->mregs, MREGS_REG_SIZE);
-        for (i = 0; i < 4; i++) {
+        if (qe->qe_block)
-                struct sunqe *qe = (struct sunqe *)qe_devs[i]->priv;
+                sbus_free_consistent(qe->qe_sdev,
+                                     PAGE_SIZE,
-                if (qe->qcregs)
+                                     qe->qe_block,
-                        sbus_iounmap(qe->qcregs, CREG_REG_SIZE);
+                                     qe->qblock_dvma);
-                if (qe->mregs)
+        if (qe->buffers)
-                        sbus_iounmap(qe->mregs, MREGS_REG_SIZE);
+                sbus_free_consistent(qe->qe_sdev,
-                if (qe->qe_block)
+                                     sizeof(struct sunqe_buffers),
-                        sbus_free_consistent(qe->qe_sdev,
+                                     qe->buffers,
-                                             PAGE_SIZE,
+                                     qe->buffers_dvma);
-                                             qe->qe_block,
-                                             qe->qblock_dvma);
+        free_netdev(dev);
-                if (qe->buffers)
-                        sbus_free_consistent(qe->qe_sdev,
-                                             sizeof(struct sunqe_buffers),
-                                             qe->buffers,
-                                             qe->buffers_dvma);
-        }
-out3:
-        sbus_iounmap(qecp->gregs, GLOB_REG_SIZE);
-out2:
-        kfree(qecp);
-out1:
-        i = 4;
-out:
-        while (i--)
-                free_netdev(qe_devs[i]);
        return res;
 }
-static int __init qec_match(struct sbus_dev *sdev)
+static int __devinit qec_sbus_probe(struct of_device *dev, const struct of_device_id *match)
 {
-        struct sbus_dev *sibling;
+        struct sbus_dev *sdev = to_sbus_device(&dev->dev);
-        int i;
-        if (strcmp(sdev->prom_name, "qec") != 0)
-                return 0;
-        /* QEC can be parent of either QuadEthernet or BigMAC
+        return qec_ether_init(sdev);
-         * children.  Do not confuse this with qfe/SUNW,qfe
-         * which is a quad-happymeal card and handled by
-         * a different driver.
-         */
-        sibling = sdev->child;
-        for (i = 0; i < 4; i++) {
-                if (sibling == NULL)
-                        return 0;
-                if (strcmp(sibling->prom_name, "qe") != 0)
-                        return 0;
-                sibling = sibling->next;
-        }
-        return 1;
 }
-static int __init qec_probe(void)
+static int __devexit qec_sbus_remove(struct of_device *dev)
 {
-        struct net_device *dev = NULL;
+        struct sunqe *qp = dev_get_drvdata(&dev->dev);
-        struct sbus_bus *bus;
+        struct net_device *net_dev = qp->dev;
-        struct sbus_dev *sdev = NULL;
-        static int called;
+        unregister_netdevice(net_dev);
-        int cards = 0, v;
+        sbus_iounmap(qp->qcregs, CREG_REG_SIZE);
-        root_qec_dev = NULL;
+        sbus_iounmap(qp->mregs, MREGS_REG_SIZE);
+        sbus_free_consistent(qp->qe_sdev,
-        if (called)
+                             PAGE_SIZE,
-                return -ENODEV;
+                             qp->qe_block,
-        called++;
+                             qp->qblock_dvma);
+        sbus_free_consistent(qp->qe_sdev,
-        for_each_sbus(bus) {
+                             sizeof(struct sunqe_buffers),
-                for_each_sbusdev(sdev, bus) {
+                             qp->buffers,
-                        if (cards)
+                             qp->buffers_dvma);
-                                dev = NULL;
+        free_netdev(net_dev);
-                        if (qec_match(sdev)) {
-                                cards++;
+        dev_set_drvdata(&dev->dev, NULL);
-                                if ((v = qec_ether_init(dev, sdev)))
-                                        return v;
-                        }
-                }
-        }
-        if (!cards)
-                return -ENODEV;
        return 0;
 }
-static void __exit qec_cleanup(void)
+static struct of_device_id qec_sbus_match[] = {
+        {
+                .name = "qe",
+        },
+        {},
+};
+MODULE_DEVICE_TABLE(of, qec_sbus_match);
+static struct of_platform_driver qec_sbus_driver = {
+        .name           = "qec",
+        .match_table    = qec_sbus_match,
+        .probe          = qec_sbus_probe,
+        .remove         = __devexit_p(qec_sbus_remove),
+};
+static int __init qec_init(void)
+{
+        return of_register_driver(&qec_sbus_driver, &sbus_bus_type);
+}
+static void __exit qec_exit(void)
 {
-        struct sunqec *next_qec;
+        of_unregister_driver(&qec_sbus_driver);
-        int i;
        while (root_qec_dev) {
-                next_qec = root_qec_dev->next_module;
+                struct sunqec *next = root_qec_dev->next_module;
-                /* Release all four QE channels, then the QEC itself. */
+                free_irq(root_qec_dev->qec_sdev->irqs[0],
-                for (i = 0; i < 4; i++) {
+                         (void *) root_qec_dev);
-                        unregister_netdev(root_qec_dev->qes[i]->dev);
-                        sbus_iounmap(root_qec_dev->qes[i]->qcregs, CREG_REG_SIZE);
-                        sbus_iounmap(root_qec_dev->qes[i]->mregs, MREGS_REG_SIZE);
-                        sbus_free_consistent(root_qec_dev->qes[i]->qe_sdev,
-                                             PAGE_SIZE,
-                                             root_qec_dev->qes[i]->qe_block,
-                                             root_qec_dev->qes[i]->qblock_dvma);
-                        sbus_free_consistent(root_qec_dev->qes[i]->qe_sdev,
-                                             sizeof(struct sunqe_buffers),
-                                             root_qec_dev->qes[i]->buffers,
-                                             root_qec_dev->qes[i]->buffers_dvma);
-                        free_netdev(root_qec_dev->qes[i]->dev);
-                }
-                free_irq(root_qec_dev->qec_sdev->irqs[0], (void *)root_qec_dev);
                sbus_iounmap(root_qec_dev->gregs, GLOB_REG_SIZE);
                kfree(root_qec_dev);
-                root_qec_dev = next_qec;
+                root_qec_dev = next;
        }
 }
-module_init(qec_probe);
+module_init(qec_init);
-module_exit(qec_cleanup);
+module_exit(qec_exit);
diff --git a/drivers/net/tc35815.c b/drivers/net/tc35815.c
index c2ec9fd8c31d..8b53ded66d37 100644
--- a/drivers/net/tc35815.c
+++ b/drivers/net/tc35815.c
@@ -880,7 +880,7 @@ tc35815_open(struct net_device *dev)
         */
        if (dev->irq == 0  ||
-            request_irq(dev->irq, &tc35815_interrupt, SA_SHIRQ, cardname, dev)) {
+            request_irq(dev->irq, &tc35815_interrupt, IRQF_SHARED, cardname, dev)) {
                return -EAGAIN;
        }
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index b2ddd4522a87..f645921aff8b 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -15,7 +15,6 @@
 *      notice is accompanying it.
 */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
@@ -69,8 +68,8 @@
 #define DRV_MODULE_NAME         "tg3"
 #define PFX DRV_MODULE_NAME     ": "
-#define DRV_MODULE_VERSION      "3.60"
+#define DRV_MODULE_VERSION      "3.62"
-#define DRV_MODULE_RELDATE      "June 17, 2006"
+#define DRV_MODULE_RELDATE      "June 30, 2006"
 #define TG3_DEF_MAC_MODE        0
 #define TG3_DEF_RX_MODE         0
@@ -3195,7 +3194,7 @@ static int tg3_vlan_rx(struct tg3 *tp, struct sk_buff *skb, u16 vlan_tag)
 */
 static int tg3_rx(struct tg3 *tp, int budget)
 {
-        u32 work_mask;
+        u32 work_mask, rx_std_posted = 0;
        u32 sw_idx = tp->rx_rcb_ptr;
        u16 hw_idx;
        int received;
@@ -3222,6 +3221,7 @@ static int tg3_rx(struct tg3 *tp, int budget)
                                                  mapping);
                        skb = tp->rx_std_buffers[desc_idx].skb;
                        post_ptr = &tp->rx_std_ptr;
+                        rx_std_posted++;
                } else if (opaque_key == RXD_OPAQUE_RING_JUMBO) {
                        dma_addr = pci_unmap_addr(&tp->rx_jumbo_buffers[desc_idx],
                                                  mapping);
@@ -3309,6 +3309,15 @@ static int tg3_rx(struct tg3 *tp, int budget)
 next_pkt:
                (*post_ptr)++;
+                if (unlikely(rx_std_posted >= tp->rx_std_max_post)) {
+                        u32 idx = *post_ptr % TG3_RX_RING_SIZE;
+                        tw32_rx_mbox(MAILBOX_RCV_STD_PROD_IDX +
+                                     TG3_64BIT_REG_LOW, idx);
+                        work_mask &= ~RXD_OPAQUE_RING_STD;
+                        rx_std_posted = 0;
+                }
 next_pkt_nopost:
                sw_idx++;
                sw_idx %= TG3_RX_RCB_RING_SIZE(tp);
@@ -3780,7 +3789,7 @@ static int tg3_start_xmit(struct sk_buff *skb, struct net_device *dev)
 #if TG3_TSO_SUPPORT != 0
        mss = 0;
        if (skb->len > (tp->dev->mtu + ETH_HLEN) &&
-            (mss = skb_shinfo(skb)->tso_size) != 0) {
+            (mss = skb_shinfo(skb)->gso_size) != 0) {
                int tcp_opt_len, ip_tcp_len;
                if (skb_header_cloned(skb) &&
@@ -3789,18 +3798,24 @@ static int tg3_start_xmit(struct sk_buff *skb, struct net_device *dev)
                        goto out_unlock;
                }
-                tcp_opt_len = ((skb->h.th->doff - 5) * 4);
+                if (skb_shinfo(skb)->gso_type & SKB_GSO_TCPV6)
-                ip_tcp_len = (skb->nh.iph->ihl * 4) + sizeof(struct tcphdr);
+                        mss |= (skb_headlen(skb) - ETH_HLEN) << 9;
+                else {
+                        tcp_opt_len = ((skb->h.th->doff - 5) * 4);
+                        ip_tcp_len = (skb->nh.iph->ihl * 4) +
+                                     sizeof(struct tcphdr);
+                        skb->nh.iph->check = 0;
+                        skb->nh.iph->tot_len = htons(mss + ip_tcp_len +
+                                                     tcp_opt_len);
+                        mss |= (ip_tcp_len + tcp_opt_len) << 9;
+                }
                base_flags |= (TXD_FLAG_CPU_PRE_DMA |
                               TXD_FLAG_CPU_POST_DMA);
-                skb->nh.iph->check = 0;
-                skb->nh.iph->tot_len = htons(mss + ip_tcp_len + tcp_opt_len);
                skb->h.th->check = 0;
-                mss |= (ip_tcp_len + tcp_opt_len) << 9;
        }
        else if (skb->ip_summed == CHECKSUM_HW)
                base_flags |= TXD_FLAG_TCPUDP_CSUM;
@@ -3870,6 +3885,40 @@ out_unlock:
        return NETDEV_TX_OK;
 }
+#if TG3_TSO_SUPPORT != 0
+static int tg3_start_xmit_dma_bug(struct sk_buff *, struct net_device *);
+/* Use GSO to workaround a rare TSO bug that may be triggered when the
+ * TSO header is greater than 80 bytes.
+ */
+static int tg3_tso_bug(struct tg3 *tp, struct sk_buff *skb)
+{
+        struct sk_buff *segs, *nskb;
+        /* Estimate the number of fragments in the worst case */
+        if (unlikely(TX_BUFFS_AVAIL(tp) <= (skb_shinfo(skb)->gso_segs * 3))) {
+                netif_stop_queue(tp->dev);
+                return NETDEV_TX_BUSY;
+        }
+        segs = skb_gso_segment(skb, tp->dev->features & ~NETIF_F_TSO);
+        if (unlikely(IS_ERR(segs)))
+                goto tg3_tso_bug_end;
+        do {
+                nskb = segs;
+                segs = segs->next;
+                nskb->next = NULL;
+                tg3_start_xmit_dma_bug(nskb, tp->dev);
+        } while (segs);
+tg3_tso_bug_end:
+        dev_kfree_skb(skb);
+        return NETDEV_TX_OK;
+}
+#endif
 /* hard_start_xmit for devices that have the 4G bug and/or 40-bit bug and
 * support TG3_FLG2_HW_TSO_1 or firmware TSO only.
 */
@@ -3905,8 +3954,8 @@ static int tg3_start_xmit_dma_bug(struct sk_buff *skb, struct net_device *dev)
 #if TG3_TSO_SUPPORT != 0
        mss = 0;
        if (skb->len > (tp->dev->mtu + ETH_HLEN) &&
-            (mss = skb_shinfo(skb)->tso_size) != 0) {
+            (mss = skb_shinfo(skb)->gso_size) != 0) {
-                int tcp_opt_len, ip_tcp_len;
+                int tcp_opt_len, ip_tcp_len, hdr_len;
                if (skb_header_cloned(skb) &&
                    pskb_expand_head(skb, 0, 0, GFP_ATOMIC)) {
@@ -3917,11 +3966,16 @@ static int tg3_start_xmit_dma_bug(struct sk_buff *skb, struct net_device *dev)
                tcp_opt_len = ((skb->h.th->doff - 5) * 4);
                ip_tcp_len = (skb->nh.iph->ihl * 4) + sizeof(struct tcphdr);
+                hdr_len = ip_tcp_len + tcp_opt_len;
+                if (unlikely((ETH_HLEN + hdr_len) > 80) &&
+                             (tp->tg3_flags2 & TG3_FLG2_HW_TSO_1_BUG))
+                        return (tg3_tso_bug(tp, skb));
                base_flags |= (TXD_FLAG_CPU_PRE_DMA |
                               TXD_FLAG_CPU_POST_DMA);
                skb->nh.iph->check = 0;
-                skb->nh.iph->tot_len = htons(mss + ip_tcp_len + tcp_opt_len);
+                skb->nh.iph->tot_len = htons(mss + hdr_len);
                if (tp->tg3_flags2 & TG3_FLG2_HW_TSO) {
                        skb->h.th->check = 0;
                        base_flags &= ~TXD_FLAG_TCPUDP_CSUM;
@@ -5981,7 +6035,13 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
        }
        /* Setup replenish threshold. */
-        tw32(RCVBDI_STD_THRESH, tp->rx_pending / 8);
+        val = tp->rx_pending / 8;
+        if (val == 0)
+                val = 1;
+        else if (val > tp->rx_std_max_post)
+                val = tp->rx_std_max_post;
+        tw32(RCVBDI_STD_THRESH, val);
        /* Initialize TG3_BDINFO's at:
         *  RCVDBDI_STD_BD:     standard eth size rx ring
@@ -6141,8 +6201,12 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
 #endif
        /* Receive/send statistics. */
-        if ((rdmac_mode & RDMAC_MODE_FIFO_SIZE_128) &&
+        if (tp->tg3_flags2 & TG3_FLG2_5750_PLUS) {
-            (tp->tg3_flags2 & TG3_FLG2_TSO_CAPABLE)) {
+                val = tr32(RCVLPC_STATS_ENABLE);
+                val &= ~RCVLPC_STATSENAB_DACK_FIX;
+                tw32(RCVLPC_STATS_ENABLE, val);
+        } else if ((rdmac_mode & RDMAC_MODE_FIFO_SIZE_128) &&
+                   (tp->tg3_flags2 & TG3_FLG2_TSO_CAPABLE)) {
                val = tr32(RCVLPC_STATS_ENABLE);
                val &= ~RCVLPC_STATSENAB_LNGBRST_RFIX;
                tw32(RCVLPC_STATS_ENABLE, val);
@@ -6644,12 +6708,12 @@ static int tg3_request_irq(struct tg3 *tp)
                fn = tg3_msi;
                if (tp->tg3_flags2 & TG3_FLG2_1SHOT_MSI)
                        fn = tg3_msi_1shot;
-                flags = SA_SAMPLE_RANDOM;
+                flags = IRQF_SAMPLE_RANDOM;
        } else {
                fn = tg3_interrupt;
                if (tp->tg3_flags & TG3_FLAG_TAGGED_STATUS)
                        fn = tg3_interrupt_tagged;
-                flags = SA_SHIRQ | SA_SAMPLE_RANDOM;
+                flags = IRQF_SHARED | IRQF_SAMPLE_RANDOM;
        }
        return (request_irq(tp->pdev->irq, fn, flags, dev->name, dev));
 }
@@ -6668,7 +6732,7 @@ static int tg3_test_interrupt(struct tg3 *tp)
        free_irq(tp->pdev->irq, dev);
        err = request_irq(tp->pdev->irq, tg3_test_isr,
-                          SA_SHIRQ | SA_SAMPLE_RANDOM, dev->name, dev);
+                          IRQF_SHARED | IRQF_SAMPLE_RANDOM, dev->name, dev);
        if (err)
                return err;
@@ -7829,6 +7893,12 @@ static int tg3_set_tso(struct net_device *dev, u32 value)
                        return -EINVAL;
                return 0;
        }
+        if (tp->tg3_flags2 & TG3_FLG2_HW_TSO_2) {
+                if (value)
+                        dev->features |= NETIF_F_TSO6;
+                else
+                        dev->features &= ~NETIF_F_TSO6;
+        }
        return ethtool_op_set_tso(dev, value);
 }
 #endif
@@ -8738,6 +8808,9 @@ static void tg3_vlan_rx_register(struct net_device *dev, struct vlan_group *grp)
 {
        struct tg3 *tp = netdev_priv(dev);
+        if (netif_running(dev))
+                tg3_netif_stop(tp);
        tg3_full_lock(tp, 0);
        tp->vlgrp = grp;
@@ -8746,16 +8819,25 @@ static void tg3_vlan_rx_register(struct net_device *dev, struct vlan_group *grp)
        __tg3_set_rx_mode(dev);
        tg3_full_unlock(tp);
+        if (netif_running(dev))
+                tg3_netif_start(tp);
 }
 static void tg3_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)
 {
        struct tg3 *tp = netdev_priv(dev);
+        if (netif_running(dev))
+                tg3_netif_stop(tp);
        tg3_full_lock(tp, 0);
        if (tp->vlgrp)
                tp->vlgrp->vlan_devices[vid] = NULL;
        tg3_full_unlock(tp);
+        if (netif_running(dev))
+                tg3_netif_start(tp);
 }
 #endif
@@ -10160,8 +10242,14 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
                    GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5787) {
                        tp->tg3_flags2 |= TG3_FLG2_HW_TSO_2;
                        tp->tg3_flags2 |= TG3_FLG2_1SHOT_MSI;
-                } else
+                } else {
-                        tp->tg3_flags2 |= TG3_FLG2_HW_TSO_1;
+                        tp->tg3_flags2 |= TG3_FLG2_HW_TSO_1 |
+                                          TG3_FLG2_HW_TSO_1_BUG;
+                        if (GET_ASIC_REV(tp->pci_chip_rev_id) ==
+                                ASIC_REV_5750 &&
+                            tp->pci_chip_rev_id >= CHIPREV_ID_5750_C2)
+                                tp->tg3_flags2 &= ~TG3_FLG2_HW_TSO_1_BUG;
+                }
        }
        if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5705 &&
@@ -10533,6 +10621,16 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
            (tp->tg3_flags & TG3_FLAG_PCIX_MODE) != 0)
                tp->rx_offset = 0;
+        tp->rx_std_max_post = TG3_RX_RING_SIZE;
+        /* Increment the rx prod index on the rx std ring by at most
+         * 8 for these chips to workaround hw errata.
+         */
+        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5750 ||
+            GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5752 ||
+            GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5755)
+                tp->rx_std_max_post = 8;
        /* By default, disable wake-on-lan.  User can change this
         * using ETHTOOL_SWOL.
         */
@@ -10549,11 +10647,13 @@ static int __devinit tg3_get_macaddr_sparc(struct tg3 *tp)
        struct pcidev_cookie *pcp = pdev->sysdata;
        if (pcp != NULL) {
-                int node = pcp->prom_node;
+                unsigned char *addr;
+                int len;
-                if (prom_getproplen(node, "local-mac-address") == 6) {
+                addr = of_get_property(pcp->prom_node, "local-mac-address",
-                        prom_getproperty(node, "local-mac-address",
+                                        &len);
-                                         dev->dev_addr, 6);
+                if (addr && len == 6) {
+                        memcpy(dev->dev_addr, addr, 6);
                        memcpy(dev->perm_addr, dev->dev_addr, 6);
                        return 0;
                }
@@ -11419,8 +11519,11 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,
         * Firmware TSO on older chips gives lower performance, so it
         * is off by default, but can be enabled using ethtool.
         */
-        if (tp->tg3_flags2 & TG3_FLG2_HW_TSO)
+        if (tp->tg3_flags2 & TG3_FLG2_HW_TSO) {
                dev->features |= NETIF_F_TSO;
+                if (tp->tg3_flags2 & TG3_FLG2_HW_TSO_2)
+                        dev->features |= NETIF_F_TSO6;
+        }
 #endif
diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h
index 8209da5dd15f..ba2c98711c88 100644
--- a/drivers/net/tg3.h
+++ b/drivers/net/tg3.h
@@ -125,6 +125,7 @@
 #define  CHIPREV_ID_5750_A0              0x4000
 #define  CHIPREV_ID_5750_A1              0x4001
 #define  CHIPREV_ID_5750_A3              0x4003
+#define  CHIPREV_ID_5750_C2              0x4202
 #define  CHIPREV_ID_5752_A0_HW           0x5000
 #define  CHIPREV_ID_5752_A0              0x6000
 #define  CHIPREV_ID_5752_A1              0x6001
@@ -760,6 +761,7 @@
 #define  RCVLPC_STATSCTRL_ENABLE         0x00000001
 #define  RCVLPC_STATSCTRL_FASTUPD        0x00000002
 #define RCVLPC_STATS_ENABLE             0x00002018
+#define  RCVLPC_STATSENAB_DACK_FIX       0x00040000
 #define  RCVLPC_STATSENAB_LNGBRST_RFIX   0x00400000
 #define RCVLPC_STATS_INCMASK            0x0000201c
 /* 0x2020 --> 0x2100 unused */
@@ -2137,6 +2139,7 @@ struct tg3 {
        struct tg3_rx_buffer_desc       *rx_std;
        struct ring_info                *rx_std_buffers;
        dma_addr_t                      rx_std_mapping;
+        u32                             rx_std_max_post;
        struct tg3_rx_buffer_desc       *rx_jumbo;
        struct ring_info                *rx_jumbo_buffers;
@@ -2191,7 +2194,7 @@ struct tg3 {
 #define TG3_FLAG_INIT_COMPLETE          0x80000000
        u32                             tg3_flags2;
 #define TG3_FLG2_RESTART_TIMER          0x00000001
-/*                                      0x00000002 available */
+#define TG3_FLG2_HW_TSO_1_BUG           0x00000002
 #define TG3_FLG2_NO_ETH_WIRE_SPEED      0x00000004
 #define TG3_FLG2_IS_5788                0x00000008
 #define TG3_FLG2_MAX_RXPEND_64          0x00000010
diff --git a/drivers/net/tlan.c b/drivers/net/tlan.c
index 12076f8f942c..23c0017f25a9 100644
--- a/drivers/net/tlan.c
+++ b/drivers/net/tlan.c
@@ -943,7 +943,7 @@ static int TLan_Open( struct net_device *dev )
        int             err;
        
        priv->tlanRev = TLan_DioRead8( dev->base_addr, TLAN_DEF_REVISION );
-        err = request_irq( dev->irq, TLan_HandleInterrupt, SA_SHIRQ, TLanSignature, dev );
+        err = request_irq( dev->irq, TLan_HandleInterrupt, IRQF_SHARED, TLanSignature, dev );
        
        if ( err ) {
                printk(KERN_ERR "TLAN:  Cannot open %s because IRQ %d is already in use.\n", dev->name, dev->irq );
diff --git a/drivers/net/tokenring/3c359.c b/drivers/net/tokenring/3c359.c
index 41e0cd8f4786..465921e3874c 100644
--- a/drivers/net/tokenring/3c359.c
+++ b/drivers/net/tokenring/3c359.c
@@ -42,7 +42,6 @@
 #define XL_DEBUG 0
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
@@ -577,7 +576,7 @@ static int xl_open(struct net_device *dev)
        u16 switchsettings, switchsettings_eeprom  ;
 
-        if(request_irq(dev->irq, &xl_interrupt, SA_SHIRQ , "3c359", dev)) {
+        if(request_irq(dev->irq, &xl_interrupt, IRQF_SHARED , "3c359", dev)) {
                return -EAGAIN;
        }
diff --git a/drivers/net/tokenring/abyss.c b/drivers/net/tokenring/abyss.c
index 649d8ea354f5..1bdd3beefbe5 100644
--- a/drivers/net/tokenring/abyss.c
+++ b/drivers/net/tokenring/abyss.c
@@ -123,7 +123,7 @@ static int __devinit abyss_attach(struct pci_dev *pdev, const struct pci_device_
                goto err_out_trdev;
        }
                
-        ret = request_irq(pdev->irq, tms380tr_interrupt, SA_SHIRQ,
+        ret = request_irq(pdev->irq, tms380tr_interrupt, IRQF_SHARED,
                          dev->name, dev);
        if (ret)
                goto err_out_region;
diff --git a/drivers/net/tokenring/lanstreamer.c b/drivers/net/tokenring/lanstreamer.c
index c58a4c31d0dd..28d968ffd5d0 100644
--- a/drivers/net/tokenring/lanstreamer.c
+++ b/drivers/net/tokenring/lanstreamer.c
@@ -100,7 +100,6 @@
 #define STREAMER_IOCTL 0
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
@@ -602,7 +601,7 @@ static int streamer_open(struct net_device *dev)
                rc=streamer_reset(dev);
        }
-        if (request_irq(dev->irq, &streamer_interrupt, SA_SHIRQ, "lanstreamer", dev)) {
+        if (request_irq(dev->irq, &streamer_interrupt, IRQF_SHARED, "lanstreamer", dev)) {
                return -EAGAIN;
        }
 #if STREAMER_DEBUG
diff --git a/drivers/net/tokenring/madgemc.c b/drivers/net/tokenring/madgemc.c
index 19e6f4dfd69c..666bbaaae82f 100644
--- a/drivers/net/tokenring/madgemc.c
+++ b/drivers/net/tokenring/madgemc.c
@@ -311,7 +311,7 @@ static int __devinit madgemc_probe(struct device *device)
         */ 
        outb(0, dev->base_addr + MC_CONTROL_REG0); /* sanity */
        madgemc_setsifsel(dev, 1);
-        if (request_irq(dev->irq, madgemc_interrupt, SA_SHIRQ,
+        if (request_irq(dev->irq, madgemc_interrupt, IRQF_SHARED,
                       "madgemc", dev)) {
                ret = -EBUSY;
                goto getout3;
diff --git a/drivers/net/tokenring/olympic.c b/drivers/net/tokenring/olympic.c
index 23032a7bc0a9..85831484bc40 100644
--- a/drivers/net/tokenring/olympic.c
+++ b/drivers/net/tokenring/olympic.c
@@ -80,7 +80,6 @@
 #define OLYMPIC_DEBUG 0
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
@@ -217,7 +216,7 @@ static int __devinit olympic_probe(struct pci_dev *pdev, const struct pci_device
        dev = alloc_trdev(sizeof(struct olympic_private)) ; 
        if (!dev) {
                i = -ENOMEM; 
-                goto op_free_dev;
+                goto op_release_dev;
        }
        olympic_priv = dev->priv ;
@@ -282,8 +281,8 @@ op_free_iomap:
        if (olympic_priv->olympic_lap)
                iounmap(olympic_priv->olympic_lap);
-op_free_dev:
        free_netdev(dev);
+op_release_dev:
        pci_release_regions(pdev); 
 op_disable_dev:
@@ -446,7 +445,7 @@ static int olympic_open(struct net_device *dev)
        olympic_init(dev);
-        if(request_irq(dev->irq, &olympic_interrupt, SA_SHIRQ , "olympic", dev)) {
+        if(request_irq(dev->irq, &olympic_interrupt, IRQF_SHARED , "olympic", dev)) {
                return -EAGAIN;
        }
diff --git a/drivers/net/tokenring/smctr.c b/drivers/net/tokenring/smctr.c
index 67d2b596ce22..cd2e0251e2bc 100644
--- a/drivers/net/tokenring/smctr.c
+++ b/drivers/net/tokenring/smctr.c
@@ -29,7 +29,6 @@
 */
 #include <linux/module.h>
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/fcntl.h>
@@ -532,7 +531,7 @@ static int __init smctr_chk_mca(struct net_device *dev)
                        dev->irq = 15;
                        break;
        }
-        if (request_irq(dev->irq, smctr_interrupt, SA_SHIRQ, smctr_name, dev)) {
+        if (request_irq(dev->irq, smctr_interrupt, IRQF_SHARED, smctr_name, dev)) {
                release_region(dev->base_addr, SMCTR_IO_EXTENT);
                return -ENODEV;
        }
@@ -1062,7 +1061,7 @@ static int __init smctr_chk_isa(struct net_device *dev)
                        goto out2;
         }
-        if (request_irq(dev->irq, smctr_interrupt, SA_SHIRQ, smctr_name, dev))
+        if (request_irq(dev->irq, smctr_interrupt, IRQF_SHARED, smctr_name, dev))
                goto out2;
        /* Get 58x Rom Base */
diff --git a/drivers/net/tokenring/smctr_firmware.h b/drivers/net/tokenring/smctr_firmware.h
index 48994b043b7c..292e50ddf01a 100644
--- a/drivers/net/tokenring/smctr_firmware.h
+++ b/drivers/net/tokenring/smctr_firmware.h
@@ -17,7 +17,6 @@
 *  - Jay Schulist <jschlst@samba.org>
 */
-#include <linux/config.h>
 #if defined(CONFIG_SMCTR) || defined(CONFIG_SMCTR_MODULE)
diff --git a/drivers/net/tokenring/tmspci.c b/drivers/net/tokenring/tmspci.c
index ab47c0547a3b..7d3e270c4f45 100644
--- a/drivers/net/tokenring/tmspci.c
+++ b/drivers/net/tokenring/tmspci.c
@@ -122,7 +122,7 @@ static int __devinit tms_pci_attach(struct pci_dev *pdev, const struct pci_devic
                goto err_out_trdev;
        }
-        ret = request_irq(pdev->irq, tms380tr_interrupt, SA_SHIRQ,
+        ret = request_irq(pdev->irq, tms380tr_interrupt, IRQF_SHARED,
                          dev->name, dev);
        if (ret)
                goto err_out_region;
diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c
index 5f743b972949..d05c5aa254ee 100644
--- a/drivers/net/tulip/de2104x.c
+++ b/drivers/net/tulip/de2104x.c
@@ -31,7 +31,6 @@
 #define DRV_VERSION             "0.7"
 #define DRV_RELDATE             "Mar 17, 2004"
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/netdevice.h>
@@ -1372,7 +1371,7 @@ static int de_open (struct net_device *dev)
        dw32(IntrMask, 0);
-        rc = request_irq(dev->irq, de_interrupt, SA_SHIRQ, dev->name, dev);
+        rc = request_irq(dev->irq, de_interrupt, IRQF_SHARED, dev->name, dev);
        if (rc) {
                printk(KERN_ERR "%s: IRQ %d request failure, err=%d\n",
                       dev->name, dev->irq, rc);
@@ -2007,8 +2006,8 @@ static int __init de_init_one (struct pci_dev *pdev,
        }
        if (pci_resource_len(pdev, 1) < DE_REGS_SIZE) {
                rc = -EIO;
-                printk(KERN_ERR PFX "MMIO resource (%lx) too small on pci dev %s\n",
+                printk(KERN_ERR PFX "MMIO resource (%llx) too small on pci dev %s\n",
-                       pci_resource_len(pdev, 1), pci_name(pdev));
+                       (unsigned long long)pci_resource_len(pdev, 1), pci_name(pdev));
                goto err_out_res;
        }
@@ -2016,8 +2015,9 @@ static int __init de_init_one (struct pci_dev *pdev,
        regs = ioremap_nocache(pciaddr, DE_REGS_SIZE);
        if (!regs) {
                rc = -EIO;
-                printk(KERN_ERR PFX "Cannot map PCI MMIO (%lx@%lx) on pci dev %s\n",
+                printk(KERN_ERR PFX "Cannot map PCI MMIO (%llx@%lx) on pci dev %s\n",
-                       pci_resource_len(pdev, 1), pciaddr, pci_name(pdev));
+                        (unsigned long long)pci_resource_len(pdev, 1),
+                        pciaddr, pci_name(pdev));
                goto err_out_res;
        }
        dev->base_addr = (unsigned long) regs;
diff --git a/drivers/net/tulip/de4x5.c b/drivers/net/tulip/de4x5.c
index da8bd0d62a3f..75ff14a55239 100644
--- a/drivers/net/tulip/de4x5.c
+++ b/drivers/net/tulip/de4x5.c
@@ -292,7 +292,7 @@
      0.41    21-Mar-96   Don't check for get_hw_addr checksum unless DEC card
                          only <niles@axp745gsfc.nasa.gov>
                          Fix for multiple PCI cards reported by <jos@xos.nl>
-                          Duh, put the SA_SHIRQ flag into request_interrupt().
+                          Duh, put the IRQF_SHARED flag into request_interrupt().
                          Fix SMC ethernet address in enet_det[].
                          Print chip name instead of "UNKNOWN" during boot.
      0.42    26-Apr-96   Fix MII write TA bit error.
@@ -353,7 +353,7 @@
                           infoblocks.
                          Added DC21142 and DC21143 functions.
                          Added byte counters from <phil@tazenda.demon.co.uk>
-                          Added SA_INTERRUPT temporary fix from
+                          Added IRQF_DISABLED temporary fix from
                           <mjacob@feral.com>.
      0.53   12-Nov-97    Fix the *_probe() to include 'eth??' name during
                           module load: bug reported by
@@ -443,7 +443,6 @@
    =========================================================================
 */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
@@ -1320,10 +1319,10 @@ de4x5_open(struct net_device *dev)
    lp->state = OPEN;
    de4x5_dbg_open(dev);
-    if (request_irq(dev->irq, (void *)de4x5_interrupt, SA_SHIRQ,
+    if (request_irq(dev->irq, (void *)de4x5_interrupt, IRQF_SHARED,
                                                     lp->adapter_name, dev)) {
        printk("de4x5_open(): Requested IRQ%d is busy - attemping FAST/SHARE...", dev->irq);
-        if (request_irq(dev->irq, de4x5_interrupt, SA_INTERRUPT | SA_SHIRQ,
+        if (request_irq(dev->irq, de4x5_interrupt, IRQF_DISABLED | IRQF_SHARED,
                                                     lp->adapter_name, dev)) {
            printk("\n              Cannot get IRQ- reconfigure your hardware.\n");
            disable_ast(dev);
diff --git a/drivers/net/tulip/dmfe.c b/drivers/net/tulip/dmfe.c
index ba5b112093f4..4e5b0f2acc39 100644
--- a/drivers/net/tulip/dmfe.c
+++ b/drivers/net/tulip/dmfe.c
@@ -506,7 +506,7 @@ static int dmfe_open(struct DEVICE *dev)
        DMFE_DBUG(0, "dmfe_open", 0);
-        ret = request_irq(dev->irq, &dmfe_interrupt, SA_SHIRQ, dev->name, dev);
+        ret = request_irq(dev->irq, &dmfe_interrupt, IRQF_SHARED, dev->name, dev);
        if (ret)
                return ret;
diff --git a/drivers/net/tulip/interrupt.c b/drivers/net/tulip/interrupt.c
index da4f7593c50f..99ccf2ebb342 100644
--- a/drivers/net/tulip/interrupt.c
+++ b/drivers/net/tulip/interrupt.c
@@ -16,7 +16,6 @@
 #include <linux/pci.h>
 #include "tulip.h"
-#include <linux/config.h>
 #include <linux/etherdevice.h>
 int tulip_rx_copybreak;
diff --git a/drivers/net/tulip/tulip.h b/drivers/net/tulip/tulip.h
index d25020da6798..3bcfbf3d23ed 100644
--- a/drivers/net/tulip/tulip.h
+++ b/drivers/net/tulip/tulip.h
@@ -16,7 +16,6 @@
 #ifndef __NET_TULIP_H__
 #define __NET_TULIP_H__
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/spinlock.h>
diff --git a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c
index cabdf894e21e..7351831f57ce 100644
--- a/drivers/net/tulip/tulip_core.c
+++ b/drivers/net/tulip/tulip_core.c
@@ -14,7 +14,6 @@
 */
-#include <linux/config.h>
 #define DRV_NAME        "tulip"
 #ifdef CONFIG_TULIP_NAPI
@@ -490,7 +489,7 @@ tulip_open(struct net_device *dev)
 {
        int retval;
-        if ((retval = request_irq(dev->irq, &tulip_interrupt, SA_SHIRQ, dev->name, dev)))
+        if ((retval = request_irq(dev->irq, &tulip_interrupt, IRQF_SHARED, dev->name, dev)))
                return retval;
        tulip_init_ring (dev);
@@ -1350,10 +1349,10 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,
        SET_MODULE_OWNER(dev);
        SET_NETDEV_DEV(dev, &pdev->dev);
        if (pci_resource_len (pdev, 0) < tulip_tbl[chip_idx].io_size) {
-                printk (KERN_ERR PFX "%s: I/O region (0x%lx@0x%lx) too small, "
+                printk (KERN_ERR PFX "%s: I/O region (0x%llx@0x%llx) too small, "
                        "aborting\n", pci_name(pdev),
-                        pci_resource_len (pdev, 0),
+                        (unsigned long long)pci_resource_len (pdev, 0),
-                        pci_resource_start (pdev, 0));
+                        (unsigned long long)pci_resource_start (pdev, 0));
                goto err_out_free_netdev;
        }
@@ -1550,10 +1549,14 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,
                        dev->dev_addr[i] = last_phys_addr[i];
                dev->dev_addr[i] = last_phys_addr[i] + 1;
 #if defined(__sparc__)
-                if ((pcp != NULL) && prom_getproplen(pcp->prom_node,
+                if (pcp) {
-                        "local-mac-address") == 6) {
+                        unsigned char *addr;
-                        prom_getproperty(pcp->prom_node, "local-mac-address",
+                        int len;
-                            dev->dev_addr, 6);
+                  
+                        addr = of_get_property(pcp->prom_node,
+                                               "local-mac-address", &len);
+                        if (addr && len == 6)
+                                memcpy(dev->dev_addr, addr, 6);
                }
 #endif
 #if defined(__i386__) || defined(__x86_64__)    /* Patch up x86 BIOS bug. */
@@ -1767,7 +1770,7 @@ static int tulip_resume(struct pci_dev *pdev)
        pci_enable_device(pdev);
-        if ((retval = request_irq(dev->irq, &tulip_interrupt, SA_SHIRQ, dev->name, dev))) {
+        if ((retval = request_irq(dev->irq, &tulip_interrupt, IRQF_SHARED, dev->name, dev))) {
                printk (KERN_ERR "tulip: request_irq failed in resume\n");
                return retval;
        }
diff --git a/drivers/net/tulip/uli526x.c b/drivers/net/tulip/uli526x.c
index 8b3a28f53c3d..fd64b2b3e99c 100644
--- a/drivers/net/tulip/uli526x.c
+++ b/drivers/net/tulip/uli526x.c
@@ -436,7 +436,7 @@ static int uli526x_open(struct net_device *dev)
        ULI526X_DBUG(0, "uli526x_open", 0);
-        ret = request_irq(dev->irq, &uli526x_interrupt, SA_SHIRQ, dev->name, dev);
+        ret = request_irq(dev->irq, &uli526x_interrupt, IRQF_SHARED, dev->name, dev);
        if (ret)
                return ret;
diff --git a/drivers/net/tulip/winbond-840.c b/drivers/net/tulip/winbond-840.c
index 8fea2aa455d4..7f414815cc62 100644
--- a/drivers/net/tulip/winbond-840.c
+++ b/drivers/net/tulip/winbond-840.c
@@ -212,48 +212,33 @@ Test with 'ping -s 10000' on a fast computer.
 /*
  PCI probe table.
 */
-enum pci_id_flags_bits {
-        /* Set PCI command register bits before calling probe1(). */
-        PCI_USES_IO=1, PCI_USES_MEM=2, PCI_USES_MASTER=4,
-        /* Read and map the single following PCI BAR. */
-        PCI_ADDR0=0<<4, PCI_ADDR1=1<<4, PCI_ADDR2=2<<4, PCI_ADDR3=3<<4,
-        PCI_ADDR_64BITS=0x100, PCI_NO_ACPI_WAKE=0x200, PCI_NO_MIN_LATENCY=0x400,
-};
 enum chip_capability_flags {
-        CanHaveMII=1, HasBrokenTx=2, AlwaysFDX=4, FDXOnNoMII=8,};
+        CanHaveMII=1, HasBrokenTx=2, AlwaysFDX=4, FDXOnNoMII=8,
-#ifdef USE_IO_OPS
+};
-#define W840_FLAGS (PCI_USES_IO | PCI_ADDR0 | PCI_USES_MASTER)
-#else
-#define W840_FLAGS (PCI_USES_MEM | PCI_ADDR1 | PCI_USES_MASTER)
-#endif
-static struct pci_device_id w840_pci_tbl[] = {
+static const struct pci_device_id w840_pci_tbl[] = {
        { 0x1050, 0x0840, PCI_ANY_ID, 0x8153,     0, 0, 0 },
        { 0x1050, 0x0840, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1 },
        { 0x11f6, 0x2011, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 2 },
-        { 0, }
+        { }
 };
 MODULE_DEVICE_TABLE(pci, w840_pci_tbl);
+enum {
+        netdev_res_size         = 128,  /* size of PCI BAR resource */
+};
 struct pci_id_info {
        const char *name;
-        struct match_info {
+        int drv_flags;          /* Driver use, intended as capability flags. */
-                int     pci, pci_mask, subsystem, subsystem_mask;
-                int revision, revision_mask;                            /* Only 8 bits. */
-        } id;
-        enum pci_id_flags_bits pci_flags;
-        int io_size;                            /* Needed for I/O region check or ioremap(). */
-        int drv_flags;                          /* Driver use, intended as capability flags. */
 };
-static struct pci_id_info pci_id_tbl[] = {
-        {"Winbond W89c840",                     /* Sometime a Level-One switch card. */
+static const struct pci_id_info pci_id_tbl[] __devinitdata = {
-         { 0x08401050, 0xffffffff, 0x81530000, 0xffff0000 },
+        {                               /* Sometime a Level-One switch card. */
-         W840_FLAGS, 128, CanHaveMII | HasBrokenTx | FDXOnNoMII},
+          "Winbond W89c840",    CanHaveMII | HasBrokenTx | FDXOnNoMII},
-        {"Winbond W89c840", { 0x08401050, 0xffffffff, },
+        { "Winbond W89c840",    CanHaveMII | HasBrokenTx},
-         W840_FLAGS, 128, CanHaveMII | HasBrokenTx},
+        { "Compex RL100-ATX",   CanHaveMII | HasBrokenTx},
-        {"Compex RL100-ATX", { 0x201111F6, 0xffffffff,},
+        { }     /* terminate list. */
-         W840_FLAGS, 128, CanHaveMII | HasBrokenTx},
-        {NULL,},                                        /* 0 terminated list. */
 };
 /* This driver was written to use PCI memory space, however some x86 systems
@@ -411,7 +396,7 @@ static int __devinit w840_probe1 (struct pci_dev *pdev,
 #ifdef USE_IO_OPS
        bar = 0;
 #endif
-        ioaddr = pci_iomap(pdev, bar, pci_id_tbl[chip_idx].io_size);
+        ioaddr = pci_iomap(pdev, bar, netdev_res_size);
        if (!ioaddr)
                goto err_out_free_res;
@@ -670,7 +655,7 @@ static int netdev_open(struct net_device *dev)
        iowrite32(0x00000001, ioaddr + PCIBusCfg);              /* Reset */
        netif_device_detach(dev);
-        i = request_irq(dev->irq, &intr_handler, SA_SHIRQ, dev->name, dev);
+        i = request_irq(dev->irq, &intr_handler, IRQF_SHARED, dev->name, dev);
        if (i)
                goto out_err;
diff --git a/drivers/net/tulip/xircom_cb.c b/drivers/net/tulip/xircom_cb.c
index 63c2175ed138..f874e4f6ccf6 100644
--- a/drivers/net/tulip/xircom_cb.c
+++ b/drivers/net/tulip/xircom_cb.c
@@ -457,7 +457,7 @@ static int xircom_open(struct net_device *dev)
        int retval;
        enter("xircom_open");
        printk(KERN_INFO "xircom cardbus adaptor found, registering as %s, using irq %i \n",dev->name,dev->irq);
-        retval = request_irq(dev->irq, &xircom_interrupt, SA_SHIRQ, dev->name, dev);
+        retval = request_irq(dev->irq, &xircom_interrupt, IRQF_SHARED, dev->name, dev);
        if (retval) {
                leave("xircom_open - No IRQ");
                return retval;
diff --git a/drivers/net/tulip/xircom_tulip_cb.c b/drivers/net/tulip/xircom_tulip_cb.c
index 887d7245fe7b..17ca7dc42e6f 100644
--- a/drivers/net/tulip/xircom_tulip_cb.c
+++ b/drivers/net/tulip/xircom_tulip_cb.c
@@ -10,26 +10,11 @@
        410 Severn Ave., Suite 210
        Annapolis MD 21403
-        -----------------------------------------------------------
-        Linux kernel-specific changes:
-        LK1.0 (Ion Badulescu)
-        - Major cleanup
-        - Use 2.4 PCI API
-        - Support ethtool
-        - Rewrite perfect filter/hash code
-        - Use interrupts for media changes
-        LK1.1 (Ion Badulescu)
-        - Disallow negotiation of unsupported full-duplex modes
 */
 #define DRV_NAME        "xircom_tulip_cb"
-#define DRV_VERSION     "0.91+LK1.1"
+#define DRV_VERSION     "0.92"
-#define DRV_RELDATE     "October 11, 2001"
+#define DRV_RELDATE     "June 27, 2006"
-#define CARDBUS 1
 /* A few user-configurable values. */
@@ -98,7 +83,6 @@ static int csr0 = 0x00A00000 | 0x4800;
 /* PCI registers */
 #define PCI_POWERMGMT   0x40
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/kernel.h>
@@ -307,10 +291,10 @@ struct xircom_private {
        struct xircom_tx_desc tx_ring[TX_RING_SIZE];
        /* The saved address of a sent-in-place packet/buffer, for skfree(). */
        struct sk_buff* tx_skbuff[TX_RING_SIZE];
-#ifdef CARDBUS
        /* The X3201-3 requires 4-byte aligned tx bufs */
        struct sk_buff* tx_aligned_skbuff[TX_RING_SIZE];
-#endif
        /* The addresses of receive-in-place skbuffs. */
        struct sk_buff* rx_skbuff[RX_RING_SIZE];
        u16 setup_frame[PKT_SETUP_SZ / sizeof(u16)];    /* Pseudo-Tx frame to init address table. */
@@ -808,7 +792,7 @@ xircom_open(struct net_device *dev)
 {
        struct xircom_private *tp = netdev_priv(dev);
-        if (request_irq(dev->irq, &xircom_interrupt, SA_SHIRQ, dev->name, dev))
+        if (request_irq(dev->irq, &xircom_interrupt, IRQF_SHARED, dev->name, dev))
                return -EAGAIN;
        xircom_up(dev);
@@ -909,10 +893,8 @@ static void xircom_init_ring(struct net_device *dev)
                tp->tx_skbuff[i] = NULL;
                tp->tx_ring[i].status = 0;
                tp->tx_ring[i].buffer2 = virt_to_bus(&tp->tx_ring[i+1]);
-#ifdef CARDBUS
                if (tp->chip_id == X3201_3)
                        tp->tx_aligned_skbuff[i] = dev_alloc_skb(PKT_BUF_SZ);
-#endif /* CARDBUS */
        }
        tp->tx_ring[i-1].buffer2 = virt_to_bus(&tp->tx_ring[0]);
 }
@@ -932,12 +914,10 @@ xircom_start_xmit(struct sk_buff *skb, struct net_device *dev)
        entry = tp->cur_tx % TX_RING_SIZE;
        tp->tx_skbuff[entry] = skb;
-#ifdef CARDBUS
        if (tp->chip_id == X3201_3) {
                memcpy(tp->tx_aligned_skbuff[entry]->data,skb->data,skb->len);
                tp->tx_ring[entry].buffer1 = virt_to_bus(tp->tx_aligned_skbuff[entry]->data);
        } else
-#endif
                tp->tx_ring[entry].buffer1 = virt_to_bus(skb->data);
        if (tp->cur_tx - tp->dirty_tx < TX_RING_SIZE/2) {/* Typical path */
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index a1ed2d983740..329d9feb9b89 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -39,7 +39,6 @@
 #define DRV_DESCRIPTION "Universal TUN/TAP device driver"
 #define DRV_COPYRIGHT   "(C) 1999-2004 Max Krasnyansky <maxk@qualcomm.com>"
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
@@ -490,6 +489,9 @@ static int tun_set_iff(struct file *file, struct ifreq *ifr)
                err = -EINVAL;
+                if (!capable(CAP_NET_ADMIN))
+                        return -EPERM;
                /* Set dev type */
                if (ifr->ifr_flags & IFF_TUN) {
                        /* TUN device */
@@ -777,7 +779,6 @@ static struct miscdevice tun_miscdev = {
        .minor = TUN_MINOR,
        .name = "tun",
        .fops = &tun_fops,
-        .devfs_name = "net/tun",
 };
 /* ethtool interface */
diff --git a/drivers/net/typhoon.c b/drivers/net/typhoon.c
index d9258d42090c..063816f2b11e 100644
--- a/drivers/net/typhoon.c
+++ b/drivers/net/typhoon.c
@@ -340,7 +340,7 @@ enum state_values {
 #endif
 #if defined(NETIF_F_TSO)
-#define skb_tso_size(x)         (skb_shinfo(x)->tso_size)
+#define skb_tso_size(x)         (skb_shinfo(x)->gso_size)
 #define TSO_NUM_DESCRIPTORS     2
 #define TSO_OFFLOAD_ON          TYPHOON_OFFLOAD_TCP_SEGMENT
 #else
@@ -2131,7 +2131,7 @@ typhoon_open(struct net_device *dev)
                goto out_sleep;
        }
-        err = request_irq(dev->irq, &typhoon_interrupt, SA_SHIRQ,
+        err = request_irq(dev->irq, &typhoon_interrupt, IRQF_SHARED,
                                dev->name, dev);
        if(err < 0)
                goto out_sleep;
@@ -2568,9 +2568,10 @@ typhoon_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
        pci_set_drvdata(pdev, dev);
-        printk(KERN_INFO "%s: %s at %s 0x%lx, ",
+        printk(KERN_INFO "%s: %s at %s 0x%llx, ",
               dev->name, typhoon_card_info[card_id].name,
-               use_mmio ? "MMIO" : "IO", pci_resource_start(pdev, use_mmio));
+               use_mmio ? "MMIO" : "IO",
+               (unsigned long long)pci_resource_start(pdev, use_mmio));
        for(i = 0; i < 5; i++)
                printk("%2.2x:", dev->dev_addr[i]);
        printk("%2.2x\n", dev->dev_addr[i]);
diff --git a/drivers/net/via-rhine.c b/drivers/net/via-rhine.c
index fdc21037f6dc..d3d0ec970318 100644
--- a/drivers/net/via-rhine.c
+++ b/drivers/net/via-rhine.c
@@ -25,117 +25,13 @@
        version. He may or may not be interested in bug reports on this
        code. You can find his versions at:
        http://www.scyld.com/network/via-rhine.html
+        [link no longer provides useful info -jgarzik]
-        Linux kernel version history:
-        LK1.1.0:
-        - Jeff Garzik: softnet 'n stuff
-        LK1.1.1:
-        - Justin Guyett: softnet and locking fixes
-        - Jeff Garzik: use PCI interface
-        LK1.1.2:
-        - Urban Widmark: minor cleanups, merges from Becker 1.03a/1.04 versions
-        LK1.1.3:
-        - Urban Widmark: use PCI DMA interface (with thanks to the eepro100.c
-                         code) update "Theory of Operation" with
-                         softnet/locking changes
-        - Dave Miller: PCI DMA and endian fixups
-        - Jeff Garzik: MOD_xxx race fixes, updated PCI resource allocation
-        LK1.1.4:
-        - Urban Widmark: fix gcc 2.95.2 problem and
-                         remove writel's to fixed address 0x7c
-        LK1.1.5:
-        - Urban Widmark: mdio locking, bounce buffer changes
-                         merges from Beckers 1.05 version
-                         added netif_running_on/off support
-        LK1.1.6:
-        - Urban Widmark: merges from Beckers 1.08b version (VT6102 + mdio)
-                         set netif_running_on/off on startup, del_timer_sync
-        LK1.1.7:
-        - Manfred Spraul: added reset into tx_timeout
-        LK1.1.9:
-        - Urban Widmark: merges from Beckers 1.10 version
-                         (media selection + eeprom reload)
-        - David Vrabel:  merges from D-Link "1.11" version
-                         (disable WOL and PME on startup)
-        LK1.1.10:
-        - Manfred Spraul: use "singlecopy" for unaligned buffers
-                          don't allocate bounce buffers for !ReqTxAlign cards
-        LK1.1.11:
-        - David Woodhouse: Set dev->base_addr before the first time we call
-                           wait_for_reset(). It's a lot happier that way.
-                           Free np->tx_bufs only if we actually allocated it.
-        LK1.1.12:
-        - Martin Eriksson: Allow Memory-Mapped IO to be enabled.
-        LK1.1.13 (jgarzik):
-        - Add ethtool support
-        - Replace some MII-related magic numbers with constants
-        LK1.1.14 (Ivan G.):
-        - fixes comments for Rhine-III
-        - removes W_MAX_TIMEOUT (unused)
-        - adds HasDavicomPhy for Rhine-I (basis: linuxfet driver; my card
-          is R-I and has Davicom chip, flag is referenced in kernel driver)
-        - sends chip_id as a parameter to wait_for_reset since np is not
-          initialized on first call
-        - changes mmio "else if (chip_id==VT6102)" to "else" so it will work
-          for Rhine-III's (documentation says same bit is correct)
-        - transmit frame queue message is off by one - fixed
-        - adds IntrNormalSummary to "Something Wicked" exclusion list
-          so normal interrupts will not trigger the message (src: Donald Becker)
-        (Roger Luethi)
-        - show confused chip where to continue after Tx error
-        - location of collision counter is chip specific
-        - allow selecting backoff algorithm (module parameter)
-        LK1.1.15 (jgarzik):
-        - Use new MII lib helper generic_mii_ioctl
-        LK1.1.16 (Roger Luethi)
-        - Etherleak fix
-        - Handle Tx buffer underrun
-        - Fix bugs in full duplex handling
-        - New reset code uses "force reset" cmd on Rhine-II
-        - Various clean ups
-        LK1.1.17 (Roger Luethi)
-        - Fix race in via_rhine_start_tx()
-        - On errors, wait for Tx engine to turn off before scavenging
-        - Handle Tx descriptor write-back race on Rhine-II
-        - Force flushing for PCI posted writes
-        - More reset code changes
-        LK1.1.18 (Roger Luethi)
-        - No filtering multicast in promisc mode (Edward Peng)
-        - Fix for Rhine-I Tx timeouts
-        LK1.1.19 (Roger Luethi)
-        - Increase Tx threshold for unspecified errors
-        LK1.2.0-2.6 (Roger Luethi)
-        - Massive clean-up
-        - Rewrite PHY, media handling (remove options, full_duplex, backoff)
-        - Fix Tx engine race for good
-        - Craig Brind: Zero padded aligned buffers for short packets.
 */
 #define DRV_NAME        "via-rhine"
-#define DRV_VERSION     "1.2.0-2.6"
+#define DRV_VERSION     "1.4.0"
-#define DRV_RELDATE     "June-10-2004"
+#define DRV_RELDATE     "June-27-2006"
 /* A few user-configurable values.
@@ -356,12 +252,11 @@ enum rhine_quirks {
 /* Beware of PCI posted writes */
 #define IOSYNC  do { ioread8(ioaddr + StationAddr); } while (0)
-static struct pci_device_id rhine_pci_tbl[] =
+static const struct pci_device_id rhine_pci_tbl[] = {
-{
+        { 0x1106, 0x3043, PCI_ANY_ID, PCI_ANY_ID, },    /* VT86C100A */
-        {0x1106, 0x3043, PCI_ANY_ID, PCI_ANY_ID, 0, 0, }, /* VT86C100A */
+        { 0x1106, 0x3065, PCI_ANY_ID, PCI_ANY_ID, },    /* VT6102 */
-        {0x1106, 0x3065, PCI_ANY_ID, PCI_ANY_ID, 0, 0, }, /* VT6102 */
+        { 0x1106, 0x3106, PCI_ANY_ID, PCI_ANY_ID, },    /* 6105{,L,LOM} */
-        {0x1106, 0x3106, PCI_ANY_ID, PCI_ANY_ID, 0, 0, }, /* 6105{,L,LOM} */
+        { 0x1106, 0x3053, PCI_ANY_ID, PCI_ANY_ID, },    /* VT6105M */
-        {0x1106, 0x3053, PCI_ANY_ID, PCI_ANY_ID, 0, 0, }, /* VT6105M */
        { }     /* terminate list */
 };
 MODULE_DEVICE_TABLE(pci, rhine_pci_tbl);
@@ -1210,7 +1105,7 @@ static int rhine_open(struct net_device *dev)
        void __iomem *ioaddr = rp->base;
        int rc;
-        rc = request_irq(rp->pdev->irq, &rhine_interrupt, SA_SHIRQ, dev->name,
+        rc = request_irq(rp->pdev->irq, &rhine_interrupt, IRQF_SHARED, dev->name,
                        dev);
        if (rc)
                return rc;
@@ -1284,11 +1179,8 @@ static int rhine_start_tx(struct sk_buff *skb, struct net_device *dev)
        /* Calculate the next Tx descriptor entry. */
        entry = rp->cur_tx % TX_RING_SIZE;
-        if (skb->len < ETH_ZLEN) {
+        if (skb_padto(skb, ETH_ZLEN))
-                skb = skb_padto(skb, ETH_ZLEN);
+                return 0;
-                if (skb == NULL)
-                        return 0;
-        }
        rp->tx_skbuff[entry] = skb;
@@ -2002,7 +1894,7 @@ static int rhine_resume(struct pci_dev *pdev)
        if (!netif_running(dev))
                return 0;
-        if (request_irq(dev->irq, rhine_interrupt, SA_SHIRQ, dev->name, dev))
+        if (request_irq(dev->irq, rhine_interrupt, IRQF_SHARED, dev->name, dev))
                printk(KERN_ERR "via-rhine %s: request_irq failed\n", dev->name);
        ret = pci_set_power_state(pdev, PCI_D0);
diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c
index 2eb6b5f9ba0d..f5b0078eb4ad 100644
--- a/drivers/net/via-velocity.c
+++ b/drivers/net/via-velocity.c
@@ -47,7 +47,6 @@
 #include <linux/module.h>
 #include <linux/types.h>
-#include <linux/config.h>
 #include <linux/init.h>
 #include <linux/mm.h>
 #include <linux/errno.h>
@@ -65,7 +64,6 @@
 #include <linux/wait.h>
 #include <asm/io.h>
 #include <linux/if.h>
-#include <linux/config.h>
 #include <asm/uaccess.h>
 #include <linux/proc_fs.h>
 #include <linux/inetdevice.h>
@@ -231,7 +229,8 @@ static int rx_copybreak = 200;
 module_param(rx_copybreak, int, 0644);
 MODULE_PARM_DESC(rx_copybreak, "Copy breakpoint for copy-only-tiny-frames");
-static void velocity_init_info(struct pci_dev *pdev, struct velocity_info *vptr, struct velocity_info_tbl *info);
+static void velocity_init_info(struct pci_dev *pdev, struct velocity_info *vptr,
+                               const struct velocity_info_tbl *info);
 static int velocity_get_pci_info(struct velocity_info *, struct pci_dev *pdev);
 static void velocity_print_info(struct velocity_info *vptr);
 static int velocity_open(struct net_device *dev);
@@ -248,6 +247,7 @@ static void velocity_free_rd_ring(struct velocity_info *vptr);
 static void velocity_free_tx_buf(struct velocity_info *vptr, struct velocity_td_info *);
 static int velocity_soft_reset(struct velocity_info *vptr);
 static void mii_init(struct velocity_info *vptr, u32 mii_status);
+static u32 velocity_get_link(struct net_device *dev);
 static u32 velocity_get_opt_media_mode(struct velocity_info *vptr);
 static void velocity_print_link_status(struct velocity_info *vptr);
 static void safe_disable_mii_autopoll(struct mac_regs __iomem * regs);
@@ -295,9 +295,9 @@ static void velocity_unregister_notifier(void)
 *      Internal board variants. At the moment we have only one
 */
-static struct velocity_info_tbl chip_info_table[] = {
+static const struct velocity_info_tbl chip_info_table[] __devinitdata = {
-        {CHIP_TYPE_VT6110, "VIA Networking Velocity Family Gigabit Ethernet Adapter", 256, 1, 0x00FFFFFFUL},
+        {CHIP_TYPE_VT6110, "VIA Networking Velocity Family Gigabit Ethernet Adapter", 1, 0x00FFFFFFUL},
-        {0, NULL}
+        { }
 };
 /*
@@ -305,10 +305,9 @@ static struct velocity_info_tbl chip_info_table[] = {
 *      device driver. Used for hotplug autoloading.
 */
-static struct pci_device_id velocity_id_table[] __devinitdata = {
+static const struct pci_device_id velocity_id_table[] __devinitdata = {
-        {PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_612X,
+        { PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_612X) },
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) chip_info_table},
+        { }
-        {0, }
 };
 MODULE_DEVICE_TABLE(pci, velocity_id_table);
@@ -342,7 +341,7 @@ static char __devinit *get_chip_name(enum chip_type chip_id)
 static void __devexit velocity_remove1(struct pci_dev *pdev)
 {
        struct net_device *dev = pci_get_drvdata(pdev);
-        struct velocity_info *vptr = dev->priv;
+        struct velocity_info *vptr = netdev_priv(dev);
 #ifdef CONFIG_PM
        unsigned long flags;
@@ -687,21 +686,23 @@ static int __devinit velocity_found1(struct pci_dev *pdev, const struct pci_devi
        static int first = 1;
        struct net_device *dev;
        int i;
-        struct velocity_info_tbl *info = (struct velocity_info_tbl *) ent->driver_data;
+        const struct velocity_info_tbl *info = &chip_info_table[ent->driver_data];
        struct velocity_info *vptr;
        struct mac_regs __iomem * regs;
        int ret = -ENOMEM;
+        /* FIXME: this driver, like almost all other ethernet drivers,
+         * can support more than MAX_UNITS.
+         */
        if (velocity_nics >= MAX_UNITS) {
-                printk(KERN_NOTICE VELOCITY_NAME ": already found %d NICs.\n", 
+                dev_notice(&pdev->dev, "already found %d NICs.\n", 
-                                velocity_nics);
+                           velocity_nics);
                return -ENODEV;
        }
        dev = alloc_etherdev(sizeof(struct velocity_info));
+        if (!dev) {
-        if (dev == NULL) {
+                dev_err(&pdev->dev, "allocate net device failed.\n");
-                printk(KERN_ERR VELOCITY_NAME ": allocate net device failed.\n");
                goto out;
        }
        
@@ -709,7 +710,7 @@ static int __devinit velocity_found1(struct pci_dev *pdev, const struct pci_devi
        
        SET_MODULE_OWNER(dev);
        SET_NETDEV_DEV(dev, &pdev->dev);
-        vptr = dev->priv;
+        vptr = netdev_priv(dev);
        if (first) {
@@ -732,17 +733,17 @@ static int __devinit velocity_found1(struct pci_dev *pdev, const struct pci_devi
        ret = velocity_get_pci_info(vptr, pdev);
        if (ret < 0) {
-                printk(KERN_ERR VELOCITY_NAME ": Failed to find PCI device.\n");
+                /* error message already printed */
                goto err_disable;
        }
        ret = pci_request_regions(pdev, VELOCITY_NAME);
        if (ret < 0) {
-                printk(KERN_ERR VELOCITY_NAME ": Failed to find PCI device.\n");
+                dev_err(&pdev->dev, "No PCI resources.\n");
                goto err_disable;
        }
-        regs = ioremap(vptr->memaddr, vptr->io_size);
+        regs = ioremap(vptr->memaddr, VELOCITY_IO_SIZE);
        if (regs == NULL) {
                ret = -EIO;
                goto err_release_res;
@@ -798,6 +799,9 @@ static int __devinit velocity_found1(struct pci_dev *pdev, const struct pci_devi
        if (ret < 0)
                goto err_iounmap;
+        if (velocity_get_link(dev))
+                netif_carrier_off(dev);
        velocity_print_info(vptr);
        pci_set_drvdata(pdev, dev);
        
@@ -857,13 +861,14 @@ static void __devinit velocity_print_info(struct velocity_info *vptr)
 *      discovered.
 */
-static void __devinit velocity_init_info(struct pci_dev *pdev, struct velocity_info *vptr, struct velocity_info_tbl *info)
+static void __devinit velocity_init_info(struct pci_dev *pdev,
+                                         struct velocity_info *vptr,
+                                         const struct velocity_info_tbl *info)
 {
        memset(vptr, 0, sizeof(struct velocity_info));
        vptr->pdev = pdev;
        vptr->chip_id = info->chip_id;
-        vptr->io_size = info->io_size;
        vptr->num_txq = info->txqueue;
        vptr->multicast_limit = MCAM_SIZE;
        spin_lock_init(&vptr->lock);
@@ -881,8 +886,7 @@ static void __devinit velocity_init_info(struct pci_dev *pdev, struct velocity_i
 static int __devinit velocity_get_pci_info(struct velocity_info *vptr, struct pci_dev *pdev)
 {
+        if (pci_read_config_byte(pdev, PCI_REVISION_ID, &vptr->rev_id) < 0)
-        if(pci_read_config_byte(pdev, PCI_REVISION_ID, &vptr->rev_id) < 0)
                return -EIO;
                
        pci_set_master(pdev);
@@ -890,24 +894,20 @@ static int __devinit velocity_get_pci_info(struct velocity_info *vptr, struct pc
        vptr->ioaddr = pci_resource_start(pdev, 0);
        vptr->memaddr = pci_resource_start(pdev, 1);
        
-        if(!(pci_resource_flags(pdev, 0) & IORESOURCE_IO))
+        if (!(pci_resource_flags(pdev, 0) & IORESOURCE_IO)) {
-        {
+                dev_err(&pdev->dev,
-                printk(KERN_ERR "%s: region #0 is not an I/O resource, aborting.\n",
+                           "region #0 is not an I/O resource, aborting.\n");
-                                pci_name(pdev));
                return -EINVAL;
        }
-        if((pci_resource_flags(pdev, 1) & IORESOURCE_IO))
+        if ((pci_resource_flags(pdev, 1) & IORESOURCE_IO)) {
-        {
+                dev_err(&pdev->dev,
-                printk(KERN_ERR "%s: region #1 is an I/O resource, aborting.\n",
+                           "region #1 is an I/O resource, aborting.\n");
-                                pci_name(pdev));
                return -EINVAL;
        }
-        if(pci_resource_len(pdev, 1) < 256)
+        if (pci_resource_len(pdev, 1) < VELOCITY_IO_SIZE) {
-        {
+                dev_err(&pdev->dev, "region #1 is too small.\n");
-                printk(KERN_ERR "%s: region #1 is too small.\n", 
-                                pci_name(pdev));
                return -EINVAL;
        }
        vptr->pdev = pdev;
@@ -1653,8 +1653,10 @@ static void velocity_error(struct velocity_info *vptr, int status)
                if (linked) {
                        vptr->mii_status &= ~VELOCITY_LINK_FAIL;
+                        netif_carrier_on(vptr->dev);
                } else {
                        vptr->mii_status |= VELOCITY_LINK_FAIL;
+                        netif_carrier_off(vptr->dev);
                }
                velocity_print_link_status(vptr);
@@ -1724,7 +1726,7 @@ static void velocity_free_tx_buf(struct velocity_info *vptr, struct velocity_td_
 
 static int velocity_open(struct net_device *dev)
 {
-        struct velocity_info *vptr = dev->priv;
+        struct velocity_info *vptr = netdev_priv(dev);
        int ret;
        vptr->rx_buf_sz = (dev->mtu <= 1504 ? PKT_BUF_SZ : dev->mtu + 32);
@@ -1746,7 +1748,7 @@ static int velocity_open(struct net_device *dev)
        
        velocity_init_registers(vptr, VELOCITY_INIT_COLD);
-        ret = request_irq(vptr->pdev->irq, &velocity_intr, SA_SHIRQ,
+        ret = request_irq(vptr->pdev->irq, &velocity_intr, IRQF_SHARED,
                          dev->name, dev);
        if (ret < 0) {
                /* Power down the chip */
@@ -1781,7 +1783,7 @@ err_free_desc_rings:
 
 static int velocity_change_mtu(struct net_device *dev, int new_mtu)
 {
-        struct velocity_info *vptr = dev->priv;
+        struct velocity_info *vptr = netdev_priv(dev);
        unsigned long flags;
        int oldmtu = dev->mtu;
        int ret = 0;
@@ -1857,7 +1859,7 @@ static void velocity_shutdown(struct velocity_info *vptr)
 static int velocity_close(struct net_device *dev)
 {
-        struct velocity_info *vptr = dev->priv;
+        struct velocity_info *vptr = netdev_priv(dev);
        netif_stop_queue(dev);
        velocity_shutdown(vptr);
@@ -1890,7 +1892,7 @@ static int velocity_close(struct net_device *dev)
 
 static int velocity_xmit(struct sk_buff *skb, struct net_device *dev)
 {
-        struct velocity_info *vptr = dev->priv;
+        struct velocity_info *vptr = netdev_priv(dev);
        int qnum = 0;
        struct tx_desc *td_ptr;
        struct velocity_td_info *tdinfo;
@@ -2045,7 +2047,7 @@ static int velocity_xmit(struct sk_buff *skb, struct net_device *dev)
 static int velocity_intr(int irq, void *dev_instance, struct pt_regs *regs)
 {
        struct net_device *dev = dev_instance;
-        struct velocity_info *vptr = dev->priv;
+        struct velocity_info *vptr = netdev_priv(dev);
        u32 isr_status;
        int max_count = 0;
@@ -2100,7 +2102,7 @@ static int velocity_intr(int irq, void *dev_instance, struct pt_regs *regs)
 
 static void velocity_set_multi(struct net_device *dev)
 {
-        struct velocity_info *vptr = dev->priv;
+        struct velocity_info *vptr = netdev_priv(dev);
        struct mac_regs __iomem * regs = vptr->mac_regs;
        u8 rx_mode;
        int i;
@@ -2149,7 +2151,7 @@ static void velocity_set_multi(struct net_device *dev)
 
 static struct net_device_stats *velocity_get_stats(struct net_device *dev)
 {
-        struct velocity_info *vptr = dev->priv;
+        struct velocity_info *vptr = netdev_priv(dev);
        
        /* If the hardware is down, don't touch MII */
        if(!netif_running(dev))
@@ -2192,7 +2194,7 @@ static struct net_device_stats *velocity_get_stats(struct net_device *dev)
 
 static int velocity_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 {
-        struct velocity_info *vptr = dev->priv;
+        struct velocity_info *vptr = netdev_priv(dev);
        int ret;
        /* If we are asked for information and the device is power
@@ -2821,7 +2823,7 @@ static void enable_flow_control_ability(struct velocity_info *vptr)
 
 static int velocity_ethtool_up(struct net_device *dev)
 {
-        struct velocity_info *vptr = dev->priv;
+        struct velocity_info *vptr = netdev_priv(dev);
        if (!netif_running(dev))
                pci_set_power_state(vptr->pdev, PCI_D0);
        return 0;
@@ -2837,14 +2839,14 @@ static int velocity_ethtool_up(struct net_device *dev)
 
 static void velocity_ethtool_down(struct net_device *dev)
 {
-        struct velocity_info *vptr = dev->priv;
+        struct velocity_info *vptr = netdev_priv(dev);
        if (!netif_running(dev))
                pci_set_power_state(vptr->pdev, PCI_D3hot);
 }
 static int velocity_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 {
-        struct velocity_info *vptr = dev->priv;
+        struct velocity_info *vptr = netdev_priv(dev);
        struct mac_regs __iomem * regs = vptr->mac_regs;
        u32 status;
        status = check_connection_type(vptr->mac_regs);
@@ -2869,7 +2871,7 @@ static int velocity_get_settings(struct net_device *dev, struct ethtool_cmd *cmd
 static int velocity_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 {
-        struct velocity_info *vptr = dev->priv;
+        struct velocity_info *vptr = netdev_priv(dev);
        u32 curr_status;
        u32 new_status = 0;
        int ret = 0;
@@ -2892,14 +2894,14 @@ static int velocity_set_settings(struct net_device *dev, struct ethtool_cmd *cmd
 static u32 velocity_get_link(struct net_device *dev)
 {
-        struct velocity_info *vptr = dev->priv;
+        struct velocity_info *vptr = netdev_priv(dev);
        struct mac_regs __iomem * regs = vptr->mac_regs;
        return BYTE_REG_BITS_IS_ON(PHYSR0_LINKGD, &regs->PHYSR0)  ? 0 : 1;
 }
 static void velocity_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
 {
-        struct velocity_info *vptr = dev->priv;
+        struct velocity_info *vptr = netdev_priv(dev);
        strcpy(info->driver, VELOCITY_NAME);
        strcpy(info->version, VELOCITY_VERSION);
        strcpy(info->bus_info, pci_name(vptr->pdev));
@@ -2907,7 +2909,7 @@ static void velocity_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo
 static void velocity_ethtool_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
 {
-        struct velocity_info *vptr = dev->priv;
+        struct velocity_info *vptr = netdev_priv(dev);
        wol->supported = WAKE_PHY | WAKE_MAGIC | WAKE_UCAST | WAKE_ARP;
        wol->wolopts |= WAKE_MAGIC;
        /*
@@ -2923,7 +2925,7 @@ static void velocity_ethtool_get_wol(struct net_device *dev, struct ethtool_woli
 static int velocity_ethtool_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
 {
-        struct velocity_info *vptr = dev->priv;
+        struct velocity_info *vptr = netdev_priv(dev);
        if (!(wol->wolopts & (WAKE_PHY | WAKE_MAGIC | WAKE_UCAST | WAKE_ARP)))
                return -EFAULT;
@@ -2988,7 +2990,7 @@ static struct ethtool_ops velocity_ethtool_ops = {
 
 static int velocity_mii_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 {
-        struct velocity_info *vptr = dev->priv;
+        struct velocity_info *vptr = netdev_priv(dev);
        struct mac_regs __iomem * regs = vptr->mac_regs;
        unsigned long flags;
        struct mii_ioctl_data *miidata = if_mii(ifr);
diff --git a/drivers/net/via-velocity.h b/drivers/net/via-velocity.h
index f1b2640ebdc6..496c3d597444 100644
--- a/drivers/net/via-velocity.h
+++ b/drivers/net/via-velocity.h
@@ -31,6 +31,8 @@
 #define VELOCITY_FULL_DRV_NAM  "VIA Networking Velocity Family Gigabit Ethernet Adapter Driver"
 #define VELOCITY_VERSION       "1.13"
+#define VELOCITY_IO_SIZE        256
 #define PKT_BUF_SZ          1540
 #define MAX_UNITS           8
@@ -1191,7 +1193,6 @@ enum chip_type {
 struct velocity_info_tbl {
        enum chip_type chip_id;
        char *name;
-        int io_size;
        int txqueue;
        u32 flags;
 };
@@ -1751,7 +1752,6 @@ struct velocity_info {
        struct mac_regs __iomem * mac_regs;
        unsigned long memaddr;
        unsigned long ioaddr;
-        u32 io_size;
        u8 rev_id;
diff --git a/drivers/net/wan/Kconfig b/drivers/net/wan/Kconfig
index b5328b0ff927..54b8e492ef97 100644
--- a/drivers/net/wan/Kconfig
+++ b/drivers/net/wan/Kconfig
@@ -134,18 +134,6 @@ config SEALEVEL_4021
          The driver will be compiled as a module: the
          module will be called sealevel.
-config SYNCLINK_SYNCPPP
-        tristate "SyncLink HDLC/SYNCPPP support"
-        depends on WAN
-        help
-          Enables HDLC/SYNCPPP support for the SyncLink WAN driver.
-          Normally the SyncLink WAN driver works with the main PPP driver
-          <file:drivers/net/ppp_generic.c> and pppd program.
-          HDLC/SYNCPPP support allows use of the Cisco HDLC/PPP driver
-          <file:drivers/net/wan/syncppp.c>. The SyncLink WAN driver (in
-          character devices) must also be enabled.
 # Generic HDLC
 config HDLC
        tristate "Generic HDLC layer"
diff --git a/drivers/net/wan/Makefile b/drivers/net/wan/Makefile
index 823c6d5ab90d..316ca6869d5e 100644
--- a/drivers/net/wan/Makefile
+++ b/drivers/net/wan/Makefile
@@ -28,7 +28,6 @@ obj-$(CONFIG_COSA)		+=		syncppp.o	cosa.o
 obj-$(CONFIG_FARSYNC)           +=              syncppp.o       farsync.o
 obj-$(CONFIG_DSCC4)             +=                              dscc4.o
 obj-$(CONFIG_LANMEDIA)          +=              syncppp.o
-obj-$(CONFIG_SYNCLINK_SYNCPPP)  +=              syncppp.o
 obj-$(CONFIG_X25_ASY)           += x25_asy.o
 obj-$(CONFIG_LANMEDIA)          += lmc/
diff --git a/drivers/net/wan/c101.c b/drivers/net/wan/c101.c
index 43d854ace233..c92ac9fde083 100644
--- a/drivers/net/wan/c101.c
+++ b/drivers/net/wan/c101.c
@@ -7,7 +7,7 @@
 * under the terms of version 2 of the GNU General Public License
 * as published by the Free Software Foundation.
 *
- * For information see http://hq.pm.waw.pl/hdlc/
+ * For information see <http://www.kernel.org/pub/linux/utils/net/hdlc/>
 *
 * Sources of information:
 *    Hitachi HD64570 SCA User's Manual
@@ -326,21 +326,21 @@ static int __init c101_run(unsigned long irq, unsigned long winbase)
        if (request_irq(irq, sca_intr, 0, devname, card)) {
                printk(KERN_ERR "c101: could not allocate IRQ\n");
                c101_destroy_card(card);
-                return(-EBUSY);
+                return -EBUSY;
        }
        card->irq = irq;
        if (!request_mem_region(winbase, C101_MAPPED_RAM_SIZE, devname)) {
                printk(KERN_ERR "c101: could not request RAM window\n");
                c101_destroy_card(card);
-                return(-EBUSY);
+                return -EBUSY;
        }
        card->phy_winbase = winbase;
        card->win0base = ioremap(winbase, C101_MAPPED_RAM_SIZE);
        if (!card->win0base) {
                printk(KERN_ERR "c101: could not map I/O address\n");
                c101_destroy_card(card);
-                return -EBUSY;
+                return -EFAULT;
        }
        card->tx_ring_buffers = TX_RING_BUFFERS;
diff --git a/drivers/net/wan/cosa.c b/drivers/net/wan/cosa.c
index e392ee8b37a1..1f95b4864ea1 100644
--- a/drivers/net/wan/cosa.c
+++ b/drivers/net/wan/cosa.c
@@ -79,13 +79,11 @@
 /* ---------- Headers, macros, data structures ---------- */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/poll.h>
 #include <linux/fs.h>
-#include <linux/devfs_fs_kernel.h>
 #include <linux/interrupt.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
@@ -393,7 +391,6 @@ static int __init cosa_init(void)
                err = -ENODEV;
                goto out;
        }
-        devfs_mk_dir("cosa");
        cosa_class = class_create(THIS_MODULE, "cosa");
        if (IS_ERR(cosa_class)) {
                err = PTR_ERR(cosa_class);
@@ -402,13 +399,6 @@ static int __init cosa_init(void)
        for (i=0; i<nr_cards; i++) {
                class_device_create(cosa_class, NULL, MKDEV(cosa_major, i),
                                NULL, "cosa%d", i);
-                err = devfs_mk_cdev(MKDEV(cosa_major, i),
-                                S_IFCHR|S_IRUSR|S_IWUSR,
-                                "cosa/%d", i);
-                if (err) {
-                        class_device_destroy(cosa_class, MKDEV(cosa_major, i));
-                        goto out_chrdev;                
-                }
        }
        err = 0;
        goto out;
@@ -426,12 +416,9 @@ static void __exit cosa_exit(void)
        int i;
        printk(KERN_INFO "Unloading the cosa module\n");
-        for (i=0; i<nr_cards; i++) {
+        for (i=0; i<nr_cards; i++)
                class_device_destroy(cosa_class, MKDEV(cosa_major, i));
-                devfs_remove("cosa/%d", i);
-        }
        class_destroy(cosa_class);
-        devfs_remove("cosa");
        for (cosa=cosa_cards; nr_cards--; cosa++) {
                /* Clean up the per-channel data */
                for (i=0; i<cosa->nchannels; i++) {
diff --git a/drivers/net/wan/dscc4.c b/drivers/net/wan/dscc4.c
index 4505540e3c59..684af4316ffd 100644
--- a/drivers/net/wan/dscc4.c
+++ b/drivers/net/wan/dscc4.c
@@ -732,15 +732,15 @@ static int __devinit dscc4_init_one(struct pci_dev *pdev,
        ioaddr = ioremap(pci_resource_start(pdev, 0),
                                        pci_resource_len(pdev, 0));
        if (!ioaddr) {
-                printk(KERN_ERR "%s: cannot remap MMIO region %lx @ %lx\n",
+                printk(KERN_ERR "%s: cannot remap MMIO region %llx @ %llx\n",
-                        DRV_NAME, pci_resource_len(pdev, 0),
+                        DRV_NAME, (unsigned long long)pci_resource_len(pdev, 0),
-                        pci_resource_start(pdev, 0));
+                        (unsigned long long)pci_resource_start(pdev, 0));
                rc = -EIO;
                goto err_free_mmio_regions_2;
        }
-        printk(KERN_DEBUG "Siemens DSCC4, MMIO at %#lx (regs), %#lx (lbi), IRQ %d\n",
+        printk(KERN_DEBUG "Siemens DSCC4, MMIO at %#llx (regs), %#llx (lbi), IRQ %d\n",
-                pci_resource_start(pdev, 0),
+                (unsigned long long)pci_resource_start(pdev, 0),
-                pci_resource_start(pdev, 1), pdev->irq);
+                (unsigned long long)pci_resource_start(pdev, 1), pdev->irq);
        /* Cf errata DS5 p.2 */
        pci_write_config_byte(pdev, PCI_LATENCY_TIMER, 0xf8);
@@ -752,7 +752,7 @@ static int __devinit dscc4_init_one(struct pci_dev *pdev,
        priv = pci_get_drvdata(pdev);
-        rc = request_irq(pdev->irq, dscc4_irq, SA_SHIRQ, DRV_NAME, priv->root);
+        rc = request_irq(pdev->irq, dscc4_irq, IRQF_SHARED, DRV_NAME, priv->root);
        if (rc < 0) {
                printk(KERN_WARNING "%s: IRQ %d busy\n", DRV_NAME, pdev->irq);
                goto err_release_4;
diff --git a/drivers/net/wan/farsync.c b/drivers/net/wan/farsync.c
index 7981a2c7906e..3705db04a343 100644
--- a/drivers/net/wan/farsync.c
+++ b/drivers/net/wan/farsync.c
@@ -2519,7 +2519,7 @@ fst_add_one(struct pci_dev *pdev, const struct pci_device_id *ent)
        dbg(DBG_PCI, "kernel mem %p, ctlmem %p\n", card->mem, card->ctlmem);
        /* Register the interrupt handler */
-        if (request_irq(pdev->irq, fst_intr, SA_SHIRQ, FST_DEV_NAME, card)) {
+        if (request_irq(pdev->irq, fst_intr, IRQF_SHARED, FST_DEV_NAME, card)) {
                printk_err("Unable to register interrupt %d\n", card->irq);
                pci_release_regions(pdev);
                pci_disable_device(pdev);
diff --git a/drivers/net/wan/hdlc_generic.c b/drivers/net/wan/hdlc_generic.c
index 46cef8f92133..b7da55140fbd 100644
--- a/drivers/net/wan/hdlc_generic.c
+++ b/drivers/net/wan/hdlc_generic.c
@@ -22,7 +22,6 @@
 * - proto.start() and stop() are called with spin_lock_irq held.
 */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>
@@ -259,7 +258,7 @@ int hdlc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
        }
 }
-static void hdlc_setup(struct net_device *dev)
+void hdlc_setup(struct net_device *dev)
 {
        hdlc_device *hdlc = dev_to_hdlc(dev);
@@ -288,26 +287,6 @@ struct net_device *alloc_hdlcdev(void *priv)
        return dev;
 }
-int register_hdlc_device(struct net_device *dev)
-{
-        int result = dev_alloc_name(dev, "hdlc%d");
-        if (result < 0)
-                return result;
-        result = register_netdev(dev);
-        if (result != 0)
-                return -EIO;
-#if 0
-        if (netif_carrier_ok(dev))
-                netif_carrier_off(dev); /* no carrier until DCD goes up */
-#endif
-        return 0;
-}
 void unregister_hdlc_device(struct net_device *dev)
 {
        rtnl_lock();
@@ -326,8 +305,8 @@ EXPORT_SYMBOL(hdlc_open);
 EXPORT_SYMBOL(hdlc_close);
 EXPORT_SYMBOL(hdlc_set_carrier);
 EXPORT_SYMBOL(hdlc_ioctl);
+EXPORT_SYMBOL(hdlc_setup);
 EXPORT_SYMBOL(alloc_hdlcdev);
-EXPORT_SYMBOL(register_hdlc_device);
 EXPORT_SYMBOL(unregister_hdlc_device);
 static struct packet_type hdlc_packet_type = {
diff --git a/drivers/net/wan/hostess_sv11.c b/drivers/net/wan/hostess_sv11.c
index cf5c805452a3..a4f735723c41 100644
--- a/drivers/net/wan/hostess_sv11.c
+++ b/drivers/net/wan/hostess_sv11.c
@@ -264,7 +264,7 @@ static struct sv11_device *sv11_init(int iobase, int irq)
        /* We want a fast IRQ for this device. Actually we'd like an even faster
           IRQ ;) - This is one driver RtLinux is made for */
           
-        if(request_irq(irq, &z8530_interrupt, SA_INTERRUPT, "Hostess SV11", dev)<0)
+        if(request_irq(irq, &z8530_interrupt, IRQF_DISABLED, "Hostess SV11", dev)<0)
        {
                printk(KERN_WARNING "hostess: IRQ %d already in use.\n", irq);
                goto fail1;
diff --git a/drivers/net/wan/lmc/lmc_main.c b/drivers/net/wan/lmc/lmc_main.c
index 40926d779161..39f44241a728 100644
--- a/drivers/net/wan/lmc/lmc_main.c
+++ b/drivers/net/wan/lmc/lmc_main.c
@@ -1058,7 +1058,7 @@ static int lmc_open (struct net_device *dev) /*fold00*/
    lmc_softreset (sc);
    /* Since we have to use PCI bus, this should work on x86,alpha,ppc */
-    if (request_irq (dev->irq, &lmc_interrupt, SA_SHIRQ, dev->name, dev)){
+    if (request_irq (dev->irq, &lmc_interrupt, IRQF_SHARED, dev->name, dev)){
        printk(KERN_WARNING "%s: could not get irq: %d\n", dev->name, dev->irq);
        lmc_trace(dev, "lmc_open irq failed out");
        return -EAGAIN;
diff --git a/drivers/net/wan/lmc/lmc_media.c b/drivers/net/wan/lmc/lmc_media.c
index af8b55fdd9d9..ae01555d24cf 100644
--- a/drivers/net/wan/lmc/lmc_media.c
+++ b/drivers/net/wan/lmc/lmc_media.c
@@ -1,6 +1,5 @@
 /* $Id: lmc_media.c,v 1.13 2000/04/11 05:25:26 asj Exp $ */
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/timer.h>
diff --git a/drivers/net/wan/n2.c b/drivers/net/wan/n2.c
index cd32751b64eb..e013b817cab8 100644
--- a/drivers/net/wan/n2.c
+++ b/drivers/net/wan/n2.c
@@ -7,7 +7,7 @@
 * under the terms of version 2 of the GNU General Public License
 * as published by the Free Software Foundation.
 *
- * For information see http://hq.pm.waw.pl/hdlc/
+ * For information see <http://www.kernel.org/pub/linux/utils/net/hdlc/>
 *
 * Note: integrated CSU/DSU/DDS are not supported by this driver
 *
@@ -387,6 +387,11 @@ static int __init n2_run(unsigned long io, unsigned long irq,
        }
        card->phy_winbase = winbase;
        card->winbase = ioremap(winbase, USE_WINDOWSIZE);
+        if (!card->winbase) {
+                printk(KERN_ERR "n2: ioremap() failed\n");
+                n2_destroy_card(card);
+                return -EFAULT;
+        }
        outb(0, io + N2_PCR);
        outb(winbase >> 12, io + N2_BAR);
diff --git a/drivers/net/wan/pc300_drv.c b/drivers/net/wan/pc300_drv.c
index a3e65d1bc19b..567effff4a3e 100644
--- a/drivers/net/wan/pc300_drv.c
+++ b/drivers/net/wan/pc300_drv.c
@@ -3445,9 +3445,9 @@ cpc_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
        card = (pc300_t *) kmalloc(sizeof(pc300_t), GFP_KERNEL);
        if (card == NULL) {
-                printk("PC300 found at RAM 0x%08lx, "
+                printk("PC300 found at RAM 0x%016llx, "
                       "but could not allocate card structure.\n",
-                       pci_resource_start(pdev, 3));
+                       (unsigned long long)pci_resource_start(pdev, 3));
                err = -ENOMEM;
                goto err_disable_dev;
        }
@@ -3600,7 +3600,7 @@ cpc_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
        }
        /* Allocate IRQ */
-        if (request_irq(card->hw.irq, cpc_intr, SA_SHIRQ, "Cyclades-PC300", card)) {
+        if (request_irq(card->hw.irq, cpc_intr, IRQF_SHARED, "Cyclades-PC300", card)) {
                printk ("PC300 found at RAM 0x%08x, but could not allocate IRQ%d.\n",
                         card->hw.ramphys, card->hw.irq);
                goto err_io_unmap;
diff --git a/drivers/net/wan/pci200syn.c b/drivers/net/wan/pci200syn.c
index f485a97844cc..4df61fa3214b 100644
--- a/drivers/net/wan/pci200syn.c
+++ b/drivers/net/wan/pci200syn.c
@@ -7,7 +7,7 @@
 * under the terms of version 2 of the GNU General Public License
 * as published by the Free Software Foundation.
 *
- * For information see http://hq.pm.waw.pl/hdlc/
+ * For information see <http://www.kernel.org/pub/linux/utils/net/hdlc/>
 *
 * Sources of information:
 *    Hitachi HD64572 SCA-II User's Manual
@@ -354,6 +354,7 @@ static int __devinit pci200_pci_init_one(struct pci_dev *pdev,
            card->rambase == NULL) {
                printk(KERN_ERR "pci200syn: ioremap() failed\n");
                pci200_pci_remove_one(pdev);
+                return -EFAULT;
        }
        /* Reset PLX */
@@ -401,7 +402,7 @@ static int __devinit pci200_pci_init_one(struct pci_dev *pdev,
        writew(readw(p) | 0x0040, p);
        /* Allocate IRQ */
-        if (request_irq(pdev->irq, sca_intr, SA_SHIRQ, devname, card)) {
+        if (request_irq(pdev->irq, sca_intr, IRQF_SHARED, devname, card)) {
                printk(KERN_WARNING "pci200syn: could not allocate IRQ%d.\n",
                       pdev->irq);
                pci200_pci_remove_one(pdev);
diff --git a/drivers/net/wan/sbni.c b/drivers/net/wan/sbni.c
index 175ba13bce41..fc75bec19029 100644
--- a/drivers/net/wan/sbni.c
+++ b/drivers/net/wan/sbni.c
@@ -37,7 +37,6 @@
 *      Known problem: this driver wasn't tested on multiprocessor machine.
 */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/ptrace.h>
@@ -1193,7 +1192,7 @@ sbni_open( struct net_device  *dev )
                        }
        }
-        if( request_irq(dev->irq, sbni_interrupt, SA_SHIRQ, dev->name, dev) ) {
+        if( request_irq(dev->irq, sbni_interrupt, IRQF_SHARED, dev->name, dev) ) {
                printk( KERN_ERR "%s: unable to get IRQ %d.\n",
                        dev->name, dev->irq );
                return  -EAGAIN;
diff --git a/drivers/net/wan/sdla.c b/drivers/net/wan/sdla.c
index 22e794071cf4..7628c2d81f45 100644
--- a/drivers/net/wan/sdla.c
+++ b/drivers/net/wan/sdla.c
@@ -60,9 +60,9 @@
 static const char* version = "SDLA driver v0.30, 12 Sep 1996, mike.mclagan@linux.org";
-static unsigned int valid_port[] __initdata = { 0x250, 0x270, 0x280, 0x300, 0x350, 0x360, 0x380, 0x390};
+static unsigned int valid_port[] = { 0x250, 0x270, 0x280, 0x300, 0x350, 0x360, 0x380, 0x390};
-static unsigned int valid_mem[]  __initdata = {
+static unsigned int valid_mem[] = {
                                    0xA0000, 0xA2000, 0xA4000, 0xA6000, 0xA8000, 0xAA000, 0xAC000, 0xAE000, 
                                    0xB0000, 0xB2000, 0xB4000, 0xB6000, 0xB8000, 0xBA000, 0xBC000, 0xBE000,
                                    0xC0000, 0xC2000, 0xC4000, 0xC6000, 0xC8000, 0xCA000, 0xCC000, 0xCE000,
diff --git a/drivers/net/wan/sealevel.c b/drivers/net/wan/sealevel.c
index 050e854e7774..70fb1b98b1dd 100644
--- a/drivers/net/wan/sealevel.c
+++ b/drivers/net/wan/sealevel.c
@@ -322,7 +322,7 @@ static __init struct slvl_board *slvl_init(int iobase, int irq,
        /* We want a fast IRQ for this device. Actually we'd like an even faster
           IRQ ;) - This is one driver RtLinux is made for */
   
-        if(request_irq(irq, &z8530_interrupt, SA_INTERRUPT, "SeaLevel", dev)<0)
+        if(request_irq(irq, &z8530_interrupt, IRQF_DISABLED, "SeaLevel", dev)<0)
        {
                printk(KERN_WARNING "sealevel: IRQ %d already in use.\n", irq);
                goto fail1_1;
diff --git a/drivers/net/wan/syncppp.c b/drivers/net/wan/syncppp.c
index 2d1bba06a085..c13b459a0137 100644
--- a/drivers/net/wan/syncppp.c
+++ b/drivers/net/wan/syncppp.c
@@ -37,7 +37,6 @@
 */
 #undef DEBUG
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
diff --git a/drivers/net/wan/wanxl.c b/drivers/net/wan/wanxl.c
index 29a756dd979b..d564224cdca9 100644
--- a/drivers/net/wan/wanxl.c
+++ b/drivers/net/wan/wanxl.c
@@ -634,7 +634,13 @@ static int __devinit wanxl_pci_init_one(struct pci_dev *pdev,
        /* set up PLX mapping */
        plx_phy = pci_resource_start(pdev, 0);
        card->plx = ioremap_nocache(plx_phy, 0x70);
+        if (!card->plx) {
+                printk(KERN_ERR "wanxl: ioremap() failed\n");
+                wanxl_pci_remove_one(pdev);
+                return -EFAULT;
+        }
 #if RESET_WHILE_LOADING
        wanxl_reset(card);
@@ -700,6 +706,12 @@ static int __devinit wanxl_pci_init_one(struct pci_dev *pdev,
        }
        mem = ioremap_nocache(mem_phy, PDM_OFFSET + sizeof(firmware));
+        if (!mem) {
+                printk(KERN_ERR "wanxl: ioremap() failed\n");
+                wanxl_pci_remove_one(pdev);
+                return -EFAULT;
+        }
        for (i = 0; i < sizeof(firmware); i += 4)
                writel(htonl(*(u32*)(firmware + i)), mem + PDM_OFFSET + i);
@@ -743,7 +755,7 @@ static int __devinit wanxl_pci_init_one(struct pci_dev *pdev,
               pci_name(pdev), plx_phy, ramsize / 1024, mem_phy, pdev->irq);
        /* Allocate IRQ */
-        if (request_irq(pdev->irq, wanxl_intr, SA_SHIRQ, "wanXL", card)) {
+        if (request_irq(pdev->irq, wanxl_intr, IRQF_SHARED, "wanXL", card)) {
                printk(KERN_WARNING "wanXL %s: could not allocate IRQ%i.\n",
                       pci_name(pdev), pdev->irq);
                wanxl_pci_remove_one(pdev);
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index 30ec235e6935..fa9d2c4edc93 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -550,6 +550,7 @@ config USB_ZD1201
 source "drivers/net/wireless/hostap/Kconfig"
 source "drivers/net/wireless/bcm43xx/Kconfig"
+source "drivers/net/wireless/zd1211rw/Kconfig"
 # yes, this works even when no drivers are selected
 config NET_WIRELESS
diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile
index 512603de309a..c613af17a159 100644
--- a/drivers/net/wireless/Makefile
+++ b/drivers/net/wireless/Makefile
@@ -36,6 +36,7 @@ obj-$(CONFIG_PRISM54)		+= prism54/
 obj-$(CONFIG_HOSTAP)            += hostap/
 obj-$(CONFIG_BCM43XX)           += bcm43xx/
+obj-$(CONFIG_ZD1211RW)          += zd1211rw/
 # 16-bit wireless PCMCIA client drivers
 obj-$(CONFIG_PCMCIA_RAYCS)      += ray_cs.o
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
index 4069b79d8259..a4dd13942714 100644
--- a/drivers/net/wireless/airo.c
+++ b/drivers/net/wireless/airo.c
@@ -19,7 +19,6 @@
 ======================================================================*/
-#include <linux/config.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
@@ -2849,7 +2848,7 @@ static struct net_device *_init_airo_card( unsigned short irq, int port,
        reset_card (dev, 1);
        msleep(400);
-        rc = request_irq( dev->irq, airo_interrupt, SA_SHIRQ, dev->name, dev );
+        rc = request_irq( dev->irq, airo_interrupt, IRQF_SHARED, dev->name, dev );
        if (rc) {
                airo_print_err(dev->name, "register interrupt %d failed, rc %d",
                                irq, rc);
diff --git a/drivers/net/wireless/airo_cs.c b/drivers/net/wireless/airo_cs.c
index af0cbb6c5c0c..ac9437d497f0 100644
--- a/drivers/net/wireless/airo_cs.c
+++ b/drivers/net/wireless/airo_cs.c
@@ -20,7 +20,6 @@
    
 ======================================================================*/
-#include <linux/config.h>
 #ifdef __IN_PCMCIA_PACKAGE__
 #include <pcmcia/k_compat.h>
 #endif
diff --git a/drivers/net/wireless/airport.c b/drivers/net/wireless/airport.c
index 7b321f7cf358..38fac3bbcd82 100644
--- a/drivers/net/wireless/airport.c
+++ b/drivers/net/wireless/airport.c
@@ -14,7 +14,6 @@
 #define DRIVER_NAME "airport"
 #define PFX DRIVER_NAME ": "
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
diff --git a/drivers/net/wireless/arlan-main.c b/drivers/net/wireless/arlan-main.c
index bed6823d9809..bb6bea4f3233 100644
--- a/drivers/net/wireless/arlan-main.c
+++ b/drivers/net/wireless/arlan-main.c
@@ -5,7 +5,6 @@
 * This module provides support for the Arlan 655 card made by Aironet
 */
-#include <linux/config.h>
 #include "arlan.h"
 #if BITS_PER_LONG != 32
diff --git a/drivers/net/wireless/arlan-proc.c b/drivers/net/wireless/arlan-proc.c
index a2cca521f444..5fa985435ffa 100644
--- a/drivers/net/wireless/arlan-proc.c
+++ b/drivers/net/wireless/arlan-proc.c
@@ -1,4 +1,3 @@
-#include <linux/config.h>
 #include "arlan.h"
 #include <linux/sysctl.h>
diff --git a/drivers/net/wireless/arlan.h b/drivers/net/wireless/arlan.h
index 70a6d7b83c4a..3ed1df75900f 100644
--- a/drivers/net/wireless/arlan.h
+++ b/drivers/net/wireless/arlan.h
@@ -5,7 +5,6 @@
 */
 #include <linux/module.h>
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/skbuff.h>
diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c
index 8606c88886fc..995c7bea5897 100644
--- a/drivers/net/wireless/atmel.c
+++ b/drivers/net/wireless/atmel.c
@@ -39,7 +39,6 @@
 ******************************************************************************/
-#include <linux/config.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
@@ -1578,7 +1577,7 @@ struct net_device *init_atmel_card(unsigned short irq, unsigned long port,
        SET_NETDEV_DEV(dev, sys_dev);
-        if ((rc = request_irq(dev->irq, service_interrupt, SA_SHIRQ, dev->name, dev))) {
+        if ((rc = request_irq(dev->irq, service_interrupt, IRQF_SHARED, dev->name, dev))) {
                printk(KERN_ERR "%s: register interrupt %d failed, rc %d\n", dev->name, irq, rc);
                goto err_out_free;
        }
diff --git a/drivers/net/wireless/atmel_cs.c b/drivers/net/wireless/atmel_cs.c
index 26bf1127524d..785664090bb4 100644
--- a/drivers/net/wireless/atmel_cs.c
+++ b/drivers/net/wireless/atmel_cs.c
@@ -29,7 +29,6 @@
 ******************************************************************************/
-#include <linux/config.h>
 #ifdef __IN_PCMCIA_PACKAGE__
 #include <pcmcia/k_compat.h>
 #endif
diff --git a/drivers/net/wireless/atmel_pci.c b/drivers/net/wireless/atmel_pci.c
index a61b3bc6cccf..d425c3cefded 100644
--- a/drivers/net/wireless/atmel_pci.c
+++ b/drivers/net/wireless/atmel_pci.c
@@ -19,7 +19,6 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ******************************************************************************/
-#include <linux/config.h>
 #include <linux/pci.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
diff --git a/drivers/net/wireless/bcm43xx/Kconfig b/drivers/net/wireless/bcm43xx/Kconfig
index 25ea4748f0b9..533993f538fc 100644
--- a/drivers/net/wireless/bcm43xx/Kconfig
+++ b/drivers/net/wireless/bcm43xx/Kconfig
@@ -2,6 +2,7 @@ config BCM43XX
        tristate "Broadcom BCM43xx wireless support"
        depends on PCI && IEEE80211 && IEEE80211_SOFTMAC && NET_RADIO && EXPERIMENTAL
        select FW_LOADER
+        select HW_RANDOM
        ---help---
          This is an experimental driver for the Broadcom 43xx wireless chip,
          found in the Apple Airport Extreme and various other devices.
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx.h b/drivers/net/wireless/bcm43xx/bcm43xx.h
index d8f917c21ea4..17a56828e232 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx.h
+++ b/drivers/net/wireless/bcm43xx/bcm43xx.h
@@ -1,6 +1,7 @@
 #ifndef BCM43xx_H_
 #define BCM43xx_H_
+#include <linux/hw_random.h>
 #include <linux/version.h>
 #include <linux/kernel.h>
 #include <linux/spinlock.h>
@@ -82,6 +83,7 @@
 #define BCM43xx_MMIO_TSF_1              0x634 /* core rev < 3 only */
 #define BCM43xx_MMIO_TSF_2              0x636 /* core rev < 3 only */
 #define BCM43xx_MMIO_TSF_3              0x638 /* core rev < 3 only */
+#define BCM43xx_MMIO_RNG                0x65A
 #define BCM43xx_MMIO_POWERUP_DELAY      0x6A8
 /* SPROM offsets. */
@@ -750,6 +752,10 @@ struct bcm43xx_private {
        const struct firmware *initvals0;
        const struct firmware *initvals1;
+        /* Random Number Generator. */
+        struct hwrng rng;
+        char rng_name[20 + 1];
        /* Debugging stuff follows. */
 #ifdef CONFIG_BCM43XX_DEBUG
        struct bcm43xx_dfsentry *dfsentry;
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_ethtool.c b/drivers/net/wireless/bcm43xx/bcm43xx_ethtool.c
index b3ffcf501311..e386dcc32e8c 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_ethtool.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_ethtool.c
@@ -32,7 +32,7 @@
 #include <linux/netdevice.h>
 #include <linux/pci.h>
 #include <linux/string.h>
-#include <linux/version.h>
+#include <linux/utsrelease.h>
 static void bcm43xx_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_main.c b/drivers/net/wireless/bcm43xx/bcm43xx_main.c
index 085d7857fe31..e1c5a939bca4 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_main.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_main.c
@@ -1885,6 +1885,15 @@ static irqreturn_t bcm43xx_interrupt_handler(int irq, void *dev_id, struct pt_re
        spin_lock(&bcm->irq_lock);
+        /* Only accept IRQs, if we are initialized properly.
+         * This avoids an RX race while initializing.
+         * We should probably not enable IRQs before we are initialized
+         * completely, but some careful work is needed to fix this. I think it
+         * is best to stay with this cheap workaround for now... .
+         */
+        if (unlikely(bcm43xx_status(bcm) != BCM43xx_STAT_INITIALIZED))
+                goto out;
        reason = bcm43xx_read32(bcm, BCM43xx_MMIO_GEN_IRQ_REASON);
        if (reason == 0xffffffff) {
                /* irq not for us (shared irq) */
@@ -1906,19 +1915,11 @@ static irqreturn_t bcm43xx_interrupt_handler(int irq, void *dev_id, struct pt_re
        bcm43xx_interrupt_ack(bcm, reason);
-        /* Only accept IRQs, if we are initialized properly.
+        /* disable all IRQs. They are enabled again in the bottom half. */
-         * This avoids an RX race while initializing.
+        bcm->irq_savedstate = bcm43xx_interrupt_disable(bcm, BCM43xx_IRQ_ALL);
-         * We should probably not enable IRQs before we are initialized
+        /* save the reason code and call our bottom half. */
-         * completely, but some careful work is needed to fix this. I think it
+        bcm->irq_reason = reason;
-         * is best to stay with this cheap workaround for now... .
+        tasklet_schedule(&bcm->isr_tasklet);
-         */
-        if (likely(bcm43xx_status(bcm) == BCM43xx_STAT_INITIALIZED)) {
-                /* disable all IRQs. They are enabled again in the bottom half. */
-                bcm->irq_savedstate = bcm43xx_interrupt_disable(bcm, BCM43xx_IRQ_ALL);
-                /* save the reason code and call our bottom half. */
-                bcm->irq_reason = reason;
-                tasklet_schedule(&bcm->isr_tasklet);
-        }
 out:
        mmiowb();
@@ -2175,7 +2176,7 @@ static int bcm43xx_initialize_irq(struct bcm43xx_private *bcm)
        }
 #endif
        res = request_irq(bcm->irq, bcm43xx_interrupt_handler,
-                          SA_SHIRQ, KBUILD_MODNAME, bcm);
+                          IRQF_SHARED, KBUILD_MODNAME, bcm);
        if (res) {
                printk(KERN_ERR PFX "Cannot register IRQ%d\n", bcm->irq);
                return -ENODEV;
@@ -3237,6 +3238,39 @@ static void bcm43xx_security_init(struct bcm43xx_private *bcm)
        bcm43xx_clear_keys(bcm);
 }
+static int bcm43xx_rng_read(struct hwrng *rng, u32 *data)
+{
+        struct bcm43xx_private *bcm = (struct bcm43xx_private *)rng->priv;
+        unsigned long flags;
+        bcm43xx_lock_irqonly(bcm, flags);
+        *data = bcm43xx_read16(bcm, BCM43xx_MMIO_RNG);
+        bcm43xx_unlock_irqonly(bcm, flags);
+        return (sizeof(u16));
+}
+static void bcm43xx_rng_exit(struct bcm43xx_private *bcm)
+{
+        hwrng_unregister(&bcm->rng);
+}
+static int bcm43xx_rng_init(struct bcm43xx_private *bcm)
+{
+        int err;
+        snprintf(bcm->rng_name, ARRAY_SIZE(bcm->rng_name),
+                 "%s_%s", KBUILD_MODNAME, bcm->net_dev->name);
+        bcm->rng.name = bcm->rng_name;
+        bcm->rng.data_read = bcm43xx_rng_read;
+        bcm->rng.priv = (unsigned long)bcm;
+        err = hwrng_register(&bcm->rng);
+        if (err)
+                printk(KERN_ERR PFX "RNG init failed (%d)\n", err);
+        return err;
+}
 /* This is the opposite of bcm43xx_init_board() */
 static void bcm43xx_free_board(struct bcm43xx_private *bcm)
 {
@@ -3248,6 +3282,7 @@ static void bcm43xx_free_board(struct bcm43xx_private *bcm)
        bcm43xx_set_status(bcm, BCM43xx_STAT_SHUTTINGDOWN);
+        bcm43xx_rng_exit(bcm);
        for (i = 0; i < BCM43xx_MAX_80211_CORES; i++) {
                if (!bcm->core_80211[i].available)
                        continue;
@@ -3325,6 +3360,9 @@ static int bcm43xx_init_board(struct bcm43xx_private *bcm)
                bcm43xx_switch_core(bcm, &bcm->core_80211[0]);
                bcm43xx_mac_enable(bcm);
        }
+        err = bcm43xx_rng_init(bcm);
+        if (err)
+                goto err_80211_unwind;
        bcm43xx_macfilter_clear(bcm, BCM43xx_MACFILTER_ASSOC);
        bcm43xx_macfilter_set(bcm, BCM43xx_MACFILTER_SELF, (u8 *)(bcm->net_dev->dev_addr));
        dprintk(KERN_INFO PFX "80211 cores initialized\n");
@@ -3661,6 +3699,10 @@ static void bcm43xx_ieee80211_set_security(struct net_device *net_dev,
                secinfo->encrypt = sec->encrypt;
                dprintk(", .encrypt = %d", sec->encrypt);
        }
+        if (sec->flags & SEC_AUTH_MODE) {
+                secinfo->auth_mode = sec->auth_mode;
+                dprintk(", .auth_mode = %d\n", sec->auth_mode);
+        }
        dprintk("\n");
        if (bcm43xx_status(bcm) == BCM43xx_STAT_INITIALIZED &&
            !bcm->ieee->host_encrypt) {
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_main.h b/drivers/net/wireless/bcm43xx/bcm43xx_main.h
index 30a202b258b5..116493671f88 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_main.h
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_main.h
@@ -112,30 +112,6 @@ int bcm43xx_channel_to_freq(struct bcm43xx_private *bcm,
        return bcm43xx_channel_to_freq_bg(channel);
 }
-/* Lightweight function to check if a channel number is valid.
- * Note that this does _NOT_ check for geographical restrictions!
- */
-static inline
-int bcm43xx_is_valid_channel_a(u8 channel)
-{
-        return (channel >= IEEE80211_52GHZ_MIN_CHANNEL
-               && channel <= IEEE80211_52GHZ_MAX_CHANNEL);
-}
-static inline
-int bcm43xx_is_valid_channel_bg(u8 channel)
-{
-        return (channel >= IEEE80211_24GHZ_MIN_CHANNEL
-               && channel <= IEEE80211_24GHZ_MAX_CHANNEL);
-}
-static inline
-int bcm43xx_is_valid_channel(struct bcm43xx_private *bcm,
-                             u8 channel)
-{
-        if (bcm43xx_current_phy(bcm)->type == BCM43xx_PHYTYPE_A)
-                return bcm43xx_is_valid_channel_a(channel);
-        return bcm43xx_is_valid_channel_bg(channel);
-}
 void bcm43xx_tsf_read(struct bcm43xx_private *bcm, u64 *tsf);
 void bcm43xx_tsf_write(struct bcm43xx_private *bcm, u64 tsf);
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_radio.c b/drivers/net/wireless/bcm43xx/bcm43xx_radio.c
index af5c0bff1696..bb9c484d7e19 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_radio.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_radio.c
@@ -1594,11 +1594,11 @@ int bcm43xx_radio_selectchannel(struct bcm43xx_private *bcm,
        u16 r8, tmp;
        u16 freq;
+        if (!ieee80211_is_valid_channel(bcm->ieee, channel))
+                return -EINVAL;
        if ((radio->manufact == 0x17F) &&
            (radio->version == 0x2060) &&
            (radio->revision == 1)) {
-                if (channel > 200)
-                        return -EINVAL;
                freq = channel2freq_a(channel);
                r8 = bcm43xx_radio_read16(bcm, 0x0008);
@@ -1651,9 +1651,6 @@ int bcm43xx_radio_selectchannel(struct bcm43xx_private *bcm,
                TODO(); //TODO: TSSI2dbm workaround
                bcm43xx_phy_xmitpower(bcm);//FIXME correct?
        } else {
-                if ((channel < 1) || (channel > 14))
-                        return -EINVAL;
                if (synthetic_pu_workaround)
                        bcm43xx_synth_pu_workaround(bcm, channel);
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_wx.c b/drivers/net/wireless/bcm43xx/bcm43xx_wx.c
index c35cb3a0777e..5c36e29efff7 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_wx.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_wx.c
@@ -119,7 +119,7 @@ static int bcm43xx_wx_set_channelfreq(struct net_device *net_dev,
                channel = bcm43xx_freq_to_channel(bcm, data->freq.m);
                freq = data->freq.m;
        }
-        if (!bcm43xx_is_valid_channel(bcm, channel))
+        if (!ieee80211_is_valid_channel(bcm->ieee, channel))
                goto out_unlock;
        if (bcm43xx_status(bcm) == BCM43xx_STAT_INITIALIZED) {
                //ieee80211softmac_disassoc(softmac, $REASON);
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_xmit.c b/drivers/net/wireless/bcm43xx/bcm43xx_xmit.c
index d8ece28c079f..6dbd855b3647 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_xmit.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_xmit.c
@@ -296,11 +296,14 @@ void bcm43xx_generate_txhdr(struct bcm43xx_private *bcm,
        u16 control = 0;
        u16 wsec_rate = 0;
        u16 encrypt_frame;
+        const u16 ftype = WLAN_FC_GET_TYPE(le16_to_cpu(wireless_header->frame_ctl));
+        const int is_mgt = (ftype == IEEE80211_FTYPE_MGMT);
        /* Now construct the TX header. */
        memset(txhdr, 0, sizeof(*txhdr));
-        bitrate = bcm->softmac->txrates.default_rate;
+        bitrate = ieee80211softmac_suggest_txrate(bcm->softmac,
+                is_multicast_ether_addr(wireless_header->addr1), is_mgt);
        ofdm_modulation = !(ieee80211_is_cck_rate(bitrate));
        fallback_bitrate = bcm43xx_calc_fallback_rate(bitrate);
        fallback_ofdm_modulation = !(ieee80211_is_cck_rate(fallback_bitrate));
diff --git a/drivers/net/wireless/hermes.c b/drivers/net/wireless/hermes.c
index 2aa2f389c0d5..29d39105f5b8 100644
--- a/drivers/net/wireless/hermes.c
+++ b/drivers/net/wireless/hermes.c
@@ -38,7 +38,6 @@
 * under either the MPL or the GPL.
 */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c
index db03dc2646df..52e6df5c1a92 100644
--- a/drivers/net/wireless/hostap/hostap_cs.c
+++ b/drivers/net/wireless/hostap/hostap_cs.c
@@ -1,6 +1,5 @@
 #define PRISM2_PCCARD
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/if.h>
@@ -844,7 +843,7 @@ static struct pcmcia_device_id hostap_cs_ids[] = {
        PCMCIA_DEVICE_MANF_CARD(0x02d2, 0x0001),
        PCMCIA_DEVICE_MANF_CARD(0x50c2, 0x0001),
        PCMCIA_DEVICE_MANF_CARD(0x50c2, 0x7300),
-        PCMCIA_DEVICE_MANF_CARD(0xc00f, 0x0000),
+/*      PCMCIA_DEVICE_MANF_CARD(0xc00f, 0x0000),    conflict with pcnet_cs */
        PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0002),
        PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0005),
        PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0010),
diff --git a/drivers/net/wireless/hostap/hostap_hw.c b/drivers/net/wireless/hostap/hostap_hw.c
index 328e9a1d13b5..dafaa5ff5aa6 100644
--- a/drivers/net/wireless/hostap/hostap_hw.c
+++ b/drivers/net/wireless/hostap/hostap_hw.c
@@ -30,7 +30,6 @@
 */
-#include <linux/config.h>
 #include <asm/delay.h>
 #include <asm/uaccess.h>
@@ -3096,6 +3095,14 @@ static void prism2_clear_set_tim_queue(local_info_t *local)
 }
+/*
+ * HostAP uses two layers of net devices, where the inner
+ * layer gets called all the time from the outer layer.
+ * This is a natural nesting, which needs a split lock type.
+ */
+static struct lock_class_key hostap_netdev_xmit_lock_key;
 static struct net_device *
 prism2_init_local_data(struct prism2_helper_functions *funcs, int card_idx,
                       struct device *sdev)
@@ -3260,6 +3267,8 @@ while (0)
        SET_NETDEV_DEV(dev, sdev);
        if (ret >= 0)
                ret = register_netdevice(dev);
+        lockdep_set_class(&dev->_xmit_lock, &hostap_netdev_xmit_lock_key);
        rtnl_unlock();
        if (ret < 0) {
                printk(KERN_WARNING "%s: register netdevice failed!\n",
diff --git a/drivers/net/wireless/hostap/hostap_main.c b/drivers/net/wireless/hostap/hostap_main.c
index 93786f4218f0..53374fcba77e 100644
--- a/drivers/net/wireless/hostap/hostap_main.c
+++ b/drivers/net/wireless/hostap/hostap_main.c
@@ -12,7 +12,6 @@
 * more details.
 */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
diff --git a/drivers/net/wireless/hostap/hostap_pci.c b/drivers/net/wireless/hostap/hostap_pci.c
index 194f07097581..c2fa011be291 100644
--- a/drivers/net/wireless/hostap/hostap_pci.c
+++ b/drivers/net/wireless/hostap/hostap_pci.c
@@ -4,7 +4,6 @@
 * driver patches from Reyk Floeter <reyk@vantronix.net> and
 * Andy Warner <andyw@pobox.com> */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/if.h>
@@ -338,7 +337,7 @@ static int prism2_pci_probe(struct pci_dev *pdev,
        pci_set_drvdata(pdev, dev);
-        if (request_irq(dev->irq, prism2_interrupt, SA_SHIRQ, dev->name,
+        if (request_irq(dev->irq, prism2_interrupt, IRQF_SHARED, dev->name,
                        dev)) {
                printk(KERN_WARNING "%s: request_irq failed\n", dev->name);
                goto fail;
diff --git a/drivers/net/wireless/hostap/hostap_plx.c b/drivers/net/wireless/hostap/hostap_plx.c
index edaaa943eb8f..6dfa041be66d 100644
--- a/drivers/net/wireless/hostap/hostap_plx.c
+++ b/drivers/net/wireless/hostap/hostap_plx.c
@@ -7,7 +7,6 @@
 */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/if.h>
@@ -67,10 +66,12 @@ static struct pci_device_id prism2_plx_id_table[] __devinitdata = {
        PLXDEV(0x10b7, 0x7770, "3Com AirConnect PCI 777A"),
        PLXDEV(0x111a, 0x1023, "Siemens SpeedStream SS1023"),
        PLXDEV(0x126c, 0x8030, "Nortel emobility"),
+        PLXDEV(0x1562, 0x0001, "Symbol LA-4123"),
        PLXDEV(0x1385, 0x4100, "Netgear MA301"),
        PLXDEV(0x15e8, 0x0130, "National Datacomm NCP130 (PLX9052)"),
        PLXDEV(0x15e8, 0x0131, "National Datacomm NCP130 (TMD7160)"),
        PLXDEV(0x1638, 0x1100, "Eumitcom WL11000"),
+        PLXDEV(0x16ab, 0x1100, "Global Sun Tech GL24110P"),
        PLXDEV(0x16ab, 0x1101, "Global Sun Tech GL24110P (?)"),
        PLXDEV(0x16ab, 0x1102, "Linksys WPC11 with WDT11"),
        PLXDEV(0x16ab, 0x1103, "Longshine 8031"),
@@ -551,7 +552,7 @@ static int prism2_plx_probe(struct pci_dev *pdev,
        pci_set_drvdata(pdev, dev);
-        if (request_irq(dev->irq, prism2_interrupt, SA_SHIRQ, dev->name,
+        if (request_irq(dev->irq, prism2_interrupt, IRQF_SHARED, dev->name,
                        dev)) {
                printk(KERN_WARNING "%s: request_irq failed\n", dev->name);
                goto fail;
diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c
index 72335c8eb97f..e955db435b30 100644
--- a/drivers/net/wireless/ipw2100.c
+++ b/drivers/net/wireless/ipw2100.c
@@ -134,7 +134,6 @@ that only one external action is invoked at a time.
 */
 #include <linux/compiler.h>
-#include <linux/config.h>
 #include <linux/errno.h>
 #include <linux/if_arp.h>
 #include <linux/in6.h>
@@ -1485,7 +1484,7 @@ static int ipw2100_hw_stop_adapter(struct ipw2100_priv *priv)
                 *
                 * Sending the PREPARE_FOR_POWER_DOWN will restrict the
                 * hardware from going into standby mode and will transition
-                 * out of D0-standy if it is already in that state.
+                 * out of D0-standby if it is already in that state.
                 *
                 * STATUS_PREPARE_POWER_DOWN_COMPLETE will be sent by the
                 * driver upon completion.  Once received, the driver can
@@ -5358,7 +5357,7 @@ static int ipw2100_set_key(struct ipw2100_priv *priv,
                     idx, keylen, len);
        /* NOTE: We don't check cached values in case the firmware was reset
-         * or some other problem is occuring.  If the user is setting the key,
+         * or some other problem is occurring.  If the user is setting the key,
         * then we push the change */
        wep_key->idx = idx;
@@ -6230,7 +6229,7 @@ static int ipw2100_pci_init_one(struct pci_dev *pci_dev,
        ipw2100_queues_initialize(priv);
        err = request_irq(pci_dev->irq,
-                          ipw2100_interrupt, SA_SHIRQ, dev->name, priv);
+                          ipw2100_interrupt, IRQF_SHARED, dev->name, priv);
        if (err) {
                printk(KERN_WARNING DRV_NAME
                       "Error calling request_irq: %d.\n", pci_dev->irq);
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c
index 081a8999666e..b3300ffe4eec 100644
--- a/drivers/net/wireless/ipw2200.c
+++ b/drivers/net/wireless/ipw2200.c
@@ -1229,12 +1229,6 @@ static struct ipw_fw_error *ipw_alloc_error_log(struct ipw_priv *priv)
        return error;
 }
-static void ipw_free_error_log(struct ipw_fw_error *error)
-{
-        if (error)
-                kfree(error);
-}
 static ssize_t show_event_log(struct device *d,
                              struct device_attribute *attr, char *buf)
 {
@@ -1296,10 +1290,9 @@ static ssize_t clear_error(struct device *d,
                           const char *buf, size_t count)
 {
        struct ipw_priv *priv = dev_get_drvdata(d);
-        if (priv->error) {
-                ipw_free_error_log(priv->error);
+        kfree(priv->error);
-                priv->error = NULL;
+        priv->error = NULL;
-        }
        return count;
 }
@@ -1970,8 +1963,7 @@ static void ipw_irq_tasklet(struct ipw_priv *priv)
                                struct ipw_fw_error *error =
                                    ipw_alloc_error_log(priv);
                                ipw_dump_error_log(priv, error);
-                                if (error)
+                                kfree(error);
-                                        ipw_free_error_log(error);
                        }
 #endif
                } else {
@@ -11553,7 +11545,7 @@ static int ipw_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        ipw_sw_reset(priv, 1);
-        err = request_irq(pdev->irq, ipw_isr, SA_SHIRQ, DRV_NAME, priv);
+        err = request_irq(pdev->irq, ipw_isr, IRQF_SHARED, DRV_NAME, priv);
        if (err) {
                IPW_ERROR("Error allocating IRQ %d\n", pdev->irq);
                goto out_destroy_workqueue;
@@ -11693,10 +11685,8 @@ static void ipw_pci_remove(struct pci_dev *pdev)
                }
        }
-        if (priv->error) {
+        kfree(priv->error);
-                ipw_free_error_log(priv->error);
+        priv->error = NULL;
-                priv->error = NULL;
-        }
 #ifdef CONFIG_IPW2200_PROMISCUOUS
        ipw_prom_free(priv);
diff --git a/drivers/net/wireless/ipw2200.h b/drivers/net/wireless/ipw2200.h
index ea12ad66b8e8..8b1cd7c749a4 100644
--- a/drivers/net/wireless/ipw2200.h
+++ b/drivers/net/wireless/ipw2200.h
@@ -31,7 +31,6 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
-#include <linux/config.h>
 #include <linux/init.h>
 #include <linux/mutex.h>
diff --git a/drivers/net/wireless/netwave_cs.c b/drivers/net/wireless/netwave_cs.c
index 9343d970537b..36b5e004305e 100644
--- a/drivers/net/wireless/netwave_cs.c
+++ b/drivers/net/wireless/netwave_cs.c
@@ -37,7 +37,6 @@
 /* To have statistics (just packets sent) define this */
 #undef NETWAVE_STATS
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
diff --git a/drivers/net/wireless/orinoco.c b/drivers/net/wireless/orinoco.c
index 8a31b591a901..d6ed5781b93a 100644
--- a/drivers/net/wireless/orinoco.c
+++ b/drivers/net/wireless/orinoco.c
@@ -76,7 +76,6 @@
 #define DRIVER_NAME "orinoco"
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
diff --git a/drivers/net/wireless/orinoco_cs.c b/drivers/net/wireless/orinoco_cs.c
index b2aec4d9fbb1..bc14689cbf24 100644
--- a/drivers/net/wireless/orinoco_cs.c
+++ b/drivers/net/wireless/orinoco_cs.c
@@ -13,7 +13,6 @@
 #define DRIVER_NAME "orinoco_cs"
 #define PFX DRIVER_NAME ": "
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
diff --git a/drivers/net/wireless/orinoco_nortel.c b/drivers/net/wireless/orinoco_nortel.c
index 74b9d5b2ba9e..bf05b907747e 100644
--- a/drivers/net/wireless/orinoco_nortel.c
+++ b/drivers/net/wireless/orinoco_nortel.c
@@ -40,7 +40,6 @@
 #define DRIVER_NAME "orinoco_nortel"
 #define PFX DRIVER_NAME ": "
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
@@ -199,7 +198,7 @@ static int orinoco_nortel_init_one(struct pci_dev *pdev,
        hermes_struct_init(&priv->hw, hermes_io, HERMES_16BIT_REGSPACING);
-        err = request_irq(pdev->irq, orinoco_interrupt, SA_SHIRQ,
+        err = request_irq(pdev->irq, orinoco_interrupt, IRQF_SHARED,
                          dev->name, dev);
        if (err) {
                printk(KERN_ERR PFX "Cannot allocate IRQ %d\n", pdev->irq);
diff --git a/drivers/net/wireless/orinoco_pci.c b/drivers/net/wireless/orinoco_pci.c
index 1c105f40f8d5..1759c543fbee 100644
--- a/drivers/net/wireless/orinoco_pci.c
+++ b/drivers/net/wireless/orinoco_pci.c
@@ -44,7 +44,6 @@
 #define DRIVER_NAME "orinoco_pci"
 #define PFX DRIVER_NAME ": "
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
@@ -154,7 +153,7 @@ static int orinoco_pci_init_one(struct pci_dev *pdev,
        hermes_struct_init(&priv->hw, hermes_io, HERMES_32BIT_REGSPACING);
-        err = request_irq(pdev->irq, orinoco_interrupt, SA_SHIRQ,
+        err = request_irq(pdev->irq, orinoco_interrupt, IRQF_SHARED,
                          dev->name, dev);
        if (err) {
                printk(KERN_ERR PFX "Cannot allocate IRQ %d\n", pdev->irq);
diff --git a/drivers/net/wireless/orinoco_pci.h b/drivers/net/wireless/orinoco_pci.h
index 7eb1e08113e0..be1abea4b64f 100644
--- a/drivers/net/wireless/orinoco_pci.h
+++ b/drivers/net/wireless/orinoco_pci.h
@@ -63,7 +63,7 @@ static int orinoco_pci_resume(struct pci_dev *pdev)
        pci_enable_device(pdev);
        pci_restore_state(pdev);
-        err = request_irq(pdev->irq, orinoco_interrupt, SA_SHIRQ,
+        err = request_irq(pdev->irq, orinoco_interrupt, IRQF_SHARED,
                          dev->name, dev);
        if (err) {
                printk(KERN_ERR "%s: cannot re-allocate IRQ on resume\n",
diff --git a/drivers/net/wireless/orinoco_plx.c b/drivers/net/wireless/orinoco_plx.c
index 84f696c77551..7f006f624171 100644
--- a/drivers/net/wireless/orinoco_plx.c
+++ b/drivers/net/wireless/orinoco_plx.c
@@ -86,7 +86,6 @@
 #define DRIVER_NAME "orinoco_plx"
 #define PFX DRIVER_NAME ": "
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
@@ -238,7 +237,7 @@ static int orinoco_plx_init_one(struct pci_dev *pdev,
        hermes_struct_init(&priv->hw, hermes_io, HERMES_16BIT_REGSPACING);
-        err = request_irq(pdev->irq, orinoco_interrupt, SA_SHIRQ,
+        err = request_irq(pdev->irq, orinoco_interrupt, IRQF_SHARED,
                          dev->name, dev);
        if (err) {
                printk(KERN_ERR PFX "Cannot allocate IRQ %d\n", pdev->irq);
diff --git a/drivers/net/wireless/orinoco_tmd.c b/drivers/net/wireless/orinoco_tmd.c
index d2b4decb7a7d..0831721e4d6c 100644
--- a/drivers/net/wireless/orinoco_tmd.c
+++ b/drivers/net/wireless/orinoco_tmd.c
@@ -40,7 +40,6 @@
 #define DRIVER_NAME "orinoco_tmd"
 #define PFX DRIVER_NAME ": "
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
@@ -140,7 +139,7 @@ static int orinoco_tmd_init_one(struct pci_dev *pdev,
        hermes_struct_init(&priv->hw, hermes_io, HERMES_16BIT_REGSPACING);
-        err = request_irq(pdev->irq, orinoco_interrupt, SA_SHIRQ,
+        err = request_irq(pdev->irq, orinoco_interrupt, IRQF_SHARED,
                          dev->name, dev);
        if (err) {
                printk(KERN_ERR PFX "Cannot allocate IRQ %d\n", pdev->irq);
diff --git a/drivers/net/wireless/prism54/islpci_hotplug.c b/drivers/net/wireless/prism54/islpci_hotplug.c
index bfa0cc319a09..09fc17a0f029 100644
--- a/drivers/net/wireless/prism54/islpci_hotplug.c
+++ b/drivers/net/wireless/prism54/islpci_hotplug.c
@@ -189,7 +189,7 @@ prism54_probe(struct pci_dev *pdev, const struct pci_device_id *id)
        /* request for the interrupt before uploading the firmware */
        rvalue = request_irq(pdev->irq, &islpci_interrupt,
-                             SA_SHIRQ, ndev->name, priv);
+                             IRQF_SHARED, ndev->name, priv);
        if (rvalue) {
                /* error, could not hook the handler to the irq */
diff --git a/drivers/net/wireless/prism54/islpci_mgt.c b/drivers/net/wireless/prism54/islpci_mgt.c
index 6a60c5970cb5..2e061a80b294 100644
--- a/drivers/net/wireless/prism54/islpci_mgt.c
+++ b/drivers/net/wireless/prism54/islpci_mgt.c
@@ -18,7 +18,6 @@
 *
 */
-#include <linux/config.h>
 #include <linux/netdevice.h>
 #include <linux/module.h>
 #include <linux/pci.h>
diff --git a/drivers/net/wireless/prism54/prismcompat.h b/drivers/net/wireless/prism54/prismcompat.h
index 55541c01752e..d71eca55a302 100644
--- a/drivers/net/wireless/prism54/prismcompat.h
+++ b/drivers/net/wireless/prism54/prismcompat.h
@@ -29,7 +29,6 @@
 #include <linux/device.h>
 #include <linux/firmware.h>
-#include <linux/config.h>
 #include <linux/moduleparam.h>
 #include <linux/workqueue.h>
 #include <linux/compiler.h>
diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c
index 879eb427607c..61b83a5e737a 100644
--- a/drivers/net/wireless/ray_cs.c
+++ b/drivers/net/wireless/ray_cs.c
@@ -30,7 +30,6 @@
 * 
 =============================================================================*/
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/proc_fs.h>
@@ -924,8 +923,7 @@ static int ray_dev_start_xmit(struct sk_buff *skb, struct net_device *dev)
    if (length < ETH_ZLEN)
    {
-        skb = skb_padto(skb, ETH_ZLEN);
+        if (skb_padto(skb, ETH_ZLEN))
-        if (skb == NULL)
                return 0;
        length = ETH_ZLEN;
    }
diff --git a/drivers/net/wireless/spectrum_cs.c b/drivers/net/wireless/spectrum_cs.c
index 7f9aa139c347..15465278c789 100644
--- a/drivers/net/wireless/spectrum_cs.c
+++ b/drivers/net/wireless/spectrum_cs.c
@@ -21,7 +21,6 @@
 #define DRIVER_NAME "spectrum_cs"
 #define PFX DRIVER_NAME ": "
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
diff --git a/drivers/net/wireless/strip.c b/drivers/net/wireless/strip.c
index 18a44580b53b..fd31885c6844 100644
--- a/drivers/net/wireless/strip.c
+++ b/drivers/net/wireless/strip.c
@@ -81,7 +81,6 @@ static const char StripVersion[] = "1.3A-STUART.CHESHIRE";
 /************************************************************************/
 /* Header files                                                         */
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
diff --git a/drivers/net/wireless/wavelan.c b/drivers/net/wireless/wavelan.c
index dade4b903579..5b69befdab74 100644
--- a/drivers/net/wireless/wavelan.c
+++ b/drivers/net/wireless/wavelan.c
@@ -1695,8 +1695,8 @@ static int wv_frequency_list(unsigned long ioaddr,	/* I/O port of the card */
                /* Look in the table if the frequency is allowed */
                if (table[9 - (freq / 16)] & (1 << (freq % 16))) {
                        /* Compute approximate channel number */
-                        while ((((channel_bands[c] >> 1) - 24) < freq) &&
+                        while ((c < NELS(channel_bands)) &&
-                               (c < NELS(channel_bands)))
+                                (((channel_bands[c] >> 1) - 24) < freq)) 
                                c++;
                        list[i].i = c;  /* Set the list index */
@@ -2903,6 +2903,7 @@ static int wavelan_packet_xmit(struct sk_buff *skb, struct net_device * dev)
 {
        net_local *lp = (net_local *) dev->priv;
        unsigned long flags;
+        char data[ETH_ZLEN];
 #ifdef DEBUG_TX_TRACE
        printk(KERN_DEBUG "%s: ->wavelan_packet_xmit(0x%X)\n", dev->name,
@@ -2937,15 +2938,16 @@ static int wavelan_packet_xmit(struct sk_buff *skb, struct net_device * dev)
         * able to detect collisions, therefore in theory we don't really
         * need to pad. Jean II */
        if (skb->len < ETH_ZLEN) {
-                skb = skb_padto(skb, ETH_ZLEN);
+                memset(data, 0, ETH_ZLEN);
-                if (skb == NULL)
+                memcpy(data, skb->data, skb->len);
-                        return 0;
+                /* Write packet on the card */
+                if(wv_packet_write(dev, data, ETH_ZLEN))
+                        return 1;       /* We failed */
        }
+        else if(wv_packet_write(dev, skb->data, skb->len))
-        /* Write packet on the card */
-        if(wv_packet_write(dev, skb->data, skb->len))
                return 1;       /* We failed */
        dev_kfree_skb(skb);
 #ifdef DEBUG_TX_TRACE
diff --git a/drivers/net/wireless/wavelan_cs.c b/drivers/net/wireless/wavelan_cs.c
index f7724eb2fa7e..561250f73fd3 100644
--- a/drivers/net/wireless/wavelan_cs.c
+++ b/drivers/net/wireless/wavelan_cs.c
@@ -3194,11 +3194,8 @@ wavelan_packet_xmit(struct sk_buff *	skb,
         * and we don't have the Ethernet specific requirement of beeing
         * able to detect collisions, therefore in theory we don't really
         * need to pad. Jean II */
-        if (skb->len < ETH_ZLEN) {
+        if (skb_padto(skb, ETH_ZLEN))
-                skb = skb_padto(skb, ETH_ZLEN);
+                return 0;
-                if (skb == NULL)
-                        return 0;
-        }
  wv_packet_write(dev, skb->data, skb->len);
diff --git a/drivers/net/wireless/wavelan_cs.p.h b/drivers/net/wireless/wavelan_cs.p.h
index c65fe7a391ec..f34a36b0c7b0 100644
--- a/drivers/net/wireless/wavelan_cs.p.h
+++ b/drivers/net/wireless/wavelan_cs.p.h
@@ -411,7 +411,6 @@
 /***************************** INCLUDES *****************************/
 /* Linux headers that we need */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
diff --git a/drivers/net/wireless/wl3501_cs.c b/drivers/net/wireless/wl3501_cs.c
index e52a650f6737..c03e400facee 100644
--- a/drivers/net/wireless/wl3501_cs.c
+++ b/drivers/net/wireless/wl3501_cs.c
@@ -28,7 +28,6 @@
 */
 #undef REALLY_SLOW_IO   /* most systems can safely undef this */
-#include <linux/config.h>
 #include <linux/delay.h>
 #include <linux/types.h>
 #include <linux/ethtool.h>
diff --git a/drivers/net/wireless/zd1211rw/Kconfig b/drivers/net/wireless/zd1211rw/Kconfig
new file mode 100644
index 000000000000..66ed55bc5460
--- /dev/null
+++ b/drivers/net/wireless/zd1211rw/Kconfig
@@ -0,0 +1,19 @@
+config ZD1211RW
+        tristate "ZyDAS ZD1211/ZD1211B USB-wireless support"
+        depends on USB && IEEE80211 && IEEE80211_SOFTMAC && NET_RADIO && EXPERIMENTAL
+        select FW_LOADER
+        ---help---
+          This is an experimental driver for the ZyDAS ZD1211/ZD1211B wireless
+          chip, present in many USB-wireless adapters.
+          Device firmware is required alongside this driver. You can download the
+          firmware distribution from http://zd1211.ath.cx/get-firmware
+config ZD1211RW_DEBUG
+        bool "ZyDAS ZD1211 debugging"
+        depends on ZD1211RW
+        ---help---
+          ZD1211 debugging messages. Choosing Y will result in additional debug
+          messages being saved to your kernel logs, which may help debug any
+          problems.
diff --git a/drivers/net/wireless/zd1211rw/Makefile b/drivers/net/wireless/zd1211rw/Makefile
new file mode 100644
index 000000000000..500314fc74d2
--- /dev/null
+++ b/drivers/net/wireless/zd1211rw/Makefile
@@ -0,0 +1,11 @@
+obj-$(CONFIG_ZD1211RW) += zd1211rw.o
+zd1211rw-objs := zd_chip.o zd_ieee80211.o \
+                zd_mac.o zd_netdev.o \
+                zd_rf_al2230.o zd_rf_rf2959.o \
+                zd_rf.o zd_usb.o zd_util.o
+ifeq ($(CONFIG_ZD1211RW_DEBUG),y)
+EXTRA_CFLAGS += -DDEBUG
+endif
diff --git a/drivers/net/wireless/zd1211rw/zd_chip.c b/drivers/net/wireless/zd1211rw/zd_chip.c
new file mode 100644
index 000000000000..efc9c4bd826f
--- /dev/null
+++ b/drivers/net/wireless/zd1211rw/zd_chip.c
@@ -0,0 +1,1615 @@
+/* zd_chip.c
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+/* This file implements all the hardware specific functions for the ZD1211
+ * and ZD1211B chips. Support for the ZD1211B was possible after Timothy
+ * Legge sent me a ZD1211B device. Thank you Tim. -- Uli
+ */
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include "zd_def.h"
+#include "zd_chip.h"
+#include "zd_ieee80211.h"
+#include "zd_mac.h"
+#include "zd_rf.h"
+#include "zd_util.h"
+void zd_chip_init(struct zd_chip *chip,
+                 struct net_device *netdev,
+                 struct usb_interface *intf)
+{
+        memset(chip, 0, sizeof(*chip));
+        mutex_init(&chip->mutex);
+        zd_usb_init(&chip->usb, netdev, intf);
+        zd_rf_init(&chip->rf);
+}
+void zd_chip_clear(struct zd_chip *chip)
+{
+        mutex_lock(&chip->mutex);
+        zd_usb_clear(&chip->usb);
+        zd_rf_clear(&chip->rf);
+        mutex_unlock(&chip->mutex);
+        mutex_destroy(&chip->mutex);
+        memset(chip, 0, sizeof(*chip));
+}
+static int scnprint_mac_oui(const u8 *addr, char *buffer, size_t size)
+{
+        return scnprintf(buffer, size, "%02x-%02x-%02x",
+                         addr[0], addr[1], addr[2]);
+}
+/* Prints an identifier line, which will support debugging. */
+static int scnprint_id(struct zd_chip *chip, char *buffer, size_t size)
+{
+        int i = 0;
+        i = scnprintf(buffer, size, "zd1211%s chip ",
+                      chip->is_zd1211b ? "b" : "");
+        i += zd_usb_scnprint_id(&chip->usb, buffer+i, size-i);
+        i += scnprintf(buffer+i, size-i, " ");
+        i += scnprint_mac_oui(chip->e2p_mac, buffer+i, size-i);
+        i += scnprintf(buffer+i, size-i, " ");
+        i += zd_rf_scnprint_id(&chip->rf, buffer+i, size-i);
+        i += scnprintf(buffer+i, size-i, " pa%1x %c%c%c", chip->pa_type,
+                chip->patch_cck_gain ? 'g' : '-',
+                chip->patch_cr157 ? '7' : '-',
+                chip->patch_6m_band_edge ? '6' : '-');
+        return i;
+}
+static void print_id(struct zd_chip *chip)
+{
+        char buffer[80];
+        scnprint_id(chip, buffer, sizeof(buffer));
+        buffer[sizeof(buffer)-1] = 0;
+        dev_info(zd_chip_dev(chip), "%s\n", buffer);
+}
+/* Read a variable number of 32-bit values. Parameter count is not allowed to
+ * exceed USB_MAX_IOREAD32_COUNT.
+ */
+int zd_ioread32v_locked(struct zd_chip *chip, u32 *values, const zd_addr_t *addr,
+                 unsigned int count)
+{
+        int r;
+        int i;
+        zd_addr_t *a16 = (zd_addr_t *)NULL;
+        u16 *v16;
+        unsigned int count16;
+        if (count > USB_MAX_IOREAD32_COUNT)
+                return -EINVAL;
+        /* Allocate a single memory block for values and addresses. */
+        count16 = 2*count;
+        a16 = (zd_addr_t *)kmalloc(count16 * (sizeof(zd_addr_t) + sizeof(u16)),
+                                   GFP_NOFS);
+        if (!a16) {
+                dev_dbg_f(zd_chip_dev(chip),
+                          "error ENOMEM in allocation of a16\n");
+                r = -ENOMEM;
+                goto out;
+        }
+        v16 = (u16 *)(a16 + count16);
+        for (i = 0; i < count; i++) {
+                int j = 2*i;
+                /* We read the high word always first. */
+                a16[j] = zd_inc_word(addr[i]);
+                a16[j+1] = addr[i];
+        }
+        r = zd_ioread16v_locked(chip, v16, a16, count16);
+        if (r) {
+                dev_dbg_f(zd_chip_dev(chip),
+                          "error: zd_ioread16v_locked. Error number %d\n", r);
+                goto out;
+        }
+        for (i = 0; i < count; i++) {
+                int j = 2*i;
+                values[i] = (v16[j] << 16) | v16[j+1];
+        }
+out:
+        kfree((void *)a16);
+        return r;
+}
+int _zd_iowrite32v_locked(struct zd_chip *chip, const struct zd_ioreq32 *ioreqs,
+                   unsigned int count)
+{
+        int i, j, r;
+        struct zd_ioreq16 *ioreqs16;
+        unsigned int count16;
+        ZD_ASSERT(mutex_is_locked(&chip->mutex));
+        if (count == 0)
+                return 0;
+        if (count > USB_MAX_IOWRITE32_COUNT)
+                return -EINVAL;
+        /* Allocate a single memory block for values and addresses. */
+        count16 = 2*count;
+        ioreqs16 = kmalloc(count16 * sizeof(struct zd_ioreq16), GFP_NOFS);
+        if (!ioreqs16) {
+                r = -ENOMEM;
+                dev_dbg_f(zd_chip_dev(chip),
+                          "error %d in ioreqs16 allocation\n", r);
+                goto out;
+        }
+        for (i = 0; i < count; i++) {
+                j = 2*i;
+                /* We write the high word always first. */
+                ioreqs16[j].value   = ioreqs[i].value >> 16;
+                ioreqs16[j].addr    = zd_inc_word(ioreqs[i].addr);
+                ioreqs16[j+1].value = ioreqs[i].value;
+                ioreqs16[j+1].addr  = ioreqs[i].addr;
+        }
+        r = zd_usb_iowrite16v(&chip->usb, ioreqs16, count16);
+#ifdef DEBUG
+        if (r) {
+                dev_dbg_f(zd_chip_dev(chip),
+                          "error %d in zd_usb_write16v\n", r);
+        }
+#endif /* DEBUG */
+out:
+        kfree(ioreqs16);
+        return r;
+}
+int zd_iowrite16a_locked(struct zd_chip *chip,
+                  const struct zd_ioreq16 *ioreqs, unsigned int count)
+{
+        int r;
+        unsigned int i, j, t, max;
+        ZD_ASSERT(mutex_is_locked(&chip->mutex));
+        for (i = 0; i < count; i += j + t) {
+                t = 0;
+                max = count-i;
+                if (max > USB_MAX_IOWRITE16_COUNT)
+                        max = USB_MAX_IOWRITE16_COUNT;
+                for (j = 0; j < max; j++) {
+                        if (!ioreqs[i+j].addr) {
+                                t = 1;
+                                break;
+                        }
+                }
+                r = zd_usb_iowrite16v(&chip->usb, &ioreqs[i], j);
+                if (r) {
+                        dev_dbg_f(zd_chip_dev(chip),
+                                  "error zd_usb_iowrite16v. Error number %d\n",
+                                  r);
+                        return r;
+                }
+        }
+        return 0;
+}
+/* Writes a variable number of 32 bit registers. The functions will split
+ * that in several USB requests. A split can be forced by inserting an IO
+ * request with an zero address field.
+ */
+int zd_iowrite32a_locked(struct zd_chip *chip,
+                  const struct zd_ioreq32 *ioreqs, unsigned int count)
+{
+        int r;
+        unsigned int i, j, t, max;
+        for (i = 0; i < count; i += j + t) {
+                t = 0;
+                max = count-i;
+                if (max > USB_MAX_IOWRITE32_COUNT)
+                        max = USB_MAX_IOWRITE32_COUNT;
+                for (j = 0; j < max; j++) {
+                        if (!ioreqs[i+j].addr) {
+                                t = 1;
+                                break;
+                        }
+                }
+                r = _zd_iowrite32v_locked(chip, &ioreqs[i], j);
+                if (r) {
+                        dev_dbg_f(zd_chip_dev(chip),
+                                "error _zd_iowrite32v_locked."
+                                " Error number %d\n", r);
+                        return r;
+                }
+        }
+        return 0;
+}
+int zd_ioread16(struct zd_chip *chip, zd_addr_t addr, u16 *value)
+{
+        int r;
+        ZD_ASSERT(!mutex_is_locked(&chip->mutex));
+        mutex_lock(&chip->mutex);
+        r = zd_ioread16_locked(chip, value, addr);
+        mutex_unlock(&chip->mutex);
+        return r;
+}
+int zd_ioread32(struct zd_chip *chip, zd_addr_t addr, u32 *value)
+{
+        int r;
+        ZD_ASSERT(!mutex_is_locked(&chip->mutex));
+        mutex_lock(&chip->mutex);
+        r = zd_ioread32_locked(chip, value, addr);
+        mutex_unlock(&chip->mutex);
+        return r;
+}
+int zd_iowrite16(struct zd_chip *chip, zd_addr_t addr, u16 value)
+{
+        int r;
+        ZD_ASSERT(!mutex_is_locked(&chip->mutex));
+        mutex_lock(&chip->mutex);
+        r = zd_iowrite16_locked(chip, value, addr);
+        mutex_unlock(&chip->mutex);
+        return r;
+}
+int zd_iowrite32(struct zd_chip *chip, zd_addr_t addr, u32 value)
+{
+        int r;
+        ZD_ASSERT(!mutex_is_locked(&chip->mutex));
+        mutex_lock(&chip->mutex);
+        r = zd_iowrite32_locked(chip, value, addr);
+        mutex_unlock(&chip->mutex);
+        return r;
+}
+int zd_ioread32v(struct zd_chip *chip, const zd_addr_t *addresses,
+                  u32 *values, unsigned int count)
+{
+        int r;
+        ZD_ASSERT(!mutex_is_locked(&chip->mutex));
+        mutex_lock(&chip->mutex);
+        r = zd_ioread32v_locked(chip, values, addresses, count);
+        mutex_unlock(&chip->mutex);
+        return r;
+}
+int zd_iowrite32a(struct zd_chip *chip, const struct zd_ioreq32 *ioreqs,
+                  unsigned int count)
+{
+        int r;
+        ZD_ASSERT(!mutex_is_locked(&chip->mutex));
+        mutex_lock(&chip->mutex);
+        r = zd_iowrite32a_locked(chip, ioreqs, count);
+        mutex_unlock(&chip->mutex);
+        return r;
+}
+static int read_pod(struct zd_chip *chip, u8 *rf_type)
+{
+        int r;
+        u32 value;
+        ZD_ASSERT(mutex_is_locked(&chip->mutex));
+        r = zd_ioread32_locked(chip, &value, E2P_POD);
+        if (r)
+                goto error;
+        dev_dbg_f(zd_chip_dev(chip), "E2P_POD %#010x\n", value);
+        /* FIXME: AL2230 handling (Bit 7 in POD) */
+        *rf_type = value & 0x0f;
+        chip->pa_type = (value >> 16) & 0x0f;
+        chip->patch_cck_gain = (value >> 8) & 0x1;
+        chip->patch_cr157 = (value >> 13) & 0x1;
+        chip->patch_6m_band_edge = (value >> 21) & 0x1;
+        dev_dbg_f(zd_chip_dev(chip),
+                "RF %s %#01x PA type %#01x patch CCK %d patch CR157 %d "
+                "patch 6M %d\n",
+                zd_rf_name(*rf_type), *rf_type,
+                chip->pa_type, chip->patch_cck_gain,
+                chip->patch_cr157, chip->patch_6m_band_edge);
+        return 0;
+error:
+        *rf_type = 0;
+        chip->pa_type = 0;
+        chip->patch_cck_gain = 0;
+        chip->patch_cr157 = 0;
+        chip->patch_6m_band_edge = 0;
+        return r;
+}
+static int _read_mac_addr(struct zd_chip *chip, u8 *mac_addr,
+                          const zd_addr_t *addr)
+{
+        int r;
+        u32 parts[2];
+        r = zd_ioread32v_locked(chip, parts, (const zd_addr_t *)addr, 2);
+        if (r) {
+                dev_dbg_f(zd_chip_dev(chip),
+                        "error: couldn't read e2p macs. Error number %d\n", r);
+                return r;
+        }
+        mac_addr[0] = parts[0];
+        mac_addr[1] = parts[0] >>  8;
+        mac_addr[2] = parts[0] >> 16;
+        mac_addr[3] = parts[0] >> 24;
+        mac_addr[4] = parts[1];
+        mac_addr[5] = parts[1] >>  8;
+        return 0;
+}
+static int read_e2p_mac_addr(struct zd_chip *chip)
+{
+        static const zd_addr_t addr[2] = { E2P_MAC_ADDR_P1, E2P_MAC_ADDR_P2 };
+        ZD_ASSERT(mutex_is_locked(&chip->mutex));
+        return _read_mac_addr(chip, chip->e2p_mac, (const zd_addr_t *)addr);
+}
+/* MAC address: if custom mac addresses are to to be used CR_MAC_ADDR_P1 and
+ *              CR_MAC_ADDR_P2 must be overwritten
+ */
+void zd_get_e2p_mac_addr(struct zd_chip *chip, u8 *mac_addr)
+{
+        mutex_lock(&chip->mutex);
+        memcpy(mac_addr, chip->e2p_mac, ETH_ALEN);
+        mutex_unlock(&chip->mutex);
+}
+static int read_mac_addr(struct zd_chip *chip, u8 *mac_addr)
+{
+        static const zd_addr_t addr[2] = { CR_MAC_ADDR_P1, CR_MAC_ADDR_P2 };
+        return _read_mac_addr(chip, mac_addr, (const zd_addr_t *)addr);
+}
+int zd_read_mac_addr(struct zd_chip *chip, u8 *mac_addr)
+{
+        int r;
+        dev_dbg_f(zd_chip_dev(chip), "\n");
+        mutex_lock(&chip->mutex);
+        r = read_mac_addr(chip, mac_addr);
+        mutex_unlock(&chip->mutex);
+        return r;
+}
+int zd_write_mac_addr(struct zd_chip *chip, const u8 *mac_addr)
+{
+        int r;
+        struct zd_ioreq32 reqs[2] = {
+                [0] = { .addr = CR_MAC_ADDR_P1 },
+                [1] = { .addr = CR_MAC_ADDR_P2 },
+        };
+        reqs[0].value = (mac_addr[3] << 24)
+                      | (mac_addr[2] << 16)
+                      | (mac_addr[1] <<  8)
+                      |  mac_addr[0];
+        reqs[1].value = (mac_addr[5] <<  8)
+                      |  mac_addr[4];
+        dev_dbg_f(zd_chip_dev(chip),
+                "mac addr " MAC_FMT "\n", MAC_ARG(mac_addr));
+        mutex_lock(&chip->mutex);
+        r = zd_iowrite32a_locked(chip, reqs, ARRAY_SIZE(reqs));
+#ifdef DEBUG
+        {
+                u8 tmp[ETH_ALEN];
+                read_mac_addr(chip, tmp);
+        }
+#endif /* DEBUG */
+        mutex_unlock(&chip->mutex);
+        return r;
+}
+int zd_read_regdomain(struct zd_chip *chip, u8 *regdomain)
+{
+        int r;
+        u32 value;
+        mutex_lock(&chip->mutex);
+        r = zd_ioread32_locked(chip, &value, E2P_SUBID);
+        mutex_unlock(&chip->mutex);
+        if (r)
+                return r;
+        *regdomain = value >> 16;
+        dev_dbg_f(zd_chip_dev(chip), "regdomain: %#04x\n", *regdomain);
+        return 0;
+}
+static int read_values(struct zd_chip *chip, u8 *values, size_t count,
+                       zd_addr_t e2p_addr, u32 guard)
+{
+        int r;
+        int i;
+        u32 v;
+        ZD_ASSERT(mutex_is_locked(&chip->mutex));
+        for (i = 0;;) {
+                r = zd_ioread32_locked(chip, &v, e2p_addr+i/2);
+                if (r)
+                        return r;
+                v -= guard;
+                if (i+4 < count) {
+                        values[i++] = v;
+                        values[i++] = v >>  8;
+                        values[i++] = v >> 16;
+                        values[i++] = v >> 24;
+                        continue;
+                }
+                for (;i < count; i++)
+                        values[i] = v >> (8*(i%3));
+                return 0;
+        }
+}
+static int read_pwr_cal_values(struct zd_chip *chip)
+{
+        return read_values(chip, chip->pwr_cal_values,
+                        E2P_CHANNEL_COUNT, E2P_PWR_CAL_VALUE1,
+                        0);
+}
+static int read_pwr_int_values(struct zd_chip *chip)
+{
+        return read_values(chip, chip->pwr_int_values,
+                        E2P_CHANNEL_COUNT, E2P_PWR_INT_VALUE1,
+                        E2P_PWR_INT_GUARD);
+}
+static int read_ofdm_cal_values(struct zd_chip *chip)
+{
+        int r;
+        int i;
+        static const zd_addr_t addresses[] = {
+                E2P_36M_CAL_VALUE1,
+                E2P_48M_CAL_VALUE1,
+                E2P_54M_CAL_VALUE1,
+        };
+        for (i = 0; i < 3; i++) {
+                r = read_values(chip, chip->ofdm_cal_values[i],
+                                E2P_CHANNEL_COUNT, addresses[i], 0);
+                if (r)
+                        return r;
+        }
+        return 0;
+}
+static int read_cal_int_tables(struct zd_chip *chip)
+{
+        int r;
+        r = read_pwr_cal_values(chip);
+        if (r)
+                return r;
+        r = read_pwr_int_values(chip);
+        if (r)
+                return r;
+        r = read_ofdm_cal_values(chip);
+        if (r)
+                return r;
+        return 0;
+}
+/* phy means physical registers */
+int zd_chip_lock_phy_regs(struct zd_chip *chip)
+{
+        int r;
+        u32 tmp;
+        ZD_ASSERT(mutex_is_locked(&chip->mutex));
+        r = zd_ioread32_locked(chip, &tmp, CR_REG1);
+        if (r) {
+                dev_err(zd_chip_dev(chip), "error ioread32(CR_REG1): %d\n", r);
+                return r;
+        }
+        dev_dbg_f(zd_chip_dev(chip),
+                "CR_REG1: 0x%02x -> 0x%02x\n", tmp, tmp & ~UNLOCK_PHY_REGS);
+        tmp &= ~UNLOCK_PHY_REGS;
+        r = zd_iowrite32_locked(chip, tmp, CR_REG1);
+        if (r)
+                dev_err(zd_chip_dev(chip), "error iowrite32(CR_REG1): %d\n", r);
+        return r;
+}
+int zd_chip_unlock_phy_regs(struct zd_chip *chip)
+{
+        int r;
+        u32 tmp;
+        ZD_ASSERT(mutex_is_locked(&chip->mutex));
+        r = zd_ioread32_locked(chip, &tmp, CR_REG1);
+        if (r) {
+                dev_err(zd_chip_dev(chip),
+                        "error ioread32(CR_REG1): %d\n", r);
+                return r;
+        }
+        dev_dbg_f(zd_chip_dev(chip),
+                "CR_REG1: 0x%02x -> 0x%02x\n", tmp, tmp | UNLOCK_PHY_REGS);
+        tmp |= UNLOCK_PHY_REGS;
+        r = zd_iowrite32_locked(chip, tmp, CR_REG1);
+        if (r)
+                dev_err(zd_chip_dev(chip), "error iowrite32(CR_REG1): %d\n", r);
+        return r;
+}
+/* CR157 can be optionally patched by the EEPROM */
+static int patch_cr157(struct zd_chip *chip)
+{
+        int r;
+        u32 value;
+        if (!chip->patch_cr157)
+                return 0;
+        r = zd_ioread32_locked(chip, &value, E2P_PHY_REG);
+        if (r)
+                return r;
+        dev_dbg_f(zd_chip_dev(chip), "patching value %x\n", value >> 8);
+        return zd_iowrite32_locked(chip, value >> 8, CR157);
+}
+/*
+ * 6M band edge can be optionally overwritten for certain RF's
+ * Vendor driver says: for FCC regulation, enabled per HWFeature 6M band edge
+ * bit (for AL2230, AL2230S)
+ */
+static int patch_6m_band_edge(struct zd_chip *chip, int channel)
+{
+        struct zd_ioreq16 ioreqs[] = {
+                { CR128, 0x14 }, { CR129, 0x12 }, { CR130, 0x10 },
+                { CR47,  0x1e },
+        };
+        if (!chip->patch_6m_band_edge || !chip->rf.patch_6m_band_edge)
+                return 0;
+        /* FIXME: Channel 11 is not the edge for all regulatory domains. */
+        if (channel == 1 || channel == 11)
+                ioreqs[0].value = 0x12;
+        dev_dbg_f(zd_chip_dev(chip), "patching for channel %d\n", channel);
+        return zd_iowrite16a_locked(chip, ioreqs, ARRAY_SIZE(ioreqs));
+}
+static int zd1211_hw_reset_phy(struct zd_chip *chip)
+{
+        static const struct zd_ioreq16 ioreqs[] = {
+                { CR0,   0x0a }, { CR1,   0x06 }, { CR2,   0x26 },
+                { CR3,   0x38 }, { CR4,   0x80 }, { CR9,   0xa0 },
+                { CR10,  0x81 }, { CR11,  0x00 }, { CR12,  0x7f },
+                { CR13,  0x8c }, { CR14,  0x80 }, { CR15,  0x3d },
+                { CR16,  0x20 }, { CR17,  0x1e }, { CR18,  0x0a },
+                { CR19,  0x48 }, { CR20,  0x0c }, { CR21,  0x0c },
+                { CR22,  0x23 }, { CR23,  0x90 }, { CR24,  0x14 },
+                { CR25,  0x40 }, { CR26,  0x10 }, { CR27,  0x19 },
+                { CR28,  0x7f }, { CR29,  0x80 }, { CR30,  0x4b },
+                { CR31,  0x60 }, { CR32,  0x43 }, { CR33,  0x08 },
+                { CR34,  0x06 }, { CR35,  0x0a }, { CR36,  0x00 },
+                { CR37,  0x00 }, { CR38,  0x38 }, { CR39,  0x0c },
+                { CR40,  0x84 }, { CR41,  0x2a }, { CR42,  0x80 },
+                { CR43,  0x10 }, { CR44,  0x12 }, { CR46,  0xff },
+                { CR47,  0x1E }, { CR48,  0x26 }, { CR49,  0x5b },
+                { CR64,  0xd0 }, { CR65,  0x04 }, { CR66,  0x58 },
+                { CR67,  0xc9 }, { CR68,  0x88 }, { CR69,  0x41 },
+                { CR70,  0x23 }, { CR71,  0x10 }, { CR72,  0xff },
+                { CR73,  0x32 }, { CR74,  0x30 }, { CR75,  0x65 },
+                { CR76,  0x41 }, { CR77,  0x1b }, { CR78,  0x30 },
+                { CR79,  0x68 }, { CR80,  0x64 }, { CR81,  0x64 },
+                { CR82,  0x00 }, { CR83,  0x00 }, { CR84,  0x00 },
+                { CR85,  0x02 }, { CR86,  0x00 }, { CR87,  0x00 },
+                { CR88,  0xff }, { CR89,  0xfc }, { CR90,  0x00 },
+                { CR91,  0x00 }, { CR92,  0x00 }, { CR93,  0x08 },
+                { CR94,  0x00 }, { CR95,  0x00 }, { CR96,  0xff },
+                { CR97,  0xe7 }, { CR98,  0x00 }, { CR99,  0x00 },
+                { CR100, 0x00 }, { CR101, 0xae }, { CR102, 0x02 },
+                { CR103, 0x00 }, { CR104, 0x03 }, { CR105, 0x65 },
+                { CR106, 0x04 }, { CR107, 0x00 }, { CR108, 0x0a },
+                { CR109, 0xaa }, { CR110, 0xaa }, { CR111, 0x25 },
+                { CR112, 0x25 }, { CR113, 0x00 }, { CR119, 0x1e },
+                { CR125, 0x90 }, { CR126, 0x00 }, { CR127, 0x00 },
+                { },
+                { CR5,   0x00 }, { CR6,   0x00 }, { CR7,   0x00 },
+                { CR8,   0x00 }, { CR9,   0x20 }, { CR12,  0xf0 },
+                { CR20,  0x0e }, { CR21,  0x0e }, { CR27,  0x10 },
+                { CR44,  0x33 }, { CR47,  0x1E }, { CR83,  0x24 },
+                { CR84,  0x04 }, { CR85,  0x00 }, { CR86,  0x0C },
+                { CR87,  0x12 }, { CR88,  0x0C }, { CR89,  0x00 },
+                { CR90,  0x10 }, { CR91,  0x08 }, { CR93,  0x00 },
+                { CR94,  0x01 }, { CR95,  0x00 }, { CR96,  0x50 },
+                { CR97,  0x37 }, { CR98,  0x35 }, { CR101, 0x13 },
+                { CR102, 0x27 }, { CR103, 0x27 }, { CR104, 0x18 },
+                { CR105, 0x12 }, { CR109, 0x27 }, { CR110, 0x27 },
+                { CR111, 0x27 }, { CR112, 0x27 }, { CR113, 0x27 },
+                { CR114, 0x27 }, { CR115, 0x26 }, { CR116, 0x24 },
+                { CR117, 0xfc }, { CR118, 0xfa }, { CR120, 0x4f },
+                { CR123, 0x27 }, { CR125, 0xaa }, { CR127, 0x03 },
+                { CR128, 0x14 }, { CR129, 0x12 }, { CR130, 0x10 },
+                { CR131, 0x0C }, { CR136, 0xdf }, { CR137, 0x40 },
+                { CR138, 0xa0 }, { CR139, 0xb0 }, { CR140, 0x99 },
+                { CR141, 0x82 }, { CR142, 0x54 }, { CR143, 0x1c },
+                { CR144, 0x6c }, { CR147, 0x07 }, { CR148, 0x4c },
+                { CR149, 0x50 }, { CR150, 0x0e }, { CR151, 0x18 },
+                { CR160, 0xfe }, { CR161, 0xee }, { CR162, 0xaa },
+                { CR163, 0xfa }, { CR164, 0xfa }, { CR165, 0xea },
+                { CR166, 0xbe }, { CR167, 0xbe }, { CR168, 0x6a },
+                { CR169, 0xba }, { CR170, 0xba }, { CR171, 0xba },
+                /* Note: CR204 must lead the CR203 */
+                { CR204, 0x7d },
+                { },
+                { CR203, 0x30 },
+        };
+        int r, t;
+        dev_dbg_f(zd_chip_dev(chip), "\n");
+        r = zd_chip_lock_phy_regs(chip);
+        if (r)
+                goto out;
+        r = zd_iowrite16a_locked(chip, ioreqs, ARRAY_SIZE(ioreqs));
+        if (r)
+                goto unlock;
+        r = patch_cr157(chip);
+unlock:
+        t = zd_chip_unlock_phy_regs(chip);
+        if (t && !r)
+                r = t;
+out:
+        return r;
+}
+static int zd1211b_hw_reset_phy(struct zd_chip *chip)
+{
+        static const struct zd_ioreq16 ioreqs[] = {
+                { CR0,   0x14 }, { CR1,   0x06 }, { CR2,   0x26 },
+                { CR3,   0x38 }, { CR4,   0x80 }, { CR9,   0xe0 },
+                { CR10,  0x81 },
+                /* power control { { CR11,  1 << 6 }, */
+                { CR11,  0x00 },
+                { CR12,  0xf0 }, { CR13,  0x8c }, { CR14,  0x80 },
+                { CR15,  0x3d }, { CR16,  0x20 }, { CR17,  0x1e },
+                { CR18,  0x0a }, { CR19,  0x48 },
+                { CR20,  0x10 }, /* Org:0x0E, ComTrend:RalLink AP */
+                { CR21,  0x0e }, { CR22,  0x23 }, { CR23,  0x90 },
+                { CR24,  0x14 }, { CR25,  0x40 }, { CR26,  0x10 },
+                { CR27,  0x10 }, { CR28,  0x7f }, { CR29,  0x80 },
+                { CR30,  0x49 }, /* jointly decoder, no ASIC */
+                { CR31,  0x60 }, { CR32,  0x43 }, { CR33,  0x08 },
+                { CR34,  0x06 }, { CR35,  0x0a }, { CR36,  0x00 },
+                { CR37,  0x00 }, { CR38,  0x38 }, { CR39,  0x0c },
+                { CR40,  0x84 }, { CR41,  0x2a }, { CR42,  0x80 },
+                { CR43,  0x10 }, { CR44,  0x33 }, { CR46,  0xff },
+                { CR47,  0x1E }, { CR48,  0x26 }, { CR49,  0x5b },
+                { CR64,  0xd0 }, { CR65,  0x04 }, { CR66,  0x58 },
+                { CR67,  0xc9 }, { CR68,  0x88 }, { CR69,  0x41 },
+                { CR70,  0x23 }, { CR71,  0x10 }, { CR72,  0xff },
+                { CR73,  0x32 }, { CR74,  0x30 }, { CR75,  0x65 },
+                { CR76,  0x41 }, { CR77,  0x1b }, { CR78,  0x30 },
+                { CR79,  0xf0 }, { CR80,  0x64 }, { CR81,  0x64 },
+                { CR82,  0x00 }, { CR83,  0x24 }, { CR84,  0x04 },
+                { CR85,  0x00 }, { CR86,  0x0c }, { CR87,  0x12 },
+                { CR88,  0x0c }, { CR89,  0x00 }, { CR90,  0x58 },
+                { CR91,  0x04 }, { CR92,  0x00 }, { CR93,  0x00 },
+                { CR94,  0x01 },
+                { CR95,  0x20 }, /* ZD1211B */
+                { CR96,  0x50 }, { CR97,  0x37 }, { CR98,  0x35 },
+                { CR99,  0x00 }, { CR100, 0x01 }, { CR101, 0x13 },
+                { CR102, 0x27 }, { CR103, 0x27 }, { CR104, 0x18 },
+                { CR105, 0x12 }, { CR106, 0x04 }, { CR107, 0x00 },
+                { CR108, 0x0a }, { CR109, 0x27 }, { CR110, 0x27 },
+                { CR111, 0x27 }, { CR112, 0x27 }, { CR113, 0x27 },
+                { CR114, 0x27 }, { CR115, 0x26 }, { CR116, 0x24 },
+                { CR117, 0xfc }, { CR118, 0xfa }, { CR119, 0x1e },
+                { CR125, 0x90 }, { CR126, 0x00 }, { CR127, 0x00 },
+                { CR128, 0x14 }, { CR129, 0x12 }, { CR130, 0x10 },
+                { CR131, 0x0c }, { CR136, 0xdf }, { CR137, 0xa0 },
+                { CR138, 0xa8 }, { CR139, 0xb4 }, { CR140, 0x98 },
+                { CR141, 0x82 }, { CR142, 0x53 }, { CR143, 0x1c },
+                { CR144, 0x6c }, { CR147, 0x07 }, { CR148, 0x40 },
+                { CR149, 0x40 }, /* Org:0x50 ComTrend:RalLink AP */
+                { CR150, 0x14 }, /* Org:0x0E ComTrend:RalLink AP */
+                { CR151, 0x18 }, { CR159, 0x70 }, { CR160, 0xfe },
+                { CR161, 0xee }, { CR162, 0xaa }, { CR163, 0xfa },
+                { CR164, 0xfa }, { CR165, 0xea }, { CR166, 0xbe },
+                { CR167, 0xbe }, { CR168, 0x6a }, { CR169, 0xba },
+                { CR170, 0xba }, { CR171, 0xba },
+                /* Note: CR204 must lead the CR203 */
+                { CR204, 0x7d },
+                {},
+                { CR203, 0x30 },
+        };
+        int r, t;
+        dev_dbg_f(zd_chip_dev(chip), "\n");
+        r = zd_chip_lock_phy_regs(chip);
+        if (r)
+                goto out;
+        r = zd_iowrite16a_locked(chip, ioreqs, ARRAY_SIZE(ioreqs));
+        if (r)
+                goto unlock;
+        r = patch_cr157(chip);
+unlock:
+        t = zd_chip_unlock_phy_regs(chip);
+        if (t && !r)
+                r = t;
+out:
+        return r;
+}
+static int hw_reset_phy(struct zd_chip *chip)
+{
+        return chip->is_zd1211b ? zd1211b_hw_reset_phy(chip) :
+                                  zd1211_hw_reset_phy(chip);
+}
+static int zd1211_hw_init_hmac(struct zd_chip *chip)
+{
+        static const struct zd_ioreq32 ioreqs[] = {
+                { CR_ACK_TIMEOUT_EXT,           0x20 },
+                { CR_ADDA_MBIAS_WARMTIME,       0x30000808 },
+                { CR_ZD1211_RETRY_MAX,          0x2 },
+                { CR_SNIFFER_ON,                0 },
+                { CR_RX_FILTER,                 AP_RX_FILTER },
+                { CR_GROUP_HASH_P1,             0x00 },
+                { CR_GROUP_HASH_P2,             0x80000000 },
+                { CR_REG1,                      0xa4 },
+                { CR_ADDA_PWR_DWN,              0x7f },
+                { CR_BCN_PLCP_CFG,              0x00f00401 },
+                { CR_PHY_DELAY,                 0x00 },
+                { CR_ACK_TIMEOUT_EXT,           0x80 },
+                { CR_ADDA_PWR_DWN,              0x00 },
+                { CR_ACK_TIME_80211,            0x100 },
+                { CR_IFS_VALUE,                 0x547c032 },
+                { CR_RX_PE_DELAY,               0x70 },
+                { CR_PS_CTRL,                   0x10000000 },
+                { CR_RTS_CTS_RATE,              0x02030203 },
+                { CR_RX_THRESHOLD,              0x000c0640 },
+                { CR_AFTER_PNP,                 0x1 },
+                { CR_WEP_PROTECT,               0x114 },
+        };
+        int r;
+        dev_dbg_f(zd_chip_dev(chip), "\n");
+        ZD_ASSERT(mutex_is_locked(&chip->mutex));
+        r = zd_iowrite32a_locked(chip, ioreqs, ARRAY_SIZE(ioreqs));
+#ifdef DEBUG
+        if (r) {
+                dev_err(zd_chip_dev(chip),
+                        "error in zd_iowrite32a_locked. Error number %d\n", r);
+        }
+#endif /* DEBUG */
+        return r;
+}
+static int zd1211b_hw_init_hmac(struct zd_chip *chip)
+{
+        static const struct zd_ioreq32 ioreqs[] = {
+                { CR_ACK_TIMEOUT_EXT,           0x20 },
+                { CR_ADDA_MBIAS_WARMTIME,       0x30000808 },
+                { CR_ZD1211B_RETRY_MAX,         0x02020202 },
+                { CR_ZD1211B_TX_PWR_CTL4,       0x007f003f },
+                { CR_ZD1211B_TX_PWR_CTL3,       0x007f003f },
+                { CR_ZD1211B_TX_PWR_CTL2,       0x003f001f },
+                { CR_ZD1211B_TX_PWR_CTL1,       0x001f000f },
+                { CR_ZD1211B_AIFS_CTL1,         0x00280028 },
+                { CR_ZD1211B_AIFS_CTL2,         0x008C003C },
+                { CR_ZD1211B_TXOP,              0x01800824 },
+                { CR_SNIFFER_ON,                0 },
+                { CR_RX_FILTER,                 AP_RX_FILTER },
+                { CR_GROUP_HASH_P1,             0x00 },
+                { CR_GROUP_HASH_P2,             0x80000000 },
+                { CR_REG1,                      0xa4 },
+                { CR_ADDA_PWR_DWN,              0x7f },
+                { CR_BCN_PLCP_CFG,              0x00f00401 },
+                { CR_PHY_DELAY,                 0x00 },
+                { CR_ACK_TIMEOUT_EXT,           0x80 },
+                { CR_ADDA_PWR_DWN,              0x00 },
+                { CR_ACK_TIME_80211,            0x100 },
+                { CR_IFS_VALUE,                 0x547c032 },
+                { CR_RX_PE_DELAY,               0x70 },
+                { CR_PS_CTRL,                   0x10000000 },
+                { CR_RTS_CTS_RATE,              0x02030203 },
+                { CR_RX_THRESHOLD,              0x000c0640 },
+                { CR_AFTER_PNP,                 0x1 },
+                { CR_WEP_PROTECT,               0x114 },
+        };
+        int r;
+        dev_dbg_f(zd_chip_dev(chip), "\n");
+        ZD_ASSERT(mutex_is_locked(&chip->mutex));
+        r = zd_iowrite32a_locked(chip, ioreqs, ARRAY_SIZE(ioreqs));
+        if (r) {
+                dev_dbg_f(zd_chip_dev(chip),
+                        "error in zd_iowrite32a_locked. Error number %d\n", r);
+        }
+        return r;
+}
+static int hw_init_hmac(struct zd_chip *chip)
+{
+        return chip->is_zd1211b ?
+                zd1211b_hw_init_hmac(chip) : zd1211_hw_init_hmac(chip);
+}
+struct aw_pt_bi {
+        u32 atim_wnd_period;
+        u32 pre_tbtt;
+        u32 beacon_interval;
+};
+static int get_aw_pt_bi(struct zd_chip *chip, struct aw_pt_bi *s)
+{
+        int r;
+        static const zd_addr_t aw_pt_bi_addr[] =
+                { CR_ATIM_WND_PERIOD, CR_PRE_TBTT, CR_BCN_INTERVAL };
+        u32 values[3];
+        r = zd_ioread32v_locked(chip, values, (const zd_addr_t *)aw_pt_bi_addr,
+                         ARRAY_SIZE(aw_pt_bi_addr));
+        if (r) {
+                memset(s, 0, sizeof(*s));
+                return r;
+        }
+        s->atim_wnd_period = values[0];
+        s->pre_tbtt = values[1];
+        s->beacon_interval = values[2];
+        dev_dbg_f(zd_chip_dev(chip), "aw %u pt %u bi %u\n",
+                s->atim_wnd_period, s->pre_tbtt, s->beacon_interval);
+        return 0;
+}
+static int set_aw_pt_bi(struct zd_chip *chip, struct aw_pt_bi *s)
+{
+        struct zd_ioreq32 reqs[3];
+        if (s->beacon_interval <= 5)
+                s->beacon_interval = 5;
+        if (s->pre_tbtt < 4 || s->pre_tbtt >= s->beacon_interval)
+                s->pre_tbtt = s->beacon_interval - 1;
+        if (s->atim_wnd_period >= s->pre_tbtt)
+                s->atim_wnd_period = s->pre_tbtt - 1;
+        reqs[0].addr = CR_ATIM_WND_PERIOD;
+        reqs[0].value = s->atim_wnd_period;
+        reqs[1].addr = CR_PRE_TBTT;
+        reqs[1].value = s->pre_tbtt;
+        reqs[2].addr = CR_BCN_INTERVAL;
+        reqs[2].value = s->beacon_interval;
+        dev_dbg_f(zd_chip_dev(chip),
+                "aw %u pt %u bi %u\n", s->atim_wnd_period, s->pre_tbtt,
+                                       s->beacon_interval);
+        return zd_iowrite32a_locked(chip, reqs, ARRAY_SIZE(reqs));
+}
+static int set_beacon_interval(struct zd_chip *chip, u32 interval)
+{
+        int r;
+        struct aw_pt_bi s;
+        ZD_ASSERT(mutex_is_locked(&chip->mutex));
+        r = get_aw_pt_bi(chip, &s);
+        if (r)
+                return r;
+        s.beacon_interval = interval;
+        return set_aw_pt_bi(chip, &s);
+}
+int zd_set_beacon_interval(struct zd_chip *chip, u32 interval)
+{
+        int r;
+        mutex_lock(&chip->mutex);
+        r = set_beacon_interval(chip, interval);
+        mutex_unlock(&chip->mutex);
+        return r;
+}
+static int hw_init(struct zd_chip *chip)
+{
+        int r;
+        dev_dbg_f(zd_chip_dev(chip), "\n");
+        ZD_ASSERT(mutex_is_locked(&chip->mutex));
+        r = hw_reset_phy(chip);
+        if (r)
+                return r;
+        r = hw_init_hmac(chip);
+        if (r)
+                return r;
+        r = set_beacon_interval(chip, 100);
+        if (r)
+                return r;
+        return 0;
+}
+#ifdef DEBUG
+static int dump_cr(struct zd_chip *chip, const zd_addr_t addr,
+                   const char *addr_string)
+{
+        int r;
+        u32 value;
+        r = zd_ioread32_locked(chip, &value, addr);
+        if (r) {
+                dev_dbg_f(zd_chip_dev(chip),
+                        "error reading %s. Error number %d\n", addr_string, r);
+                return r;
+        }
+        dev_dbg_f(zd_chip_dev(chip), "%s %#010x\n",
+                addr_string, (unsigned int)value);
+        return 0;
+}
+static int test_init(struct zd_chip *chip)
+{
+        int r;
+        r = dump_cr(chip, CR_AFTER_PNP, "CR_AFTER_PNP");
+        if (r)
+                return r;
+        r = dump_cr(chip, CR_GPI_EN, "CR_GPI_EN");
+        if (r)
+                return r;
+        return dump_cr(chip, CR_INTERRUPT, "CR_INTERRUPT");
+}
+static void dump_fw_registers(struct zd_chip *chip)
+{
+        static const zd_addr_t addr[4] = {
+                FW_FIRMWARE_VER, FW_USB_SPEED, FW_FIX_TX_RATE,
+                FW_LINK_STATUS
+        };
+        int r;
+        u16 values[4];
+        r = zd_ioread16v_locked(chip, values, (const zd_addr_t*)addr,
+                         ARRAY_SIZE(addr));
+        if (r) {
+                dev_dbg_f(zd_chip_dev(chip), "error %d zd_ioread16v_locked\n",
+                         r);
+                return;
+        }
+        dev_dbg_f(zd_chip_dev(chip), "FW_FIRMWARE_VER %#06hx\n", values[0]);
+        dev_dbg_f(zd_chip_dev(chip), "FW_USB_SPEED %#06hx\n", values[1]);
+        dev_dbg_f(zd_chip_dev(chip), "FW_FIX_TX_RATE %#06hx\n", values[2]);
+        dev_dbg_f(zd_chip_dev(chip), "FW_LINK_STATUS %#06hx\n", values[3]);
+}
+#endif /* DEBUG */
+static int print_fw_version(struct zd_chip *chip)
+{
+        int r;
+        u16 version;
+        r = zd_ioread16_locked(chip, &version, FW_FIRMWARE_VER);
+        if (r)
+                return r;
+        dev_info(zd_chip_dev(chip),"firmware version %04hx\n", version);
+        return 0;
+}
+static int set_mandatory_rates(struct zd_chip *chip, enum ieee80211_std std)
+{
+        u32 rates;
+        ZD_ASSERT(mutex_is_locked(&chip->mutex));
+        /* This sets the mandatory rates, which only depend from the standard
+         * that the device is supporting. Until further notice we should try
+         * to support 802.11g also for full speed USB.
+         */
+        switch (std) {
+        case IEEE80211B:
+                rates = CR_RATE_1M|CR_RATE_2M|CR_RATE_5_5M|CR_RATE_11M;
+                break;
+        case IEEE80211G:
+                rates = CR_RATE_1M|CR_RATE_2M|CR_RATE_5_5M|CR_RATE_11M|
+                        CR_RATE_6M|CR_RATE_12M|CR_RATE_24M;
+                break;
+        default:
+                return -EINVAL;
+        }
+        return zd_iowrite32_locked(chip, rates, CR_MANDATORY_RATE_TBL);
+}
+int zd_chip_enable_hwint(struct zd_chip *chip)
+{
+        int r;
+        mutex_lock(&chip->mutex);
+        r = zd_iowrite32_locked(chip, HWINT_ENABLED, CR_INTERRUPT);
+        mutex_unlock(&chip->mutex);
+        return r;
+}
+static int disable_hwint(struct zd_chip *chip)
+{
+        return zd_iowrite32_locked(chip, HWINT_DISABLED, CR_INTERRUPT);
+}
+int zd_chip_disable_hwint(struct zd_chip *chip)
+{
+        int r;
+        mutex_lock(&chip->mutex);
+        r = disable_hwint(chip);
+        mutex_unlock(&chip->mutex);
+        return r;
+}
+int zd_chip_init_hw(struct zd_chip *chip, u8 device_type)
+{
+        int r;
+        u8 rf_type;
+        dev_dbg_f(zd_chip_dev(chip), "\n");
+        mutex_lock(&chip->mutex);
+        chip->is_zd1211b = (device_type == DEVICE_ZD1211B) != 0;
+#ifdef DEBUG
+        r = test_init(chip);
+        if (r)
+                goto out;
+#endif
+        r = zd_iowrite32_locked(chip, 1, CR_AFTER_PNP);
+        if (r)
+                goto out;
+        r = zd_usb_init_hw(&chip->usb);
+        if (r)
+                goto out;
+        /* GPI is always disabled, also in the other driver.
+         */
+        r = zd_iowrite32_locked(chip, 0, CR_GPI_EN);
+        if (r)
+                goto out;
+        r = zd_iowrite32_locked(chip, CWIN_SIZE, CR_CWMIN_CWMAX);
+        if (r)
+                goto out;
+        /* Currently we support IEEE 802.11g for full and high speed USB.
+         * It might be discussed, whether we should suppport pure b mode for
+         * full speed USB.
+         */
+        r = set_mandatory_rates(chip, IEEE80211G);
+        if (r)
+                goto out;
+        /* Disabling interrupts is certainly a smart thing here.
+         */
+        r = disable_hwint(chip);
+        if (r)
+                goto out;
+        r = read_pod(chip, &rf_type);
+        if (r)
+                goto out;
+        r = hw_init(chip);
+        if (r)
+                goto out;
+        r = zd_rf_init_hw(&chip->rf, rf_type);
+        if (r)
+                goto out;
+        r = print_fw_version(chip);
+        if (r)
+                goto out;
+#ifdef DEBUG
+        dump_fw_registers(chip);
+        r = test_init(chip);
+        if (r)
+                goto out;
+#endif /* DEBUG */
+        r = read_e2p_mac_addr(chip);
+        if (r)
+                goto out;
+        r = read_cal_int_tables(chip);
+        if (r)
+                goto out;
+        print_id(chip);
+out:
+        mutex_unlock(&chip->mutex);
+        return r;
+}
+static int update_pwr_int(struct zd_chip *chip, u8 channel)
+{
+        u8 value = chip->pwr_int_values[channel - 1];
+        dev_dbg_f(zd_chip_dev(chip), "channel %d pwr_int %#04x\n",
+                 channel, value);
+        return zd_iowrite32_locked(chip, value, CR31);
+}
+static int update_pwr_cal(struct zd_chip *chip, u8 channel)
+{
+        u8 value = chip->pwr_cal_values[channel-1];
+        dev_dbg_f(zd_chip_dev(chip), "channel %d pwr_cal %#04x\n",
+                 channel, value);
+        return zd_iowrite32_locked(chip, value, CR68);
+}
+static int update_ofdm_cal(struct zd_chip *chip, u8 channel)
+{
+        struct zd_ioreq32 ioreqs[3];
+        ioreqs[0].addr = CR67;
+        ioreqs[0].value = chip->ofdm_cal_values[OFDM_36M_INDEX][channel-1];
+        ioreqs[1].addr = CR66;
+        ioreqs[1].value = chip->ofdm_cal_values[OFDM_48M_INDEX][channel-1];
+        ioreqs[2].addr = CR65;
+        ioreqs[2].value = chip->ofdm_cal_values[OFDM_54M_INDEX][channel-1];
+        dev_dbg_f(zd_chip_dev(chip),
+                "channel %d ofdm_cal 36M %#04x 48M %#04x 54M %#04x\n",
+                channel, ioreqs[0].value, ioreqs[1].value, ioreqs[2].value);
+        return zd_iowrite32a_locked(chip, ioreqs, ARRAY_SIZE(ioreqs));
+}
+static int update_channel_integration_and_calibration(struct zd_chip *chip,
+                                                      u8 channel)
+{
+        int r;
+        r = update_pwr_int(chip, channel);
+        if (r)
+                return r;
+        if (chip->is_zd1211b) {
+                static const struct zd_ioreq32 ioreqs[] = {
+                        { CR69, 0x28 },
+                        {},
+                        { CR69, 0x2a },
+                };
+                r = update_ofdm_cal(chip, channel);
+                if (r)
+                        return r;
+                r = update_pwr_cal(chip, channel);
+                if (r)
+                        return r;
+                r = zd_iowrite32a_locked(chip, ioreqs, ARRAY_SIZE(ioreqs));
+                if (r)
+                        return r;
+        }
+        return 0;
+}
+/* The CCK baseband gain can be optionally patched by the EEPROM */
+static int patch_cck_gain(struct zd_chip *chip)
+{
+        int r;
+        u32 value;
+        if (!chip->patch_cck_gain)
+                return 0;
+        ZD_ASSERT(mutex_is_locked(&chip->mutex));
+        r = zd_ioread32_locked(chip, &value, E2P_PHY_REG);
+        if (r)
+                return r;
+        dev_dbg_f(zd_chip_dev(chip), "patching value %x\n", value & 0xff);
+        return zd_iowrite32_locked(chip, value & 0xff, CR47);
+}
+int zd_chip_set_channel(struct zd_chip *chip, u8 channel)
+{
+        int r, t;
+        mutex_lock(&chip->mutex);
+        r = zd_chip_lock_phy_regs(chip);
+        if (r)
+                goto out;
+        r = zd_rf_set_channel(&chip->rf, channel);
+        if (r)
+                goto unlock;
+        r = update_channel_integration_and_calibration(chip, channel);
+        if (r)
+                goto unlock;
+        r = patch_cck_gain(chip);
+        if (r)
+                goto unlock;
+        r = patch_6m_band_edge(chip, channel);
+        if (r)
+                goto unlock;
+        r = zd_iowrite32_locked(chip, 0, CR_CONFIG_PHILIPS);
+unlock:
+        t = zd_chip_unlock_phy_regs(chip);
+        if (t && !r)
+                r = t;
+out:
+        mutex_unlock(&chip->mutex);
+        return r;
+}
+u8 zd_chip_get_channel(struct zd_chip *chip)
+{
+        u8 channel;
+        mutex_lock(&chip->mutex);
+        channel = chip->rf.channel;
+        mutex_unlock(&chip->mutex);
+        return channel;
+}
+static u16 led_mask(int led)
+{
+        switch (led) {
+        case 1:
+                return LED1;
+        case 2:
+                return LED2;
+        default:
+                return 0;
+        }
+}
+static int read_led_reg(struct zd_chip *chip, u16 *status)
+{
+        ZD_ASSERT(mutex_is_locked(&chip->mutex));
+        return zd_ioread16_locked(chip, status, CR_LED);
+}
+static int write_led_reg(struct zd_chip *chip, u16 status)
+{
+        ZD_ASSERT(mutex_is_locked(&chip->mutex));
+        return zd_iowrite16_locked(chip, status, CR_LED);
+}
+int zd_chip_led_status(struct zd_chip *chip, int led, enum led_status status)
+{
+        int r, ret;
+        u16 mask = led_mask(led);
+        u16 reg;
+        if (!mask)
+                return -EINVAL;
+        mutex_lock(&chip->mutex);
+        r = read_led_reg(chip, &reg);
+        if (r)
+                return r;
+        switch (status) {
+        case LED_STATUS:
+                return (reg & mask) ? LED_ON : LED_OFF;
+        case LED_OFF:
+                reg &= ~mask;
+                ret = LED_OFF;
+                break;
+        case LED_FLIP:
+                reg ^= mask;
+                ret = (reg&mask) ? LED_ON : LED_OFF;
+                break;
+        case LED_ON:
+                reg |= mask;
+                ret = LED_ON;
+                break;
+        default:
+                return -EINVAL;
+        }
+        r = write_led_reg(chip, reg);
+        if (r) {
+                ret = r;
+                goto out;
+        }
+out:
+        mutex_unlock(&chip->mutex);
+        return r;
+}
+int zd_chip_led_flip(struct zd_chip *chip, int led,
+        const unsigned int *phases_msecs, unsigned int count)
+{
+        int i, r;
+        enum led_status status;
+        r = zd_chip_led_status(chip, led, LED_STATUS);
+        if (r)
+                return r;
+        status = r;
+        for (i = 0; i < count; i++) {
+                r = zd_chip_led_status(chip, led, LED_FLIP);
+                if (r < 0)
+                        goto out;
+                msleep(phases_msecs[i]);
+        }
+out:
+        zd_chip_led_status(chip, led, status);
+        return r;
+}
+int zd_chip_set_basic_rates(struct zd_chip *chip, u16 cr_rates)
+{
+        int r;
+        if (cr_rates & ~(CR_RATES_80211B|CR_RATES_80211G))
+                return -EINVAL;
+        mutex_lock(&chip->mutex);
+        r = zd_iowrite32_locked(chip, cr_rates, CR_BASIC_RATE_TBL);
+        mutex_unlock(&chip->mutex);
+        return r;
+}
+static int ofdm_qual_db(u8 status_quality, u8 rate, unsigned int size)
+{
+        static const u16 constants[] = {
+                715, 655, 585, 540, 470, 410, 360, 315,
+                270, 235, 205, 175, 150, 125, 105,  85,
+                 65,  50,  40,  25,  15
+        };
+        int i;
+        u32 x;
+        /* It seems that their quality parameter is somehow per signal
+         * and is now transferred per bit.
+         */
+        switch (rate) {
+        case ZD_OFDM_RATE_6M:
+        case ZD_OFDM_RATE_12M:
+        case ZD_OFDM_RATE_24M:
+                size *= 2;
+                break;
+        case ZD_OFDM_RATE_9M:
+        case ZD_OFDM_RATE_18M:
+        case ZD_OFDM_RATE_36M:
+        case ZD_OFDM_RATE_54M:
+                size *= 4;
+                size /= 3;
+                break;
+        case ZD_OFDM_RATE_48M:
+                size *= 3;
+                size /= 2;
+                break;
+        default:
+                return -EINVAL;
+        }
+        x = (10000 * status_quality)/size;
+        for (i = 0; i < ARRAY_SIZE(constants); i++) {
+                if (x > constants[i])
+                        break;
+        }
+        return i;
+}
+static unsigned int log10times100(unsigned int x)
+{
+        static const u8 log10[] = {
+                  0,
+                  0,   30,   47,   60,   69,   77,   84,   90,   95,  100,
+                104,  107,  111,  114,  117,  120,  123,  125,  127,  130,
+                132,  134,  136,  138,  139,  141,  143,  144,  146,  147,
+                149,  150,  151,  153,  154,  155,  156,  157,  159,  160,
+                161,  162,  163,  164,  165,  166,  167,  168,  169,  169,
+                170,  171,  172,  173,  174,  174,  175,  176,  177,  177,
+                178,  179,  179,  180,  181,  181,  182,  183,  183,  184,
+                185,  185,  186,  186,  187,  188,  188,  189,  189,  190,
+                190,  191,  191,  192,  192,  193,  193,  194,  194,  195,
+                195,  196,  196,  197,  197,  198,  198,  199,  199,  200,
+                200,  200,  201,  201,  202,  202,  202,  203,  203,  204,
+                204,  204,  205,  205,  206,  206,  206,  207,  207,  207,
+                208,  208,  208,  209,  209,  210,  210,  210,  211,  211,
+                211,  212,  212,  212,  213,  213,  213,  213,  214,  214,
+                214,  215,  215,  215,  216,  216,  216,  217,  217,  217,
+                217,  218,  218,  218,  219,  219,  219,  219,  220,  220,
+                220,  220,  221,  221,  221,  222,  222,  222,  222,  223,
+                223,  223,  223,  224,  224,  224,  224,
+        };
+        return x < ARRAY_SIZE(log10) ? log10[x] : 225;
+}
+enum {
+        MAX_CCK_EVM_DB = 45,
+};
+static int cck_evm_db(u8 status_quality)
+{
+        return (20 * log10times100(status_quality)) / 100;
+}
+static int cck_snr_db(u8 status_quality)
+{
+        int r = MAX_CCK_EVM_DB - cck_evm_db(status_quality);
+        ZD_ASSERT(r >= 0);
+        return r;
+}
+static int rx_qual_db(const void *rx_frame, unsigned int size,
+                      const struct rx_status *status)
+{
+        return (status->frame_status&ZD_RX_OFDM) ?
+                ofdm_qual_db(status->signal_quality_ofdm,
+                             zd_ofdm_plcp_header_rate(rx_frame),
+                             size) :
+                cck_snr_db(status->signal_quality_cck);
+}
+u8 zd_rx_qual_percent(const void *rx_frame, unsigned int size,
+                      const struct rx_status *status)
+{
+        int r = rx_qual_db(rx_frame, size, status);
+        if (r < 0)
+                r = 0;
+        r = (r * 100) / 14;
+        if (r > 100)
+                r = 100;
+        return r;
+}
+u8 zd_rx_strength_percent(u8 rssi)
+{
+        int r = (rssi*100) / 30;
+        if (r > 100)
+                r = 100;
+        return (u8) r;
+}
+u16 zd_rx_rate(const void *rx_frame, const struct rx_status *status)
+{
+        static const u16 ofdm_rates[] = {
+                [ZD_OFDM_RATE_6M]  = 60,
+                [ZD_OFDM_RATE_9M]  = 90,
+                [ZD_OFDM_RATE_12M] = 120,
+                [ZD_OFDM_RATE_18M] = 180,
+                [ZD_OFDM_RATE_24M] = 240,
+                [ZD_OFDM_RATE_36M] = 360,
+                [ZD_OFDM_RATE_48M] = 480,
+                [ZD_OFDM_RATE_54M] = 540,
+        };
+        u16 rate;
+        if (status->frame_status & ZD_RX_OFDM) {
+                u8 ofdm_rate = zd_ofdm_plcp_header_rate(rx_frame);
+                rate = ofdm_rates[ofdm_rate & 0xf];
+        } else {
+                u8 cck_rate = zd_cck_plcp_header_rate(rx_frame);
+                switch (cck_rate) {
+                case ZD_CCK_SIGNAL_1M:
+                        rate = 10;
+                        break;
+                case ZD_CCK_SIGNAL_2M:
+                        rate = 20;
+                        break;
+                case ZD_CCK_SIGNAL_5M5:
+                        rate = 55;
+                        break;
+                case ZD_CCK_SIGNAL_11M:
+                        rate = 110;
+                        break;
+                default:
+                        rate = 0;
+                }
+        }
+        return rate;
+}
+int zd_chip_switch_radio_on(struct zd_chip *chip)
+{
+        int r;
+        mutex_lock(&chip->mutex);
+        r = zd_switch_radio_on(&chip->rf);
+        mutex_unlock(&chip->mutex);
+        return r;
+}
+int zd_chip_switch_radio_off(struct zd_chip *chip)
+{
+        int r;
+        mutex_lock(&chip->mutex);
+        r = zd_switch_radio_off(&chip->rf);
+        mutex_unlock(&chip->mutex);
+        return r;
+}
+int zd_chip_enable_int(struct zd_chip *chip)
+{
+        int r;
+        mutex_lock(&chip->mutex);
+        r = zd_usb_enable_int(&chip->usb);
+        mutex_unlock(&chip->mutex);
+        return r;
+}
+void zd_chip_disable_int(struct zd_chip *chip)
+{
+        mutex_lock(&chip->mutex);
+        zd_usb_disable_int(&chip->usb);
+        mutex_unlock(&chip->mutex);
+}
+int zd_chip_enable_rx(struct zd_chip *chip)
+{
+        int r;
+        mutex_lock(&chip->mutex);
+        r = zd_usb_enable_rx(&chip->usb);
+        mutex_unlock(&chip->mutex);
+        return r;
+}
+void zd_chip_disable_rx(struct zd_chip *chip)
+{
+        mutex_lock(&chip->mutex);
+        zd_usb_disable_rx(&chip->usb);
+        mutex_unlock(&chip->mutex);
+}
+int zd_rfwritev_locked(struct zd_chip *chip,
+                       const u32* values, unsigned int count, u8 bits)
+{
+        int r;
+        unsigned int i;
+        for (i = 0; i < count; i++) {
+                r = zd_rfwrite_locked(chip, values[i], bits);
+                if (r)
+                        return r;
+        }
+        return 0;
+}
diff --git a/drivers/net/wireless/zd1211rw/zd_chip.h b/drivers/net/wireless/zd1211rw/zd_chip.h
new file mode 100644
index 000000000000..805121093ab5
--- /dev/null
+++ b/drivers/net/wireless/zd1211rw/zd_chip.h
@@ -0,0 +1,825 @@
+/* zd_chip.h
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#ifndef _ZD_CHIP_H
+#define _ZD_CHIP_H
+#include "zd_types.h"
+#include "zd_rf.h"
+#include "zd_usb.h"
+/* Header for the Media Access Controller (MAC) and the Baseband Processor
+ * (BBP). It appears that the ZD1211 wraps the old ZD1205 with USB glue and
+ * adds a processor for handling the USB protocol.
+ */
+/* 8-bit hardware registers */
+#define CR0   CTL_REG(0x0000)
+#define CR1   CTL_REG(0x0004)
+#define CR2   CTL_REG(0x0008)
+#define CR3   CTL_REG(0x000C)
+#define CR5   CTL_REG(0x0010)
+/*      bit 5: if set short preamble used
+ *      bit 6: filter band - Japan channel 14 on, else off
+ */
+#define CR6   CTL_REG(0x0014)
+#define CR7   CTL_REG(0x0018)
+#define CR8   CTL_REG(0x001C)
+#define CR4   CTL_REG(0x0020)
+#define CR9   CTL_REG(0x0024)
+/*      bit 2: antenna switch (together with CR10) */
+#define CR10  CTL_REG(0x0028)
+/*      bit 1: antenna switch (together with CR9)
+ *      RF2959 controls with CR11 radion on and off
+ */
+#define CR11  CTL_REG(0x002C)
+/*      bit 6:  TX power control for OFDM
+ *      RF2959 controls with CR10 radio on and off
+ */
+#define CR12  CTL_REG(0x0030)
+#define CR13  CTL_REG(0x0034)
+#define CR14  CTL_REG(0x0038)
+#define CR15  CTL_REG(0x003C)
+#define CR16  CTL_REG(0x0040)
+#define CR17  CTL_REG(0x0044)
+#define CR18  CTL_REG(0x0048)
+#define CR19  CTL_REG(0x004C)
+#define CR20  CTL_REG(0x0050)
+#define CR21  CTL_REG(0x0054)
+#define CR22  CTL_REG(0x0058)
+#define CR23  CTL_REG(0x005C)
+#define CR24  CTL_REG(0x0060)   /* CCA threshold */
+#define CR25  CTL_REG(0x0064)
+#define CR26  CTL_REG(0x0068)
+#define CR27  CTL_REG(0x006C)
+#define CR28  CTL_REG(0x0070)
+#define CR29  CTL_REG(0x0074)
+#define CR30  CTL_REG(0x0078)
+#define CR31  CTL_REG(0x007C)   /* TX power control for RF in CCK mode */
+#define CR32  CTL_REG(0x0080)
+#define CR33  CTL_REG(0x0084)
+#define CR34  CTL_REG(0x0088)
+#define CR35  CTL_REG(0x008C)
+#define CR36  CTL_REG(0x0090)
+#define CR37  CTL_REG(0x0094)
+#define CR38  CTL_REG(0x0098)
+#define CR39  CTL_REG(0x009C)
+#define CR40  CTL_REG(0x00A0)
+#define CR41  CTL_REG(0x00A4)
+#define CR42  CTL_REG(0x00A8)
+#define CR43  CTL_REG(0x00AC)
+#define CR44  CTL_REG(0x00B0)
+#define CR45  CTL_REG(0x00B4)
+#define CR46  CTL_REG(0x00B8)
+#define CR47  CTL_REG(0x00BC)   /* CCK baseband gain
+                                 * (patch value might be in EEPROM)
+                                 */
+#define CR48  CTL_REG(0x00C0)
+#define CR49  CTL_REG(0x00C4)
+#define CR50  CTL_REG(0x00C8)
+#define CR51  CTL_REG(0x00CC)   /* TX power control for RF in 6-36M modes */
+#define CR52  CTL_REG(0x00D0)   /* TX power control for RF in 48M mode */
+#define CR53  CTL_REG(0x00D4)   /* TX power control for RF in 54M mode */
+#define CR54  CTL_REG(0x00D8)
+#define CR55  CTL_REG(0x00DC)
+#define CR56  CTL_REG(0x00E0)
+#define CR57  CTL_REG(0x00E4)
+#define CR58  CTL_REG(0x00E8)
+#define CR59  CTL_REG(0x00EC)
+#define CR60  CTL_REG(0x00F0)
+#define CR61  CTL_REG(0x00F4)
+#define CR62  CTL_REG(0x00F8)
+#define CR63  CTL_REG(0x00FC)
+#define CR64  CTL_REG(0x0100)
+#define CR65  CTL_REG(0x0104) /* OFDM 54M calibration */
+#define CR66  CTL_REG(0x0108) /* OFDM 48M calibration */
+#define CR67  CTL_REG(0x010C) /* OFDM 36M calibration */
+#define CR68  CTL_REG(0x0110) /* CCK calibration */
+#define CR69  CTL_REG(0x0114)
+#define CR70  CTL_REG(0x0118)
+#define CR71  CTL_REG(0x011C)
+#define CR72  CTL_REG(0x0120)
+#define CR73  CTL_REG(0x0124)
+#define CR74  CTL_REG(0x0128)
+#define CR75  CTL_REG(0x012C)
+#define CR76  CTL_REG(0x0130)
+#define CR77  CTL_REG(0x0134)
+#define CR78  CTL_REG(0x0138)
+#define CR79  CTL_REG(0x013C)
+#define CR80  CTL_REG(0x0140)
+#define CR81  CTL_REG(0x0144)
+#define CR82  CTL_REG(0x0148)
+#define CR83  CTL_REG(0x014C)
+#define CR84  CTL_REG(0x0150)
+#define CR85  CTL_REG(0x0154)
+#define CR86  CTL_REG(0x0158)
+#define CR87  CTL_REG(0x015C)
+#define CR88  CTL_REG(0x0160)
+#define CR89  CTL_REG(0x0164)
+#define CR90  CTL_REG(0x0168)
+#define CR91  CTL_REG(0x016C)
+#define CR92  CTL_REG(0x0170)
+#define CR93  CTL_REG(0x0174)
+#define CR94  CTL_REG(0x0178)
+#define CR95  CTL_REG(0x017C)
+#define CR96  CTL_REG(0x0180)
+#define CR97  CTL_REG(0x0184)
+#define CR98  CTL_REG(0x0188)
+#define CR99  CTL_REG(0x018C)
+#define CR100 CTL_REG(0x0190)
+#define CR101 CTL_REG(0x0194)
+#define CR102 CTL_REG(0x0198)
+#define CR103 CTL_REG(0x019C)
+#define CR104 CTL_REG(0x01A0)
+#define CR105 CTL_REG(0x01A4)
+#define CR106 CTL_REG(0x01A8)
+#define CR107 CTL_REG(0x01AC)
+#define CR108 CTL_REG(0x01B0)
+#define CR109 CTL_REG(0x01B4)
+#define CR110 CTL_REG(0x01B8)
+#define CR111 CTL_REG(0x01BC)
+#define CR112 CTL_REG(0x01C0)
+#define CR113 CTL_REG(0x01C4)
+#define CR114 CTL_REG(0x01C8)
+#define CR115 CTL_REG(0x01CC)
+#define CR116 CTL_REG(0x01D0)
+#define CR117 CTL_REG(0x01D4)
+#define CR118 CTL_REG(0x01D8)
+#define CR119 CTL_REG(0x01DC)
+#define CR120 CTL_REG(0x01E0)
+#define CR121 CTL_REG(0x01E4)
+#define CR122 CTL_REG(0x01E8)
+#define CR123 CTL_REG(0x01EC)
+#define CR124 CTL_REG(0x01F0)
+#define CR125 CTL_REG(0x01F4)
+#define CR126 CTL_REG(0x01F8)
+#define CR127 CTL_REG(0x01FC)
+#define CR128 CTL_REG(0x0200)
+#define CR129 CTL_REG(0x0204)
+#define CR130 CTL_REG(0x0208)
+#define CR131 CTL_REG(0x020C)
+#define CR132 CTL_REG(0x0210)
+#define CR133 CTL_REG(0x0214)
+#define CR134 CTL_REG(0x0218)
+#define CR135 CTL_REG(0x021C)
+#define CR136 CTL_REG(0x0220)
+#define CR137 CTL_REG(0x0224)
+#define CR138 CTL_REG(0x0228)
+#define CR139 CTL_REG(0x022C)
+#define CR140 CTL_REG(0x0230)
+#define CR141 CTL_REG(0x0234)
+#define CR142 CTL_REG(0x0238)
+#define CR143 CTL_REG(0x023C)
+#define CR144 CTL_REG(0x0240)
+#define CR145 CTL_REG(0x0244)
+#define CR146 CTL_REG(0x0248)
+#define CR147 CTL_REG(0x024C)
+#define CR148 CTL_REG(0x0250)
+#define CR149 CTL_REG(0x0254)
+#define CR150 CTL_REG(0x0258)
+#define CR151 CTL_REG(0x025C)
+#define CR152 CTL_REG(0x0260)
+#define CR153 CTL_REG(0x0264)
+#define CR154 CTL_REG(0x0268)
+#define CR155 CTL_REG(0x026C)
+#define CR156 CTL_REG(0x0270)
+#define CR157 CTL_REG(0x0274)
+#define CR158 CTL_REG(0x0278)
+#define CR159 CTL_REG(0x027C)
+#define CR160 CTL_REG(0x0280)
+#define CR161 CTL_REG(0x0284)
+#define CR162 CTL_REG(0x0288)
+#define CR163 CTL_REG(0x028C)
+#define CR164 CTL_REG(0x0290)
+#define CR165 CTL_REG(0x0294)
+#define CR166 CTL_REG(0x0298)
+#define CR167 CTL_REG(0x029C)
+#define CR168 CTL_REG(0x02A0)
+#define CR169 CTL_REG(0x02A4)
+#define CR170 CTL_REG(0x02A8)
+#define CR171 CTL_REG(0x02AC)
+#define CR172 CTL_REG(0x02B0)
+#define CR173 CTL_REG(0x02B4)
+#define CR174 CTL_REG(0x02B8)
+#define CR175 CTL_REG(0x02BC)
+#define CR176 CTL_REG(0x02C0)
+#define CR177 CTL_REG(0x02C4)
+#define CR178 CTL_REG(0x02C8)
+#define CR179 CTL_REG(0x02CC)
+#define CR180 CTL_REG(0x02D0)
+#define CR181 CTL_REG(0x02D4)
+#define CR182 CTL_REG(0x02D8)
+#define CR183 CTL_REG(0x02DC)
+#define CR184 CTL_REG(0x02E0)
+#define CR185 CTL_REG(0x02E4)
+#define CR186 CTL_REG(0x02E8)
+#define CR187 CTL_REG(0x02EC)
+#define CR188 CTL_REG(0x02F0)
+#define CR189 CTL_REG(0x02F4)
+#define CR190 CTL_REG(0x02F8)
+#define CR191 CTL_REG(0x02FC)
+#define CR192 CTL_REG(0x0300)
+#define CR193 CTL_REG(0x0304)
+#define CR194 CTL_REG(0x0308)
+#define CR195 CTL_REG(0x030C)
+#define CR196 CTL_REG(0x0310)
+#define CR197 CTL_REG(0x0314)
+#define CR198 CTL_REG(0x0318)
+#define CR199 CTL_REG(0x031C)
+#define CR200 CTL_REG(0x0320)
+#define CR201 CTL_REG(0x0324)
+#define CR202 CTL_REG(0x0328)
+#define CR203 CTL_REG(0x032C)   /* I2C bus template value & flash control */
+#define CR204 CTL_REG(0x0330)
+#define CR205 CTL_REG(0x0334)
+#define CR206 CTL_REG(0x0338)
+#define CR207 CTL_REG(0x033C)
+#define CR208 CTL_REG(0x0340)
+#define CR209 CTL_REG(0x0344)
+#define CR210 CTL_REG(0x0348)
+#define CR211 CTL_REG(0x034C)
+#define CR212 CTL_REG(0x0350)
+#define CR213 CTL_REG(0x0354)
+#define CR214 CTL_REG(0x0358)
+#define CR215 CTL_REG(0x035C)
+#define CR216 CTL_REG(0x0360)
+#define CR217 CTL_REG(0x0364)
+#define CR218 CTL_REG(0x0368)
+#define CR219 CTL_REG(0x036C)
+#define CR220 CTL_REG(0x0370)
+#define CR221 CTL_REG(0x0374)
+#define CR222 CTL_REG(0x0378)
+#define CR223 CTL_REG(0x037C)
+#define CR224 CTL_REG(0x0380)
+#define CR225 CTL_REG(0x0384)
+#define CR226 CTL_REG(0x0388)
+#define CR227 CTL_REG(0x038C)
+#define CR228 CTL_REG(0x0390)
+#define CR229 CTL_REG(0x0394)
+#define CR230 CTL_REG(0x0398)
+#define CR231 CTL_REG(0x039C)
+#define CR232 CTL_REG(0x03A0)
+#define CR233 CTL_REG(0x03A4)
+#define CR234 CTL_REG(0x03A8)
+#define CR235 CTL_REG(0x03AC)
+#define CR236 CTL_REG(0x03B0)
+#define CR240 CTL_REG(0x03C0)
+/*      bit 7:  host-controlled RF register writes
+ * CR241-CR245: for hardware controlled writing of RF bits, not needed for
+ *              USB
+ */
+#define CR241 CTL_REG(0x03C4)
+#define CR242 CTL_REG(0x03C8)
+#define CR243 CTL_REG(0x03CC)
+#define CR244 CTL_REG(0x03D0)
+#define CR245 CTL_REG(0x03D4)
+#define CR251 CTL_REG(0x03EC)   /* only used for activation and deactivation of
+                                 * Airoha RFs AL2230 and AL7230B
+                                 */
+#define CR252 CTL_REG(0x03F0)
+#define CR253 CTL_REG(0x03F4)
+#define CR254 CTL_REG(0x03F8)
+#define CR255 CTL_REG(0x03FC)
+#define CR_MAX_PHY_REG 255
+/* Taken from the ZYDAS driver, not all of them are relevant for the ZSD1211
+ * driver.
+ */
+#define CR_RF_IF_CLK                    CTL_REG(0x0400)
+#define CR_RF_IF_DATA                   CTL_REG(0x0404)
+#define CR_PE1_PE2                      CTL_REG(0x0408)
+#define CR_PE2_DLY                      CTL_REG(0x040C)
+#define CR_LE1                          CTL_REG(0x0410)
+#define CR_LE2                          CTL_REG(0x0414)
+/* Seems to enable/disable GPI (General Purpose IO?) */
+#define CR_GPI_EN                       CTL_REG(0x0418)
+#define CR_RADIO_PD                     CTL_REG(0x042C)
+#define CR_RF2948_PD                    CTL_REG(0x042C)
+#define CR_ENABLE_PS_MANUAL_AGC         CTL_REG(0x043C)
+#define CR_CONFIG_PHILIPS               CTL_REG(0x0440)
+#define CR_SA2400_SER_AP                CTL_REG(0x0444)
+#define CR_I2C_WRITE                    CTL_REG(0x0444)
+#define CR_SA2400_SER_RP                CTL_REG(0x0448)
+#define CR_RADIO_PE                     CTL_REG(0x0458)
+#define CR_RST_BUS_MASTER               CTL_REG(0x045C)
+#define CR_RFCFG                        CTL_REG(0x0464)
+#define CR_HSTSCHG                      CTL_REG(0x046C)
+#define CR_PHY_ON                       CTL_REG(0x0474)
+#define CR_RX_DELAY                     CTL_REG(0x0478)
+#define CR_RX_PE_DELAY                  CTL_REG(0x047C)
+#define CR_GPIO_1                       CTL_REG(0x0490)
+#define CR_GPIO_2                       CTL_REG(0x0494)
+#define CR_EncryBufMux                  CTL_REG(0x04A8)
+#define CR_PS_CTRL                      CTL_REG(0x0500)
+#define CR_ADDA_PWR_DWN                 CTL_REG(0x0504)
+#define CR_ADDA_MBIAS_WARMTIME          CTL_REG(0x0508)
+#define CR_MAC_PS_STATE                 CTL_REG(0x050C)
+#define CR_INTERRUPT                    CTL_REG(0x0510)
+#define INT_TX_COMPLETE                 0x00000001
+#define INT_RX_COMPLETE                 0x00000002
+#define INT_RETRY_FAIL                  0x00000004
+#define INT_WAKEUP                      0x00000008
+#define INT_DTIM_NOTIFY                 0x00000020
+#define INT_CFG_NEXT_BCN                0x00000040
+#define INT_BUS_ABORT                   0x00000080
+#define INT_TX_FIFO_READY               0x00000100
+#define INT_UART                        0x00000200
+#define INT_TX_COMPLETE_EN              0x00010000
+#define INT_RX_COMPLETE_EN              0x00020000
+#define INT_RETRY_FAIL_EN               0x00040000
+#define INT_WAKEUP_EN                   0x00080000
+#define INT_DTIM_NOTIFY_EN              0x00200000
+#define INT_CFG_NEXT_BCN_EN             0x00400000
+#define INT_BUS_ABORT_EN                0x00800000
+#define INT_TX_FIFO_READY_EN            0x01000000
+#define INT_UART_EN                     0x02000000
+#define CR_TSF_LOW_PART                 CTL_REG(0x0514)
+#define CR_TSF_HIGH_PART                CTL_REG(0x0518)
+/* Following three values are in time units (1024us)
+ * Following condition must be met:
+ * atim < tbtt < bcn
+ */
+#define CR_ATIM_WND_PERIOD              CTL_REG(0x051C)
+#define CR_BCN_INTERVAL                 CTL_REG(0x0520)
+#define CR_PRE_TBTT                     CTL_REG(0x0524)
+/* in units of TU(1024us) */
+/* for UART support */
+#define CR_UART_RBR_THR_DLL             CTL_REG(0x0540)
+#define CR_UART_DLM_IER                 CTL_REG(0x0544)
+#define CR_UART_IIR_FCR                 CTL_REG(0x0548)
+#define CR_UART_LCR                     CTL_REG(0x054c)
+#define CR_UART_MCR                     CTL_REG(0x0550)
+#define CR_UART_LSR                     CTL_REG(0x0554)
+#define CR_UART_MSR                     CTL_REG(0x0558)
+#define CR_UART_ECR                     CTL_REG(0x055c)
+#define CR_UART_STATUS                  CTL_REG(0x0560)
+#define CR_PCI_TX_ADDR_P1               CTL_REG(0x0600)
+#define CR_PCI_TX_AddR_P2               CTL_REG(0x0604)
+#define CR_PCI_RX_AddR_P1               CTL_REG(0x0608)
+#define CR_PCI_RX_AddR_P2               CTL_REG(0x060C)
+/* must be overwritten if custom MAC address will be used */
+#define CR_MAC_ADDR_P1                  CTL_REG(0x0610)
+#define CR_MAC_ADDR_P2                  CTL_REG(0x0614)
+#define CR_BSSID_P1                     CTL_REG(0x0618)
+#define CR_BSSID_P2                     CTL_REG(0x061C)
+#define CR_BCN_PLCP_CFG                 CTL_REG(0x0620)
+#define CR_GROUP_HASH_P1                CTL_REG(0x0624)
+#define CR_GROUP_HASH_P2                CTL_REG(0x0628)
+#define CR_RX_TIMEOUT                   CTL_REG(0x062C)
+/* Basic rates supported by the BSS. When producing ACK or CTS messages, the
+ * device will use a rate in this table that is less than or equal to the rate
+ * of the incoming frame which prompted the response */
+#define CR_BASIC_RATE_TBL               CTL_REG(0x0630)
+#define CR_RATE_1M      0x0001  /* 802.11b */
+#define CR_RATE_2M      0x0002  /* 802.11b */
+#define CR_RATE_5_5M    0x0004  /* 802.11b */
+#define CR_RATE_11M     0x0008  /* 802.11b */
+#define CR_RATE_6M      0x0100  /* 802.11g */
+#define CR_RATE_9M      0x0200  /* 802.11g */
+#define CR_RATE_12M     0x0400  /* 802.11g */
+#define CR_RATE_18M     0x0800  /* 802.11g */
+#define CR_RATE_24M     0x1000  /* 802.11g */
+#define CR_RATE_36M     0x2000  /* 802.11g */
+#define CR_RATE_48M     0x4000  /* 802.11g */
+#define CR_RATE_54M     0x8000  /* 802.11g */
+#define CR_RATES_80211G 0xff00
+#define CR_RATES_80211B 0x000f
+/* Mandatory rates required in the BSS. When producing ACK or CTS messages, if
+ * the device could not find an appropriate rate in CR_BASIC_RATE_TBL, it will
+ * look for a rate in this table that is less than or equal to the rate of
+ * the incoming frame. */
+#define CR_MANDATORY_RATE_TBL           CTL_REG(0x0634)
+#define CR_RTS_CTS_RATE                 CTL_REG(0x0638)
+#define CR_WEP_PROTECT                  CTL_REG(0x063C)
+#define CR_RX_THRESHOLD                 CTL_REG(0x0640)
+/* register for controlling the LEDS */
+#define CR_LED                          CTL_REG(0x0644)
+/* masks for controlling LEDs */
+#define LED1                            0x0100
+#define LED2                            0x0200
+/* Seems to indicate that the configuration is over.
+ */
+#define CR_AFTER_PNP                    CTL_REG(0x0648)
+#define CR_ACK_TIME_80211               CTL_REG(0x0658)
+#define CR_RX_OFFSET                    CTL_REG(0x065c)
+#define CR_PHY_DELAY                    CTL_REG(0x066C)
+#define CR_BCN_FIFO                     CTL_REG(0x0670)
+#define CR_SNIFFER_ON                   CTL_REG(0x0674)
+#define CR_ENCRYPTION_TYPE              CTL_REG(0x0678)
+#define NO_WEP                          0
+#define WEP64                           1
+#define WEP128                          5
+#define WEP256                          6
+#define ENC_SNIFFER                     8
+#define CR_ZD1211_RETRY_MAX             CTL_REG(0x067C)
+#define CR_REG1                         CTL_REG(0x0680)
+/* Setting the bit UNLOCK_PHY_REGS disallows the write access to physical
+ * registers, so one could argue it is a LOCK bit. But calling it
+ * LOCK_PHY_REGS makes it confusing.
+ */
+#define UNLOCK_PHY_REGS                 0x0080
+#define CR_DEVICE_STATE                 CTL_REG(0x0684)
+#define CR_UNDERRUN_CNT                 CTL_REG(0x0688)
+#define CR_RX_FILTER                    CTL_REG(0x068c)
+#define RX_FILTER_ASSOC_RESPONSE        0x0002
+#define RX_FILTER_PROBE_RESPONSE        0x0020
+#define RX_FILTER_BEACON                0x0100
+#define RX_FILTER_AUTH                  0x0800
+/* Sniff modus sets filter to 0xfffff */
+#define CR_ACK_TIMEOUT_EXT              CTL_REG(0x0690)
+#define CR_BCN_FIFO_SEMAPHORE           CTL_REG(0x0694)
+#define CR_IFS_VALUE                    CTL_REG(0x0698)
+#define CR_RX_TIME_OUT                  CTL_REG(0x069C)
+#define CR_TOTAL_RX_FRM                 CTL_REG(0x06A0)
+#define CR_CRC32_CNT                    CTL_REG(0x06A4)
+#define CR_CRC16_CNT                    CTL_REG(0x06A8)
+#define CR_DECRYPTION_ERR_UNI           CTL_REG(0x06AC)
+#define CR_RX_FIFO_OVERRUN              CTL_REG(0x06B0)
+#define CR_DECRYPTION_ERR_MUL           CTL_REG(0x06BC)
+#define CR_NAV_CNT                      CTL_REG(0x06C4)
+#define CR_NAV_CCA                      CTL_REG(0x06C8)
+#define CR_RETRY_CNT                    CTL_REG(0x06CC)
+#define CR_READ_TCB_ADDR                CTL_REG(0x06E8)
+#define CR_READ_RFD_ADDR                CTL_REG(0x06EC)
+#define CR_CWMIN_CWMAX                  CTL_REG(0x06F0)
+#define CR_TOTAL_TX_FRM                 CTL_REG(0x06F4)
+/* CAM: Continuous Access Mode (power management) */
+#define CR_CAM_MODE                     CTL_REG(0x0700)
+#define CR_CAM_ROLL_TB_LOW              CTL_REG(0x0704)
+#define CR_CAM_ROLL_TB_HIGH             CTL_REG(0x0708)
+#define CR_CAM_ADDRESS                  CTL_REG(0x070C)
+#define CR_CAM_DATA                     CTL_REG(0x0710)
+#define CR_ROMDIR                       CTL_REG(0x0714)
+#define CR_DECRY_ERR_FLG_LOW            CTL_REG(0x0714)
+#define CR_DECRY_ERR_FLG_HIGH           CTL_REG(0x0718)
+#define CR_WEPKEY0                      CTL_REG(0x0720)
+#define CR_WEPKEY1                      CTL_REG(0x0724)
+#define CR_WEPKEY2                      CTL_REG(0x0728)
+#define CR_WEPKEY3                      CTL_REG(0x072C)
+#define CR_WEPKEY4                      CTL_REG(0x0730)
+#define CR_WEPKEY5                      CTL_REG(0x0734)
+#define CR_WEPKEY6                      CTL_REG(0x0738)
+#define CR_WEPKEY7                      CTL_REG(0x073C)
+#define CR_WEPKEY8                      CTL_REG(0x0740)
+#define CR_WEPKEY9                      CTL_REG(0x0744)
+#define CR_WEPKEY10                     CTL_REG(0x0748)
+#define CR_WEPKEY11                     CTL_REG(0x074C)
+#define CR_WEPKEY12                     CTL_REG(0x0750)
+#define CR_WEPKEY13                     CTL_REG(0x0754)
+#define CR_WEPKEY14                     CTL_REG(0x0758)
+#define CR_WEPKEY15                     CTL_REG(0x075c)
+#define CR_TKIP_MODE                    CTL_REG(0x0760)
+#define CR_EEPROM_PROTECT0              CTL_REG(0x0758)
+#define CR_EEPROM_PROTECT1              CTL_REG(0x075C)
+#define CR_DBG_FIFO_RD                  CTL_REG(0x0800)
+#define CR_DBG_SELECT                   CTL_REG(0x0804)
+#define CR_FIFO_Length                  CTL_REG(0x0808)
+#define CR_RSSI_MGC                     CTL_REG(0x0810)
+#define CR_PON                          CTL_REG(0x0818)
+#define CR_RX_ON                        CTL_REG(0x081C)
+#define CR_TX_ON                        CTL_REG(0x0820)
+#define CR_CHIP_EN                      CTL_REG(0x0824)
+#define CR_LO_SW                        CTL_REG(0x0828)
+#define CR_TXRX_SW                      CTL_REG(0x082C)
+#define CR_S_MD                         CTL_REG(0x0830)
+#define CR_USB_DEBUG_PORT               CTL_REG(0x0888)
+#define CR_ZD1211B_TX_PWR_CTL1          CTL_REG(0x0b00)
+#define CR_ZD1211B_TX_PWR_CTL2          CTL_REG(0x0b04)
+#define CR_ZD1211B_TX_PWR_CTL3          CTL_REG(0x0b08)
+#define CR_ZD1211B_TX_PWR_CTL4          CTL_REG(0x0b0c)
+#define CR_ZD1211B_AIFS_CTL1            CTL_REG(0x0b10)
+#define CR_ZD1211B_AIFS_CTL2            CTL_REG(0x0b14)
+#define CR_ZD1211B_TXOP                 CTL_REG(0x0b20)
+#define CR_ZD1211B_RETRY_MAX            CTL_REG(0x0b28)
+#define AP_RX_FILTER                    0x0400feff
+#define STA_RX_FILTER                   0x0000ffff
+#define CWIN_SIZE                       0x007f043f
+#define HWINT_ENABLED                   0x004f0000
+#define HWINT_DISABLED                  0
+#define E2P_PWR_INT_GUARD               8
+#define E2P_CHANNEL_COUNT               14
+/* If you compare this addresses with the ZYDAS orignal driver, please notify
+ * that we use word mapping for the EEPROM.
+ */
+/*
+ * Upper 16 bit contains the regulatory domain.
+ */
+#define E2P_SUBID               E2P_REG(0x00)
+#define E2P_POD                 E2P_REG(0x02)
+#define E2P_MAC_ADDR_P1         E2P_REG(0x04)
+#define E2P_MAC_ADDR_P2         E2P_REG(0x06)
+#define E2P_PWR_CAL_VALUE1      E2P_REG(0x08)
+#define E2P_PWR_CAL_VALUE2      E2P_REG(0x0a)
+#define E2P_PWR_CAL_VALUE3      E2P_REG(0x0c)
+#define E2P_PWR_CAL_VALUE4      E2P_REG(0x0e)
+#define E2P_PWR_INT_VALUE1      E2P_REG(0x10)
+#define E2P_PWR_INT_VALUE2      E2P_REG(0x12)
+#define E2P_PWR_INT_VALUE3      E2P_REG(0x14)
+#define E2P_PWR_INT_VALUE4      E2P_REG(0x16)
+/* Contains a bit for each allowed channel. It gives for Europe (ETSI 0x30)
+ * also only 11 channels. */
+#define E2P_ALLOWED_CHANNEL     E2P_REG(0x18)
+#define E2P_PHY_REG             E2P_REG(0x1a)
+#define E2P_DEVICE_VER          E2P_REG(0x20)
+#define E2P_36M_CAL_VALUE1      E2P_REG(0x28)
+#define E2P_36M_CAL_VALUE2      E2P_REG(0x2a)
+#define E2P_36M_CAL_VALUE3      E2P_REG(0x2c)
+#define E2P_36M_CAL_VALUE4      E2P_REG(0x2e)
+#define E2P_11A_INT_VALUE1      E2P_REG(0x30)
+#define E2P_11A_INT_VALUE2      E2P_REG(0x32)
+#define E2P_11A_INT_VALUE3      E2P_REG(0x34)
+#define E2P_11A_INT_VALUE4      E2P_REG(0x36)
+#define E2P_48M_CAL_VALUE1      E2P_REG(0x38)
+#define E2P_48M_CAL_VALUE2      E2P_REG(0x3a)
+#define E2P_48M_CAL_VALUE3      E2P_REG(0x3c)
+#define E2P_48M_CAL_VALUE4      E2P_REG(0x3e)
+#define E2P_48M_INT_VALUE1      E2P_REG(0x40)
+#define E2P_48M_INT_VALUE2      E2P_REG(0x42)
+#define E2P_48M_INT_VALUE3      E2P_REG(0x44)
+#define E2P_48M_INT_VALUE4      E2P_REG(0x46)
+#define E2P_54M_CAL_VALUE1      E2P_REG(0x48)   /* ??? */
+#define E2P_54M_CAL_VALUE2      E2P_REG(0x4a)
+#define E2P_54M_CAL_VALUE3      E2P_REG(0x4c)
+#define E2P_54M_CAL_VALUE4      E2P_REG(0x4e)
+#define E2P_54M_INT_VALUE1      E2P_REG(0x50)
+#define E2P_54M_INT_VALUE2      E2P_REG(0x52)
+#define E2P_54M_INT_VALUE3      E2P_REG(0x54)
+#define E2P_54M_INT_VALUE4      E2P_REG(0x56)
+/* All 16 bit values */
+#define FW_FIRMWARE_VER         FW_REG(0)
+/* non-zero if USB high speed connection */
+#define FW_USB_SPEED            FW_REG(1)
+#define FW_FIX_TX_RATE          FW_REG(2)
+/* Seems to be able to control LEDs over the firmware */
+#define FW_LINK_STATUS          FW_REG(3)
+#define FW_SOFT_RESET           FW_REG(4)
+#define FW_FLASH_CHK            FW_REG(5)
+enum {
+        CR_BASE_OFFSET                  = 0x9000,
+        FW_START_OFFSET                 = 0xee00,
+        FW_BASE_ADDR_OFFSET             = FW_START_OFFSET + 0x1d,
+        EEPROM_START_OFFSET             = 0xf800,
+        EEPROM_SIZE                     = 0x800, /* words */
+        LOAD_CODE_SIZE                  = 0xe, /* words */
+        LOAD_VECT_SIZE                  = 0x10000 - 0xfff7, /* words */
+        EEPROM_REGS_OFFSET              = LOAD_CODE_SIZE + LOAD_VECT_SIZE,
+        E2P_BASE_OFFSET                 = EEPROM_START_OFFSET +
+                                          EEPROM_REGS_OFFSET,
+};
+#define FW_REG_TABLE_ADDR       USB_ADDR(FW_START_OFFSET + 0x1d)
+enum {
+        /* indices for ofdm_cal_values */
+        OFDM_36M_INDEX = 0,
+        OFDM_48M_INDEX = 1,
+        OFDM_54M_INDEX = 2,
+};
+struct zd_chip {
+        struct zd_usb usb;
+        struct zd_rf rf;
+        struct mutex mutex;
+        u8 e2p_mac[ETH_ALEN];
+        /* EepSetPoint in the vendor driver */
+        u8 pwr_cal_values[E2P_CHANNEL_COUNT];
+        /* integration values in the vendor driver */
+        u8 pwr_int_values[E2P_CHANNEL_COUNT];
+        /* SetPointOFDM in the vendor driver */
+        u8 ofdm_cal_values[3][E2P_CHANNEL_COUNT];
+        u8 pa_type:4, patch_cck_gain:1, patch_cr157:1, patch_6m_band_edge:1,
+           is_zd1211b:1;
+};
+static inline struct zd_chip *zd_usb_to_chip(struct zd_usb *usb)
+{
+        return container_of(usb, struct zd_chip, usb);
+}
+static inline struct zd_chip *zd_rf_to_chip(struct zd_rf *rf)
+{
+        return container_of(rf, struct zd_chip, rf);
+}
+#define zd_chip_dev(chip) (&(chip)->usb.intf->dev)
+void zd_chip_init(struct zd_chip *chip,
+                 struct net_device *netdev,
+                 struct usb_interface *intf);
+void zd_chip_clear(struct zd_chip *chip);
+int zd_chip_init_hw(struct zd_chip *chip, u8 device_type);
+int zd_chip_reset(struct zd_chip *chip);
+static inline int zd_ioread16v_locked(struct zd_chip *chip, u16 *values,
+                                      const zd_addr_t *addresses,
+                                      unsigned int count)
+{
+        ZD_ASSERT(mutex_is_locked(&chip->mutex));
+        return zd_usb_ioread16v(&chip->usb, values, addresses, count);
+}
+static inline int zd_ioread16_locked(struct zd_chip *chip, u16 *value,
+                                     const zd_addr_t addr)
+{
+        ZD_ASSERT(mutex_is_locked(&chip->mutex));
+        return zd_usb_ioread16(&chip->usb, value, addr);
+}
+int zd_ioread32v_locked(struct zd_chip *chip, u32 *values,
+                        const zd_addr_t *addresses, unsigned int count);
+static inline int zd_ioread32_locked(struct zd_chip *chip, u32 *value,
+                                     const zd_addr_t addr)
+{
+        return zd_ioread32v_locked(chip, value, (const zd_addr_t *)&addr, 1);
+}
+static inline int zd_iowrite16_locked(struct zd_chip *chip, u16 value,
+                                      zd_addr_t addr)
+{
+        struct zd_ioreq16 ioreq;
+        ZD_ASSERT(mutex_is_locked(&chip->mutex));
+        ioreq.addr = addr;
+        ioreq.value = value;
+        return zd_usb_iowrite16v(&chip->usb, &ioreq, 1);
+}
+int zd_iowrite16a_locked(struct zd_chip *chip,
+                         const struct zd_ioreq16 *ioreqs, unsigned int count);
+int _zd_iowrite32v_locked(struct zd_chip *chip, const struct zd_ioreq32 *ioreqs,
+                          unsigned int count);
+static inline int zd_iowrite32_locked(struct zd_chip *chip, u32 value,
+                                      zd_addr_t addr)
+{
+        struct zd_ioreq32 ioreq;
+        ioreq.addr = addr;
+        ioreq.value = value;
+        return _zd_iowrite32v_locked(chip, &ioreq, 1);
+}
+int zd_iowrite32a_locked(struct zd_chip *chip,
+                         const struct zd_ioreq32 *ioreqs, unsigned int count);
+static inline int zd_rfwrite_locked(struct zd_chip *chip, u32 value, u8 bits)
+{
+        ZD_ASSERT(mutex_is_locked(&chip->mutex));
+        return zd_usb_rfwrite(&chip->usb, value, bits);
+}
+int zd_rfwritev_locked(struct zd_chip *chip,
+                       const u32* values, unsigned int count, u8 bits);
+/* Locking functions for reading and writing registers.
+ * The different parameters are intentional.
+ */
+int zd_ioread16(struct zd_chip *chip, zd_addr_t addr, u16 *value);
+int zd_iowrite16(struct zd_chip *chip, zd_addr_t addr, u16 value);
+int zd_ioread32(struct zd_chip *chip, zd_addr_t addr, u32 *value);
+int zd_iowrite32(struct zd_chip *chip, zd_addr_t addr, u32 value);
+int zd_ioread32v(struct zd_chip *chip, const zd_addr_t *addresses,
+                  u32 *values, unsigned int count);
+int zd_iowrite32a(struct zd_chip *chip, const struct zd_ioreq32 *ioreqs,
+                   unsigned int count);
+int zd_chip_set_channel(struct zd_chip *chip, u8 channel);
+static inline u8 _zd_chip_get_channel(struct zd_chip *chip)
+{
+        return chip->rf.channel;
+}
+u8  zd_chip_get_channel(struct zd_chip *chip);
+int zd_read_regdomain(struct zd_chip *chip, u8 *regdomain);
+void zd_get_e2p_mac_addr(struct zd_chip *chip, u8 *mac_addr);
+int zd_read_mac_addr(struct zd_chip *chip, u8 *mac_addr);
+int zd_write_mac_addr(struct zd_chip *chip, const u8 *mac_addr);
+int zd_chip_switch_radio_on(struct zd_chip *chip);
+int zd_chip_switch_radio_off(struct zd_chip *chip);
+int zd_chip_enable_int(struct zd_chip *chip);
+void zd_chip_disable_int(struct zd_chip *chip);
+int zd_chip_enable_rx(struct zd_chip *chip);
+void zd_chip_disable_rx(struct zd_chip *chip);
+int zd_chip_enable_hwint(struct zd_chip *chip);
+int zd_chip_disable_hwint(struct zd_chip *chip);
+static inline int zd_get_encryption_type(struct zd_chip *chip, u32 *type)
+{
+        return zd_ioread32(chip, CR_ENCRYPTION_TYPE, type);
+}
+static inline int zd_set_encryption_type(struct zd_chip *chip, u32 type)
+{
+        return zd_iowrite32(chip, CR_ENCRYPTION_TYPE, type);
+}
+static inline int zd_chip_get_basic_rates(struct zd_chip *chip, u16 *cr_rates)
+{
+        return zd_ioread16(chip, CR_BASIC_RATE_TBL, cr_rates);
+}
+int zd_chip_set_basic_rates(struct zd_chip *chip, u16 cr_rates);
+static inline int zd_chip_set_rx_filter(struct zd_chip *chip, u32 filter)
+{
+        return zd_iowrite32(chip, CR_RX_FILTER, filter);
+}
+int zd_chip_lock_phy_regs(struct zd_chip *chip);
+int zd_chip_unlock_phy_regs(struct zd_chip *chip);
+enum led_status {
+        LED_OFF    = 0,
+        LED_ON     = 1,
+        LED_FLIP   = 2,
+        LED_STATUS = 3,
+};
+int zd_chip_led_status(struct zd_chip *chip, int led, enum led_status status);
+int zd_chip_led_flip(struct zd_chip *chip, int led,
+                     const unsigned int *phases_msecs, unsigned int count);
+int zd_set_beacon_interval(struct zd_chip *chip, u32 interval);
+static inline int zd_get_beacon_interval(struct zd_chip *chip, u32 *interval)
+{
+        return zd_ioread32(chip, CR_BCN_INTERVAL, interval);
+}
+struct rx_status;
+u8 zd_rx_qual_percent(const void *rx_frame, unsigned int size,
+                       const struct rx_status *status);
+u8 zd_rx_strength_percent(u8 rssi);
+u16 zd_rx_rate(const void *rx_frame, const struct rx_status *status);
+#endif /* _ZD_CHIP_H */
diff --git a/drivers/net/wireless/zd1211rw/zd_def.h b/drivers/net/wireless/zd1211rw/zd_def.h
new file mode 100644
index 000000000000..465906812fc4
--- /dev/null
+++ b/drivers/net/wireless/zd1211rw/zd_def.h
@@ -0,0 +1,48 @@
+/* zd_def.h
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#ifndef _ZD_DEF_H
+#define _ZD_DEF_H
+#include <linux/kernel.h>
+#include <linux/stringify.h>
+#include <linux/device.h>
+#include <linux/kernel.h>
+#define dev_printk_f(level, dev, fmt, args...) \
+        dev_printk(level, dev, "%s() " fmt, __func__, ##args)
+#ifdef DEBUG
+#  define dev_dbg_f(dev, fmt, args...) \
+          dev_printk_f(KERN_DEBUG, dev, fmt, ## args)
+#else
+#  define dev_dbg_f(dev, fmt, args...) do { (void)(dev); } while (0)
+#endif /* DEBUG */
+#ifdef DEBUG
+#  define ZD_ASSERT(x) \
+do { \
+        if (!(x)) { \
+                pr_debug("%s:%d ASSERT %s VIOLATED!\n", \
+                        __FILE__, __LINE__, __stringify(x)); \
+        } \
+} while (0)
+#else
+#  define ZD_ASSERT(x) do { } while (0)
+#endif
+#endif /* _ZD_DEF_H */
diff --git a/drivers/net/wireless/zd1211rw/zd_ieee80211.c b/drivers/net/wireless/zd1211rw/zd_ieee80211.c
new file mode 100644
index 000000000000..66905f7b61ff
--- /dev/null
+++ b/drivers/net/wireless/zd1211rw/zd_ieee80211.c
@@ -0,0 +1,191 @@
+/* zd_ieee80211.c
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+/*
+ * A lot of this code is generic and should be moved into the upper layers
+ * at some point.
+ */
+#include <linux/errno.h>
+#include <linux/wireless.h>
+#include <linux/kernel.h>
+#include <net/ieee80211.h>
+#include "zd_def.h"
+#include "zd_ieee80211.h"
+#include "zd_mac.h"
+static const struct channel_range channel_ranges[] = {
+        [0]                      = { 0,  0},
+        [ZD_REGDOMAIN_FCC]       = { 1, 12},
+        [ZD_REGDOMAIN_IC]        = { 1, 12},
+        [ZD_REGDOMAIN_ETSI]      = { 1, 14},
+        [ZD_REGDOMAIN_JAPAN]     = { 1, 14},
+        [ZD_REGDOMAIN_SPAIN]     = { 1, 14},
+        [ZD_REGDOMAIN_FRANCE]    = { 1, 14},
+        [ZD_REGDOMAIN_JAPAN_ADD] = {14, 15},
+};
+const struct channel_range *zd_channel_range(u8 regdomain)
+{
+        if (regdomain >= ARRAY_SIZE(channel_ranges))
+                regdomain = 0;
+        return &channel_ranges[regdomain];
+}
+int zd_regdomain_supports_channel(u8 regdomain, u8 channel)
+{
+        const struct channel_range *range = zd_channel_range(regdomain);
+        return range->start <= channel && channel < range->end;
+}
+int zd_regdomain_supported(u8 regdomain)
+{
+        const struct channel_range *range = zd_channel_range(regdomain);
+        return range->start != 0;
+}
+/* Stores channel frequencies in MHz. */
+static const u16 channel_frequencies[] = {
+        2412, 2417, 2422, 2427, 2432, 2437, 2442, 2447,
+        2452, 2457, 2462, 2467, 2472, 2484,
+};
+#define NUM_CHANNELS ARRAY_SIZE(channel_frequencies)
+static int compute_freq(struct iw_freq *freq, u32 mhz, u32 hz)
+{
+        u32 factor;
+        freq->e = 0;
+        if (mhz >= 1000000000U) {
+                pr_debug("zd1211 mhz %u to large\n", mhz);
+                freq->m = 0;
+                return -EINVAL;
+        }
+        factor = 1000;
+        while (mhz >= factor) {
+                freq->e += 1;
+                factor *= 10;
+        }
+        factor /= 1000U;
+        freq->m = mhz * (1000000U/factor) + hz/factor;
+        return 0;
+}
+int zd_channel_to_freq(struct iw_freq *freq, u8 channel)
+{
+        if (channel > NUM_CHANNELS) {
+                freq->m = 0;
+                freq->e = 0;
+                return -EINVAL;
+        }
+        if (!channel) {
+                freq->m = 0;
+                freq->e = 0;
+                return -EINVAL;
+        }
+        return compute_freq(freq, channel_frequencies[channel-1], 0);
+}
+static int freq_to_mhz(const struct iw_freq *freq)
+{
+        u32 factor;
+        int e;
+        /* Such high frequencies are not supported. */
+        if (freq->e > 6)
+                return -EINVAL;
+        factor = 1;
+        for (e = freq->e; e > 0; --e) {
+                factor *= 10;
+        }
+        factor = 1000000U / factor;
+        if (freq->m % factor) {
+                return -EINVAL;
+        }
+        return freq->m / factor;
+}
+int zd_find_channel(u8 *channel, const struct iw_freq *freq)
+{
+        int i, r;
+        u32 mhz;
+        if (!(freq->flags & IW_FREQ_FIXED))
+                return 0;
+        if (freq->m < 1000) {
+                if (freq->m  > NUM_CHANNELS || freq->m == 0)
+                        return -EINVAL;
+                *channel = freq->m;
+                return 1;
+        }
+        r = freq_to_mhz(freq);
+        if (r < 0)
+                return r;
+        mhz = r;
+        for (i = 0; i < NUM_CHANNELS; i++) {
+                if (mhz == channel_frequencies[i]) {
+                        *channel = i+1;
+                        return 1;
+                }
+        }
+        return -EINVAL;
+}
+int zd_geo_init(struct ieee80211_device *ieee, u8 regdomain)
+{
+        struct ieee80211_geo geo;
+        const struct channel_range *range;
+        int i;
+        u8 channel;
+        dev_dbg(zd_mac_dev(zd_netdev_mac(ieee->dev)),
+                "regdomain %#04x\n", regdomain);
+        range = zd_channel_range(regdomain);
+        if (range->start == 0) {
+                dev_err(zd_mac_dev(zd_netdev_mac(ieee->dev)),
+                        "zd1211 regdomain %#04x not supported\n",
+                        regdomain);
+                return -EINVAL;
+        }
+        memset(&geo, 0, sizeof(geo));
+        for (i = 0, channel = range->start; channel < range->end; channel++) {
+                struct ieee80211_channel *chan = &geo.bg[i++];
+                chan->freq = channel_frequencies[channel - 1];
+                chan->channel = channel;
+        }
+        geo.bg_channels = i;
+        memcpy(geo.name, "XX ", 4);
+        ieee80211_set_geo(ieee, &geo);
+        return 0;
+}
diff --git a/drivers/net/wireless/zd1211rw/zd_ieee80211.h b/drivers/net/wireless/zd1211rw/zd_ieee80211.h
new file mode 100644
index 000000000000..36329890dfec
--- /dev/null
+++ b/drivers/net/wireless/zd1211rw/zd_ieee80211.h
@@ -0,0 +1,85 @@
+#ifndef _ZD_IEEE80211_H
+#define _ZD_IEEE80211_H
+#include <net/ieee80211.h>
+#include "zd_types.h"
+/* Additional definitions from the standards.
+ */
+#define ZD_REGDOMAIN_FCC        0x10
+#define ZD_REGDOMAIN_IC         0x20
+#define ZD_REGDOMAIN_ETSI       0x30
+#define ZD_REGDOMAIN_SPAIN      0x31
+#define ZD_REGDOMAIN_FRANCE     0x32
+#define ZD_REGDOMAIN_JAPAN_ADD  0x40
+#define ZD_REGDOMAIN_JAPAN      0x41
+enum {
+        MIN_CHANNEL24 = 1,
+        MAX_CHANNEL24 = 14,
+};
+struct channel_range {
+        u8 start;
+        u8 end; /* exclusive (channel must be less than end) */
+};
+struct iw_freq;
+int zd_geo_init(struct ieee80211_device *ieee, u8 regdomain);
+const struct channel_range *zd_channel_range(u8 regdomain);
+int zd_regdomain_supports_channel(u8 regdomain, u8 channel);
+int zd_regdomain_supported(u8 regdomain);
+/* for 2.4 GHz band */
+int zd_channel_to_freq(struct iw_freq *freq, u8 channel);
+int zd_find_channel(u8 *channel, const struct iw_freq *freq);
+#define ZD_PLCP_SERVICE_LENGTH_EXTENSION 0x80
+struct ofdm_plcp_header {
+        u8 prefix[3];
+        __le16 service;
+} __attribute__((packed));
+static inline u8 zd_ofdm_plcp_header_rate(
+        const struct ofdm_plcp_header *header)
+{
+        return header->prefix[0] & 0xf;
+}
+#define ZD_OFDM_RATE_6M         0xb
+#define ZD_OFDM_RATE_9M         0xf
+#define ZD_OFDM_RATE_12M        0xa
+#define ZD_OFDM_RATE_18M        0xe
+#define ZD_OFDM_RATE_24M        0x9
+#define ZD_OFDM_RATE_36M        0xd
+#define ZD_OFDM_RATE_48M        0x8
+#define ZD_OFDM_RATE_54M        0xc
+struct cck_plcp_header {
+        u8 signal;
+        u8 service;
+        __le16 length;
+        __le16 crc16;
+} __attribute__((packed));
+static inline u8 zd_cck_plcp_header_rate(const struct cck_plcp_header *header)
+{
+        return header->signal;
+}
+#define ZD_CCK_SIGNAL_1M        0x0a
+#define ZD_CCK_SIGNAL_2M        0x14
+#define ZD_CCK_SIGNAL_5M5       0x37
+#define ZD_CCK_SIGNAL_11M       0x6e
+enum ieee80211_std {
+        IEEE80211B = 0x01,
+        IEEE80211A = 0x02,
+        IEEE80211G = 0x04,
+};
+#endif /* _ZD_IEEE80211_H */
diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c b/drivers/net/wireless/zd1211rw/zd_mac.c
new file mode 100644
index 000000000000..3bdc54d128d0
--- /dev/null
+++ b/drivers/net/wireless/zd1211rw/zd_mac.c
@@ -0,0 +1,1057 @@
+/* zd_mac.c
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#include <linux/netdevice.h>
+#include <linux/etherdevice.h>
+#include <linux/wireless.h>
+#include <linux/usb.h>
+#include <linux/jiffies.h>
+#include <net/ieee80211_radiotap.h>
+#include "zd_def.h"
+#include "zd_chip.h"
+#include "zd_mac.h"
+#include "zd_ieee80211.h"
+#include "zd_netdev.h"
+#include "zd_rf.h"
+#include "zd_util.h"
+static void ieee_init(struct ieee80211_device *ieee);
+static void softmac_init(struct ieee80211softmac_device *sm);
+int zd_mac_init(struct zd_mac *mac,
+                struct net_device *netdev,
+                struct usb_interface *intf)
+{
+        struct ieee80211_device *ieee = zd_netdev_ieee80211(netdev);
+        memset(mac, 0, sizeof(*mac));
+        spin_lock_init(&mac->lock);
+        mac->netdev = netdev;
+        ieee_init(ieee);
+        softmac_init(ieee80211_priv(netdev));
+        zd_chip_init(&mac->chip, netdev, intf);
+        return 0;
+}
+static int reset_channel(struct zd_mac *mac)
+{
+        int r;
+        unsigned long flags;
+        const struct channel_range *range;
+        spin_lock_irqsave(&mac->lock, flags);
+        range = zd_channel_range(mac->regdomain);
+        if (!range->start) {
+                r = -EINVAL;
+                goto out;
+        }
+        mac->requested_channel = range->start;
+        r = 0;
+out:
+        spin_unlock_irqrestore(&mac->lock, flags);
+        return r;
+}
+int zd_mac_init_hw(struct zd_mac *mac, u8 device_type)
+{
+        int r;
+        struct zd_chip *chip = &mac->chip;
+        u8 addr[ETH_ALEN];
+        u8 default_regdomain;
+        r = zd_chip_enable_int(chip);
+        if (r)
+                goto out;
+        r = zd_chip_init_hw(chip, device_type);
+        if (r)
+                goto disable_int;
+        zd_get_e2p_mac_addr(chip, addr);
+        r = zd_write_mac_addr(chip, addr);
+        if (r)
+                goto disable_int;
+        ZD_ASSERT(!irqs_disabled());
+        spin_lock_irq(&mac->lock);
+        memcpy(mac->netdev->dev_addr, addr, ETH_ALEN);
+        spin_unlock_irq(&mac->lock);
+        r = zd_read_regdomain(chip, &default_regdomain);
+        if (r)
+                goto disable_int;
+        if (!zd_regdomain_supported(default_regdomain)) {
+                dev_dbg_f(zd_mac_dev(mac),
+                          "Regulatory Domain %#04x is not supported.\n",
+                          default_regdomain);
+                r = -EINVAL;
+                goto disable_int;
+        }
+        spin_lock_irq(&mac->lock);
+        mac->regdomain = mac->default_regdomain = default_regdomain;
+        spin_unlock_irq(&mac->lock);
+        r = reset_channel(mac);
+        if (r)
+                goto disable_int;
+        r = zd_set_encryption_type(chip, NO_WEP);
+        if (r)
+                goto disable_int;
+        r = zd_geo_init(zd_mac_to_ieee80211(mac), mac->regdomain);
+        if (r)
+                goto disable_int;
+        r = 0;
+disable_int:
+        zd_chip_disable_int(chip);
+out:
+        return r;
+}
+void zd_mac_clear(struct zd_mac *mac)
+{
+        /* Aquire the lock. */
+        spin_lock(&mac->lock);
+        spin_unlock(&mac->lock);
+        zd_chip_clear(&mac->chip);
+        memset(mac, 0, sizeof(*mac));
+}
+static int reset_mode(struct zd_mac *mac)
+{
+        struct ieee80211_device *ieee = zd_mac_to_ieee80211(mac);
+        struct zd_ioreq32 ioreqs[3] = {
+                { CR_RX_FILTER, RX_FILTER_BEACON|RX_FILTER_PROBE_RESPONSE|
+                                RX_FILTER_AUTH|RX_FILTER_ASSOC_RESPONSE },
+                { CR_SNIFFER_ON, 0U },
+                { CR_ENCRYPTION_TYPE, NO_WEP },
+        };
+        if (ieee->iw_mode == IW_MODE_MONITOR) {
+                ioreqs[0].value = 0xffffffff;
+                ioreqs[1].value = 0x1;
+                ioreqs[2].value = ENC_SNIFFER;
+        }
+        return zd_iowrite32a(&mac->chip, ioreqs, 3);
+}
+int zd_mac_open(struct net_device *netdev)
+{
+        struct zd_mac *mac = zd_netdev_mac(netdev);
+        struct zd_chip *chip = &mac->chip;
+        int r;
+        r = zd_chip_enable_int(chip);
+        if (r < 0)
+                goto out;
+        r = zd_chip_set_basic_rates(chip, CR_RATES_80211B | CR_RATES_80211G);
+        if (r < 0)
+                goto disable_int;
+        r = reset_mode(mac);
+        if (r)
+                goto disable_int;
+        r = zd_chip_switch_radio_on(chip);
+        if (r < 0)
+                goto disable_int;
+        r = zd_chip_set_channel(chip, mac->requested_channel);
+        if (r < 0)
+                goto disable_radio;
+        r = zd_chip_enable_rx(chip);
+        if (r < 0)
+                goto disable_radio;
+        r = zd_chip_enable_hwint(chip);
+        if (r < 0)
+                goto disable_rx;
+        ieee80211softmac_start(netdev);
+        return 0;
+disable_rx:
+        zd_chip_disable_rx(chip);
+disable_radio:
+        zd_chip_switch_radio_off(chip);
+disable_int:
+        zd_chip_disable_int(chip);
+out:
+        return r;
+}
+int zd_mac_stop(struct net_device *netdev)
+{
+        struct zd_mac *mac = zd_netdev_mac(netdev);
+        struct zd_chip *chip = &mac->chip;
+        netif_stop_queue(netdev);
+        /*
+         * The order here deliberately is a little different from the open()
+         * method, since we need to make sure there is no opportunity for RX
+         * frames to be processed by softmac after we have stopped it.
+         */
+        zd_chip_disable_rx(chip);
+        ieee80211softmac_stop(netdev);
+        zd_chip_disable_hwint(chip);
+        zd_chip_switch_radio_off(chip);
+        zd_chip_disable_int(chip);
+        return 0;
+}
+int zd_mac_set_mac_address(struct net_device *netdev, void *p)
+{
+        int r;
+        unsigned long flags;
+        struct sockaddr *addr = p;
+        struct zd_mac *mac = zd_netdev_mac(netdev);
+        struct zd_chip *chip = &mac->chip;
+        if (!is_valid_ether_addr(addr->sa_data))
+                return -EADDRNOTAVAIL;
+        dev_dbg_f(zd_mac_dev(mac),
+                  "Setting MAC to " MAC_FMT "\n", MAC_ARG(addr->sa_data));
+        r = zd_write_mac_addr(chip, addr->sa_data);
+        if (r)
+                return r;
+        spin_lock_irqsave(&mac->lock, flags);
+        memcpy(netdev->dev_addr, addr->sa_data, ETH_ALEN);
+        spin_unlock_irqrestore(&mac->lock, flags);
+        return 0;
+}
+int zd_mac_set_regdomain(struct zd_mac *mac, u8 regdomain)
+{
+        int r;
+        u8 channel;
+        ZD_ASSERT(!irqs_disabled());
+        spin_lock_irq(&mac->lock);
+        if (regdomain == 0) {
+                regdomain = mac->default_regdomain;
+        }
+        if (!zd_regdomain_supported(regdomain)) {
+                spin_unlock_irq(&mac->lock);
+                return -EINVAL;
+        }
+        mac->regdomain = regdomain;
+        channel = mac->requested_channel;
+        spin_unlock_irq(&mac->lock);
+        r = zd_geo_init(zd_mac_to_ieee80211(mac), regdomain);
+        if (r)
+                return r;
+        if (!zd_regdomain_supports_channel(regdomain, channel)) {
+                r = reset_channel(mac);
+                if (r)
+                        return r;
+        }
+        return 0;
+}
+u8 zd_mac_get_regdomain(struct zd_mac *mac)
+{
+        unsigned long flags;
+        u8 regdomain;
+        spin_lock_irqsave(&mac->lock, flags);
+        regdomain = mac->regdomain;
+        spin_unlock_irqrestore(&mac->lock, flags);
+        return regdomain;
+}
+static void set_channel(struct net_device *netdev, u8 channel)
+{
+        struct zd_mac *mac = zd_netdev_mac(netdev);
+        dev_dbg_f(zd_mac_dev(mac), "channel %d\n", channel);
+        zd_chip_set_channel(&mac->chip, channel);
+}
+/* TODO: Should not work in Managed mode. */
+int zd_mac_request_channel(struct zd_mac *mac, u8 channel)
+{
+        unsigned long lock_flags;
+        struct ieee80211_device *ieee = zd_mac_to_ieee80211(mac);
+        if (ieee->iw_mode == IW_MODE_INFRA)
+                return -EPERM;
+        spin_lock_irqsave(&mac->lock, lock_flags);
+        if (!zd_regdomain_supports_channel(mac->regdomain, channel)) {
+                spin_unlock_irqrestore(&mac->lock, lock_flags);
+                return -EINVAL;
+        }
+        mac->requested_channel = channel;
+        spin_unlock_irqrestore(&mac->lock, lock_flags);
+        if (netif_running(mac->netdev))
+                return zd_chip_set_channel(&mac->chip, channel);
+        else
+                return 0;
+}
+int zd_mac_get_channel(struct zd_mac *mac, u8 *channel, u8 *flags)
+{
+        struct ieee80211_device *ieee = zd_mac_to_ieee80211(mac);
+        *channel = zd_chip_get_channel(&mac->chip);
+        if (ieee->iw_mode != IW_MODE_INFRA) {
+                spin_lock_irq(&mac->lock);
+                *flags = *channel == mac->requested_channel ?
+                        MAC_FIXED_CHANNEL : 0;
+                spin_unlock(&mac->lock);
+        } else {
+                *flags = 0;
+        }
+        dev_dbg_f(zd_mac_dev(mac), "channel %u flags %u\n", *channel, *flags);
+        return 0;
+}
+/* If wrong rate is given, we are falling back to the slowest rate: 1MBit/s */
+static u8 cs_typed_rate(u8 cs_rate)
+{
+        static const u8 typed_rates[16] = {
+                [ZD_CS_CCK_RATE_1M]     = ZD_CS_CCK|ZD_CS_CCK_RATE_1M,
+                [ZD_CS_CCK_RATE_2M]     = ZD_CS_CCK|ZD_CS_CCK_RATE_2M,
+                [ZD_CS_CCK_RATE_5_5M]   = ZD_CS_CCK|ZD_CS_CCK_RATE_5_5M,
+                [ZD_CS_CCK_RATE_11M]    = ZD_CS_CCK|ZD_CS_CCK_RATE_11M,
+                [ZD_OFDM_RATE_6M]       = ZD_CS_OFDM|ZD_OFDM_RATE_6M,
+                [ZD_OFDM_RATE_9M]       = ZD_CS_OFDM|ZD_OFDM_RATE_9M,
+                [ZD_OFDM_RATE_12M]      = ZD_CS_OFDM|ZD_OFDM_RATE_12M,
+                [ZD_OFDM_RATE_18M]      = ZD_CS_OFDM|ZD_OFDM_RATE_18M,
+                [ZD_OFDM_RATE_24M]      = ZD_CS_OFDM|ZD_OFDM_RATE_24M,
+                [ZD_OFDM_RATE_36M]      = ZD_CS_OFDM|ZD_OFDM_RATE_36M,
+                [ZD_OFDM_RATE_48M]      = ZD_CS_OFDM|ZD_OFDM_RATE_48M,
+                [ZD_OFDM_RATE_54M]      = ZD_CS_OFDM|ZD_OFDM_RATE_54M,
+        };
+        ZD_ASSERT(ZD_CS_RATE_MASK == 0x0f);
+        return typed_rates[cs_rate & ZD_CS_RATE_MASK];
+}
+/* Fallback to lowest rate, if rate is unknown. */
+static u8 rate_to_cs_rate(u8 rate)
+{
+        switch (rate) {
+        case IEEE80211_CCK_RATE_2MB:
+                return ZD_CS_CCK_RATE_2M;
+        case IEEE80211_CCK_RATE_5MB:
+                return ZD_CS_CCK_RATE_5_5M;
+        case IEEE80211_CCK_RATE_11MB:
+                return ZD_CS_CCK_RATE_11M;
+        case IEEE80211_OFDM_RATE_6MB:
+                return ZD_OFDM_RATE_6M;
+        case IEEE80211_OFDM_RATE_9MB:
+                return ZD_OFDM_RATE_9M;
+        case IEEE80211_OFDM_RATE_12MB:
+                return ZD_OFDM_RATE_12M;
+        case IEEE80211_OFDM_RATE_18MB:
+                return ZD_OFDM_RATE_18M;
+        case IEEE80211_OFDM_RATE_24MB:
+                return ZD_OFDM_RATE_24M;
+        case IEEE80211_OFDM_RATE_36MB:
+                return ZD_OFDM_RATE_36M;
+        case IEEE80211_OFDM_RATE_48MB:
+                return ZD_OFDM_RATE_48M;
+        case IEEE80211_OFDM_RATE_54MB:
+                return ZD_OFDM_RATE_54M;
+        }
+        return ZD_CS_CCK_RATE_1M;
+}
+int zd_mac_set_mode(struct zd_mac *mac, u32 mode)
+{
+        struct ieee80211_device *ieee;
+        switch (mode) {
+        case IW_MODE_AUTO:
+        case IW_MODE_ADHOC:
+        case IW_MODE_INFRA:
+                mac->netdev->type = ARPHRD_ETHER;
+                break;
+        case IW_MODE_MONITOR:
+                mac->netdev->type = ARPHRD_IEEE80211_RADIOTAP;
+                break;
+        default:
+                dev_dbg_f(zd_mac_dev(mac), "wrong mode %u\n", mode);
+                return -EINVAL;
+        }
+        ieee = zd_mac_to_ieee80211(mac);
+        ZD_ASSERT(!irqs_disabled());
+        spin_lock_irq(&ieee->lock);
+        ieee->iw_mode = mode;
+        spin_unlock_irq(&ieee->lock);
+        if (netif_running(mac->netdev))
+                return reset_mode(mac);
+        return 0;
+}
+int zd_mac_get_mode(struct zd_mac *mac, u32 *mode)
+{
+        unsigned long flags;
+        struct ieee80211_device *ieee;
+        ieee = zd_mac_to_ieee80211(mac);
+        spin_lock_irqsave(&ieee->lock, flags);
+        *mode = ieee->iw_mode;
+        spin_unlock_irqrestore(&ieee->lock, flags);
+        return 0;
+}
+int zd_mac_get_range(struct zd_mac *mac, struct iw_range *range)
+{
+        int i;
+        const struct channel_range *channel_range;
+        u8 regdomain;
+        memset(range, 0, sizeof(*range));
+        /* FIXME: Not so important and depends on the mode. For 802.11g
+         * usually this value is used. It seems to be that Bit/s number is
+         * given here.
+         */
+        range->throughput = 27 * 1000 * 1000;
+        range->max_qual.qual = 100;
+        range->max_qual.level = 100;
+        /* FIXME: Needs still to be tuned. */
+        range->avg_qual.qual = 71;
+        range->avg_qual.level = 80;
+        /* FIXME: depends on standard? */
+        range->min_rts = 256;
+        range->max_rts = 2346;
+        range->min_frag = MIN_FRAG_THRESHOLD;
+        range->max_frag = MAX_FRAG_THRESHOLD;
+        range->max_encoding_tokens = WEP_KEYS;
+        range->num_encoding_sizes = 2;
+        range->encoding_size[0] = 5;
+        range->encoding_size[1] = WEP_KEY_LEN;
+        range->we_version_compiled = WIRELESS_EXT;
+        range->we_version_source = 20;
+        ZD_ASSERT(!irqs_disabled());
+        spin_lock_irq(&mac->lock);
+        regdomain = mac->regdomain;
+        spin_unlock_irq(&mac->lock);
+        channel_range = zd_channel_range(regdomain);
+        range->num_channels = channel_range->end - channel_range->start;
+        range->old_num_channels = range->num_channels;
+        range->num_frequency = range->num_channels;
+        range->old_num_frequency = range->num_frequency;
+        for (i = 0; i < range->num_frequency; i++) {
+                struct iw_freq *freq = &range->freq[i];
+                freq->i = channel_range->start + i;
+                zd_channel_to_freq(freq, freq->i);
+        }
+        return 0;
+}
+static int zd_calc_tx_length_us(u8 *service, u8 cs_rate, u16 tx_length)
+{
+        static const u8 rate_divisor[] = {
+                [ZD_CS_CCK_RATE_1M]     =  1,
+                [ZD_CS_CCK_RATE_2M]     =  2,
+                [ZD_CS_CCK_RATE_5_5M]   = 11, /* bits must be doubled */
+                [ZD_CS_CCK_RATE_11M]    = 11,
+                [ZD_OFDM_RATE_6M]       =  6,
+                [ZD_OFDM_RATE_9M]       =  9,
+                [ZD_OFDM_RATE_12M]      = 12,
+                [ZD_OFDM_RATE_18M]      = 18,
+                [ZD_OFDM_RATE_24M]      = 24,
+                [ZD_OFDM_RATE_36M]      = 36,
+                [ZD_OFDM_RATE_48M]      = 48,
+                [ZD_OFDM_RATE_54M]      = 54,
+        };
+        u32 bits = (u32)tx_length * 8;
+        u32 divisor;
+        divisor = rate_divisor[cs_rate];
+        if (divisor == 0)
+                return -EINVAL;
+        switch (cs_rate) {
+        case ZD_CS_CCK_RATE_5_5M:
+                bits = (2*bits) + 10; /* round up to the next integer */
+                break;
+        case ZD_CS_CCK_RATE_11M:
+                if (service) {
+                        u32 t = bits % 11;
+                        *service &= ~ZD_PLCP_SERVICE_LENGTH_EXTENSION;
+                        if (0 < t && t <= 3) {
+                                *service |= ZD_PLCP_SERVICE_LENGTH_EXTENSION;
+                        }
+                }
+                bits += 10; /* round up to the next integer */
+                break;
+        }
+        return bits/divisor;
+}
+enum {
+        R2M_SHORT_PREAMBLE = 0x01,
+        R2M_11A            = 0x02,
+};
+static u8 cs_rate_to_modulation(u8 cs_rate, int flags)
+{
+        u8 modulation;
+        modulation = cs_typed_rate(cs_rate);
+        if (flags & R2M_SHORT_PREAMBLE) {
+                switch (ZD_CS_RATE(modulation)) {
+                case ZD_CS_CCK_RATE_2M:
+                case ZD_CS_CCK_RATE_5_5M:
+                case ZD_CS_CCK_RATE_11M:
+                        modulation |= ZD_CS_CCK_PREA_SHORT;
+                        return modulation;
+                }
+        }
+        if (flags & R2M_11A) {
+                if (ZD_CS_TYPE(modulation) == ZD_CS_OFDM)
+                        modulation |= ZD_CS_OFDM_MODE_11A;
+        }
+        return modulation;
+}
+static void cs_set_modulation(struct zd_mac *mac, struct zd_ctrlset *cs,
+                              struct ieee80211_hdr_4addr *hdr)
+{
+        struct ieee80211softmac_device *softmac = ieee80211_priv(mac->netdev);
+        u16 ftype = WLAN_FC_GET_TYPE(le16_to_cpu(hdr->frame_ctl));
+        u8 rate, cs_rate;
+        int is_mgt = (ftype == IEEE80211_FTYPE_MGMT) != 0;
+        /* FIXME: 802.11a? short preamble? */
+        rate = ieee80211softmac_suggest_txrate(softmac,
+                is_multicast_ether_addr(hdr->addr1), is_mgt);
+        cs_rate = rate_to_cs_rate(rate);
+        cs->modulation = cs_rate_to_modulation(cs_rate, 0);
+}
+static void cs_set_control(struct zd_mac *mac, struct zd_ctrlset *cs,
+                           struct ieee80211_hdr_4addr *header)
+{
+        unsigned int tx_length = le16_to_cpu(cs->tx_length);
+        u16 fctl = le16_to_cpu(header->frame_ctl);
+        u16 ftype = WLAN_FC_GET_TYPE(fctl);
+        u16 stype = WLAN_FC_GET_STYPE(fctl);
+        /*
+         * CONTROL:
+         * - start at 0x00
+         * - if fragment 0, enable bit 0
+         * - if backoff needed, enable bit 0
+         * - if burst (backoff not needed) disable bit 0
+         * - if multicast, enable bit 1
+         * - if PS-POLL frame, enable bit 2
+         * - if in INDEPENDENT_BSS mode and zd1205_DestPowerSave, then enable
+         *   bit 4 (FIXME: wtf)
+         * - if frag_len > RTS threshold, set bit 5 as long if it isnt
+         *   multicast or mgt
+         * - if bit 5 is set, and we are in OFDM mode, unset bit 5 and set bit
+         *   7
+         */
+        cs->control = 0;
+        /* First fragment */
+        if (WLAN_GET_SEQ_FRAG(le16_to_cpu(header->seq_ctl)) == 0)
+                cs->control |= ZD_CS_NEED_RANDOM_BACKOFF;
+        /* Multicast */
+        if (is_multicast_ether_addr(header->addr1))
+                cs->control |= ZD_CS_MULTICAST;
+        /* PS-POLL */
+        if (stype == IEEE80211_STYPE_PSPOLL)
+                cs->control |= ZD_CS_PS_POLL_FRAME;
+        if (!is_multicast_ether_addr(header->addr1) &&
+            ftype != IEEE80211_FTYPE_MGMT &&
+            tx_length > zd_netdev_ieee80211(mac->netdev)->rts)
+        {
+                /* FIXME: check the logic */
+                if (ZD_CS_TYPE(cs->modulation) == ZD_CS_OFDM) {
+                        /* 802.11g */
+                        cs->control |= ZD_CS_SELF_CTS;
+                } else { /* 802.11b */
+                        cs->control |= ZD_CS_RTS;
+                }
+        }
+        /* FIXME: Management frame? */
+}
+static int fill_ctrlset(struct zd_mac *mac,
+                        struct ieee80211_txb *txb,
+                        int frag_num)
+{
+        int r;
+        struct sk_buff *skb = txb->fragments[frag_num];
+        struct ieee80211_hdr_4addr *hdr =
+                (struct ieee80211_hdr_4addr *) skb->data;
+        unsigned int frag_len = skb->len + IEEE80211_FCS_LEN;
+        unsigned int next_frag_len;
+        unsigned int packet_length;
+        struct zd_ctrlset *cs = (struct zd_ctrlset *)
+                skb_push(skb, sizeof(struct zd_ctrlset));
+        if (frag_num+1  < txb->nr_frags) {
+                next_frag_len = txb->fragments[frag_num+1]->len +
+                                IEEE80211_FCS_LEN;
+        } else {
+                next_frag_len = 0;
+        }
+        ZD_ASSERT(frag_len <= 0xffff);
+        ZD_ASSERT(next_frag_len <= 0xffff);
+        cs_set_modulation(mac, cs, hdr);
+        cs->tx_length = cpu_to_le16(frag_len);
+        cs_set_control(mac, cs, hdr);
+        packet_length = frag_len + sizeof(struct zd_ctrlset) + 10;
+        ZD_ASSERT(packet_length <= 0xffff);
+        /* ZD1211B: Computing the length difference this way, gives us
+         * flexibility to compute the packet length.
+         */
+        cs->packet_length = cpu_to_le16(mac->chip.is_zd1211b ?
+                        packet_length - frag_len : packet_length);
+        /*
+         * CURRENT LENGTH:
+         * - transmit frame length in microseconds
+         * - seems to be derived from frame length
+         * - see Cal_Us_Service() in zdinlinef.h
+         * - if macp->bTxBurstEnable is enabled, then multiply by 4
+         *  - bTxBurstEnable is never set in the vendor driver
+         *
+         * SERVICE:
+         * - "for PLCP configuration"
+         * - always 0 except in some situations at 802.11b 11M
+         * - see line 53 of zdinlinef.h
+         */
+        cs->service = 0;
+        r = zd_calc_tx_length_us(&cs->service, ZD_CS_RATE(cs->modulation),
+                                 le16_to_cpu(cs->tx_length));
+        if (r < 0)
+                return r;
+        cs->current_length = cpu_to_le16(r);
+        if (next_frag_len == 0) {
+                cs->next_frame_length = 0;
+        } else {
+                r = zd_calc_tx_length_us(NULL, ZD_CS_RATE(cs->modulation),
+                                         next_frag_len);
+                if (r < 0)
+                        return r;
+                cs->next_frame_length = cpu_to_le16(r);
+        }
+        return 0;
+}
+static int zd_mac_tx(struct zd_mac *mac, struct ieee80211_txb *txb, int pri)
+{
+        int i, r;
+        for (i = 0; i < txb->nr_frags; i++) {
+                struct sk_buff *skb = txb->fragments[i];
+                r = fill_ctrlset(mac, txb, i);
+                if (r)
+                        return r;
+                r = zd_usb_tx(&mac->chip.usb, skb->data, skb->len);
+                if (r)
+                        return r;
+        }
+        /* FIXME: shouldn't this be handled by the upper layers? */
+        mac->netdev->trans_start = jiffies;
+        ieee80211_txb_free(txb);
+        return 0;
+}
+struct zd_rt_hdr {
+        struct ieee80211_radiotap_header rt_hdr;
+        u8  rt_flags;
+        u16 rt_channel;
+        u16 rt_chbitmask;
+        u16 rt_rate;
+};
+static void fill_rt_header(void *buffer, struct zd_mac *mac,
+                           const struct ieee80211_rx_stats *stats,
+                           const struct rx_status *status)
+{
+        struct zd_rt_hdr *hdr = buffer;
+        hdr->rt_hdr.it_version = PKTHDR_RADIOTAP_VERSION;
+        hdr->rt_hdr.it_pad = 0;
+        hdr->rt_hdr.it_len = cpu_to_le16(sizeof(struct zd_rt_hdr));
+        hdr->rt_hdr.it_present = cpu_to_le32((1 << IEEE80211_RADIOTAP_FLAGS) |
+                                 (1 << IEEE80211_RADIOTAP_CHANNEL) |
+                                 (1 << IEEE80211_RADIOTAP_RATE));
+        hdr->rt_flags = 0;
+        if (status->decryption_type & (ZD_RX_WEP64|ZD_RX_WEP128|ZD_RX_WEP256))
+                hdr->rt_flags |= IEEE80211_RADIOTAP_F_WEP;
+        /* FIXME: 802.11a */
+        hdr->rt_channel = cpu_to_le16(ieee80211chan2mhz(
+                                             _zd_chip_get_channel(&mac->chip)));
+        hdr->rt_chbitmask = cpu_to_le16(IEEE80211_CHAN_2GHZ |
+                ((status->frame_status & ZD_RX_FRAME_MODULATION_MASK) ==
+                ZD_RX_OFDM ? IEEE80211_CHAN_OFDM : IEEE80211_CHAN_CCK));
+        hdr->rt_rate = stats->rate / 5;
+}
+/* Returns 1 if the data packet is for us and 0 otherwise. */
+static int is_data_packet_for_us(struct ieee80211_device *ieee,
+                                 struct ieee80211_hdr_4addr *hdr)
+{
+        struct net_device *netdev = ieee->dev;
+        u16 fc = le16_to_cpu(hdr->frame_ctl);
+        ZD_ASSERT(WLAN_FC_GET_TYPE(fc) == IEEE80211_FTYPE_DATA);
+        switch (ieee->iw_mode) {
+        case IW_MODE_ADHOC:
+                if ((fc & (IEEE80211_FCTL_TODS|IEEE80211_FCTL_FROMDS)) != 0 ||
+                    memcmp(hdr->addr3, ieee->bssid, ETH_ALEN) != 0)
+                        return 0;
+                break;
+        case IW_MODE_AUTO:
+        case IW_MODE_INFRA:
+                if ((fc & (IEEE80211_FCTL_TODS|IEEE80211_FCTL_FROMDS)) !=
+                    IEEE80211_FCTL_FROMDS ||
+                    memcmp(hdr->addr2, ieee->bssid, ETH_ALEN) != 0)
+                        return 0;
+                break;
+        default:
+                ZD_ASSERT(ieee->iw_mode != IW_MODE_MONITOR);
+                return 0;
+        }
+        return memcmp(hdr->addr1, netdev->dev_addr, ETH_ALEN) == 0 ||
+               is_multicast_ether_addr(hdr->addr1) ||
+               (netdev->flags & IFF_PROMISC);
+}
+/* Filters receiving packets. If it returns 1 send it to ieee80211_rx, if 0
+ * return. If an error is detected -EINVAL is returned. ieee80211_rx_mgt() is
+ * called here.
+ *
+ * It has been based on ieee80211_rx_any.
+ */
+static int filter_rx(struct ieee80211_device *ieee,
+                     const u8 *buffer, unsigned int length,
+                     struct ieee80211_rx_stats *stats)
+{
+        struct ieee80211_hdr_4addr *hdr;
+        u16 fc;
+        if (ieee->iw_mode == IW_MODE_MONITOR)
+                return 1;
+        hdr = (struct ieee80211_hdr_4addr *)buffer;
+        fc = le16_to_cpu(hdr->frame_ctl);
+        if ((fc & IEEE80211_FCTL_VERS) != 0)
+                return -EINVAL;
+        switch (WLAN_FC_GET_TYPE(fc)) {
+        case IEEE80211_FTYPE_MGMT:
+                if (length < sizeof(struct ieee80211_hdr_3addr))
+                        return -EINVAL;
+                ieee80211_rx_mgt(ieee, hdr, stats);
+                return 0;
+        case IEEE80211_FTYPE_CTL:
+                /* Ignore invalid short buffers */
+                return 0;
+        case IEEE80211_FTYPE_DATA:
+                if (length < sizeof(struct ieee80211_hdr_3addr))
+                        return -EINVAL;
+                return is_data_packet_for_us(ieee, hdr);
+        }
+        return -EINVAL;
+}
+static void update_qual_rssi(struct zd_mac *mac, u8 qual_percent, u8 rssi)
+{
+        unsigned long flags;
+        spin_lock_irqsave(&mac->lock, flags);
+        mac->qual_average = (7 * mac->qual_average + qual_percent) / 8;
+        mac->rssi_average = (7 * mac->rssi_average + rssi) / 8;
+        spin_unlock_irqrestore(&mac->lock, flags);
+}
+static int fill_rx_stats(struct ieee80211_rx_stats *stats,
+                         const struct rx_status **pstatus,
+                         struct zd_mac *mac,
+                         const u8 *buffer, unsigned int length)
+{
+        const struct rx_status *status;
+        *pstatus = status = zd_tail(buffer, length, sizeof(struct rx_status));
+        if (status->frame_status & ZD_RX_ERROR) {
+                /* FIXME: update? */
+                return -EINVAL;
+        }
+        memset(stats, 0, sizeof(struct ieee80211_rx_stats));
+        stats->len = length - (ZD_PLCP_HEADER_SIZE + IEEE80211_FCS_LEN +
+                               + sizeof(struct rx_status));
+        /* FIXME: 802.11a */
+        stats->freq = IEEE80211_24GHZ_BAND;
+        stats->received_channel = _zd_chip_get_channel(&mac->chip);
+        stats->rssi = zd_rx_strength_percent(status->signal_strength);
+        stats->signal = zd_rx_qual_percent(buffer,
+                                          length - sizeof(struct rx_status),
+                                          status);
+        stats->mask = IEEE80211_STATMASK_RSSI | IEEE80211_STATMASK_SIGNAL;
+        stats->rate = zd_rx_rate(buffer, status);
+        if (stats->rate)
+                stats->mask |= IEEE80211_STATMASK_RATE;
+        update_qual_rssi(mac, stats->signal, stats->rssi);
+        return 0;
+}
+int zd_mac_rx(struct zd_mac *mac, const u8 *buffer, unsigned int length)
+{
+        int r;
+        struct ieee80211_device *ieee = zd_mac_to_ieee80211(mac);
+        struct ieee80211_rx_stats stats;
+        const struct rx_status *status;
+        struct sk_buff *skb;
+        if (length < ZD_PLCP_HEADER_SIZE + IEEE80211_1ADDR_LEN +
+                     IEEE80211_FCS_LEN + sizeof(struct rx_status))
+                return -EINVAL;
+        r = fill_rx_stats(&stats, &status, mac, buffer, length);
+        if (r)
+                return r;
+        length -= ZD_PLCP_HEADER_SIZE+IEEE80211_FCS_LEN+
+                  sizeof(struct rx_status);
+        buffer += ZD_PLCP_HEADER_SIZE;
+        r = filter_rx(ieee, buffer, length, &stats);
+        if (r <= 0)
+                return r;
+        skb = dev_alloc_skb(sizeof(struct zd_rt_hdr) + length);
+        if (!skb)
+                return -ENOMEM;
+        if (ieee->iw_mode == IW_MODE_MONITOR)
+                fill_rt_header(skb_put(skb, sizeof(struct zd_rt_hdr)), mac,
+                               &stats, status);
+        memcpy(skb_put(skb, length), buffer, length);
+        r = ieee80211_rx(ieee, skb, &stats);
+        if (!r) {
+                ZD_ASSERT(in_irq());
+                dev_kfree_skb_irq(skb);
+        }
+        return 0;
+}
+static int netdev_tx(struct ieee80211_txb *txb, struct net_device *netdev,
+                     int pri)
+{
+        return zd_mac_tx(zd_netdev_mac(netdev), txb, pri);
+}
+static void set_security(struct net_device *netdev,
+                         struct ieee80211_security *sec)
+{
+        struct ieee80211_device *ieee = zd_netdev_ieee80211(netdev);
+        struct ieee80211_security *secinfo = &ieee->sec;
+        int keyidx;
+        dev_dbg_f(zd_mac_dev(zd_netdev_mac(netdev)), "\n");
+        for (keyidx = 0; keyidx<WEP_KEYS; keyidx++)
+                if (sec->flags & (1<<keyidx)) {
+                        secinfo->encode_alg[keyidx] = sec->encode_alg[keyidx];
+                        secinfo->key_sizes[keyidx] = sec->key_sizes[keyidx];
+                        memcpy(secinfo->keys[keyidx], sec->keys[keyidx],
+                               SCM_KEY_LEN);
+                }
+        if (sec->flags & SEC_ACTIVE_KEY) {
+                secinfo->active_key = sec->active_key;
+                dev_dbg_f(zd_mac_dev(zd_netdev_mac(netdev)),
+                        "   .active_key = %d\n", sec->active_key);
+        }
+        if (sec->flags & SEC_UNICAST_GROUP) {
+                secinfo->unicast_uses_group = sec->unicast_uses_group;
+                dev_dbg_f(zd_mac_dev(zd_netdev_mac(netdev)),
+                        "   .unicast_uses_group = %d\n",
+                        sec->unicast_uses_group);
+        }
+        if (sec->flags & SEC_LEVEL) {
+                secinfo->level = sec->level;
+                dev_dbg_f(zd_mac_dev(zd_netdev_mac(netdev)),
+                        "   .level = %d\n", sec->level);
+        }
+        if (sec->flags & SEC_ENABLED) {
+                secinfo->enabled = sec->enabled;
+                dev_dbg_f(zd_mac_dev(zd_netdev_mac(netdev)),
+                        "   .enabled = %d\n", sec->enabled);
+        }
+        if (sec->flags & SEC_ENCRYPT) {
+                secinfo->encrypt = sec->encrypt;
+                dev_dbg_f(zd_mac_dev(zd_netdev_mac(netdev)),
+                        "   .encrypt = %d\n", sec->encrypt);
+        }
+        if (sec->flags & SEC_AUTH_MODE) {
+                secinfo->auth_mode = sec->auth_mode;
+                dev_dbg_f(zd_mac_dev(zd_netdev_mac(netdev)),
+                        "   .auth_mode = %d\n", sec->auth_mode);
+        }
+}
+static void ieee_init(struct ieee80211_device *ieee)
+{
+        ieee->mode = IEEE_B | IEEE_G;
+        ieee->freq_band = IEEE80211_24GHZ_BAND;
+        ieee->modulation = IEEE80211_OFDM_MODULATION | IEEE80211_CCK_MODULATION;
+        ieee->tx_headroom = sizeof(struct zd_ctrlset);
+        ieee->set_security = set_security;
+        ieee->hard_start_xmit = netdev_tx;
+        /* Software encryption/decryption for now */
+        ieee->host_build_iv = 0;
+        ieee->host_encrypt = 1;
+        ieee->host_decrypt = 1;
+        /* FIXME: default to managed mode, until ieee80211 and zd1211rw can
+         * correctly support AUTO */
+        ieee->iw_mode = IW_MODE_INFRA;
+}
+static void softmac_init(struct ieee80211softmac_device *sm)
+{
+        sm->set_channel = set_channel;
+}
+struct iw_statistics *zd_mac_get_wireless_stats(struct net_device *ndev)
+{
+        struct zd_mac *mac = zd_netdev_mac(ndev);
+        struct iw_statistics *iw_stats = &mac->iw_stats;
+        memset(iw_stats, 0, sizeof(struct iw_statistics));
+        /* We are not setting the status, because ieee->state is not updated
+         * at all and this driver doesn't track authentication state.
+         */
+        spin_lock_irq(&mac->lock);
+        iw_stats->qual.qual = mac->qual_average;
+        iw_stats->qual.level = mac->rssi_average;
+        iw_stats->qual.updated = IW_QUAL_QUAL_UPDATED|IW_QUAL_LEVEL_UPDATED|
+                                 IW_QUAL_NOISE_INVALID;
+        spin_unlock_irq(&mac->lock);
+        /* TODO: update counter */
+        return iw_stats;
+}
+#ifdef DEBUG
+static const char* decryption_types[] = {
+        [ZD_RX_NO_WEP] = "none",
+        [ZD_RX_WEP64] = "WEP64",
+        [ZD_RX_TKIP] = "TKIP",
+        [ZD_RX_AES] = "AES",
+        [ZD_RX_WEP128] = "WEP128",
+        [ZD_RX_WEP256] = "WEP256",
+};
+static const char *decryption_type_string(u8 type)
+{
+        const char *s;
+        if (type < ARRAY_SIZE(decryption_types)) {
+                s = decryption_types[type];
+        } else {
+                s = NULL;
+        }
+        return s ? s : "unknown";
+}
+static int is_ofdm(u8 frame_status)
+{
+        return (frame_status & ZD_RX_OFDM);
+}
+void zd_dump_rx_status(const struct rx_status *status)
+{
+        const char* modulation;
+        u8 quality;
+        if (is_ofdm(status->frame_status)) {
+                modulation = "ofdm";
+                quality = status->signal_quality_ofdm;
+        } else {
+                modulation = "cck";
+                quality = status->signal_quality_cck;
+        }
+        pr_debug("rx status %s strength %#04x qual %#04x decryption %s\n",
+                modulation, status->signal_strength, quality,
+                decryption_type_string(status->decryption_type));
+        if (status->frame_status & ZD_RX_ERROR) {
+                pr_debug("rx error %s%s%s%s%s%s\n",
+                        (status->frame_status & ZD_RX_TIMEOUT_ERROR) ?
+                                "timeout " : "",
+                        (status->frame_status & ZD_RX_FIFO_OVERRUN_ERROR) ?
+                                "fifo " : "",
+                        (status->frame_status & ZD_RX_DECRYPTION_ERROR) ?
+                                "decryption " : "",
+                        (status->frame_status & ZD_RX_CRC32_ERROR) ?
+                                "crc32 " : "",
+                        (status->frame_status & ZD_RX_NO_ADDR1_MATCH_ERROR) ?
+                                "addr1 " : "",
+                        (status->frame_status & ZD_RX_CRC16_ERROR) ?
+                                "crc16" : "");
+        }
+}
+#endif /* DEBUG */
diff --git a/drivers/net/wireless/zd1211rw/zd_mac.h b/drivers/net/wireless/zd1211rw/zd_mac.h
new file mode 100644
index 000000000000..71e382c589ee
--- /dev/null
+++ b/drivers/net/wireless/zd1211rw/zd_mac.h
@@ -0,0 +1,190 @@
+/* zd_mac.c
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#ifndef _ZD_MAC_H
+#define _ZD_MAC_H
+#include <linux/wireless.h>
+#include <linux/kernel.h>
+#include <net/ieee80211.h>
+#include <net/ieee80211softmac.h>
+#include "zd_chip.h"
+#include "zd_netdev.h"
+struct zd_ctrlset {
+        u8     modulation;
+        __le16 tx_length;
+        u8     control;
+        /* stores only the difference to tx_length on ZD1211B */
+        __le16 packet_length;
+        __le16 current_length;
+        u8     service;
+        __le16  next_frame_length;
+} __attribute__((packed));
+#define ZD_CS_RESERVED_SIZE     25
+/* zd_crtlset field modulation */
+#define ZD_CS_RATE_MASK         0x0f
+#define ZD_CS_TYPE_MASK         0x10
+#define ZD_CS_RATE(modulation) ((modulation) & ZD_CS_RATE_MASK)
+#define ZD_CS_TYPE(modulation) ((modulation) & ZD_CS_TYPE_MASK)
+#define ZD_CS_CCK               0x00
+#define ZD_CS_OFDM              0x10
+#define ZD_CS_CCK_RATE_1M       0x00
+#define ZD_CS_CCK_RATE_2M       0x01
+#define ZD_CS_CCK_RATE_5_5M     0x02
+#define ZD_CS_CCK_RATE_11M      0x03
+/* The rates for OFDM are encoded as in the PLCP header. Use ZD_OFDM_RATE_*.
+ */
+/* bit 5 is preamble (when in CCK mode), or a/g selection (when in OFDM mode) */
+#define ZD_CS_CCK_PREA_LONG     0x00
+#define ZD_CS_CCK_PREA_SHORT    0x20
+#define ZD_CS_OFDM_MODE_11G     0x00
+#define ZD_CS_OFDM_MODE_11A     0x20
+/* zd_ctrlset control field */
+#define ZD_CS_NEED_RANDOM_BACKOFF       0x01
+#define ZD_CS_MULTICAST                 0x02
+#define ZD_CS_FRAME_TYPE_MASK           0x0c
+#define ZD_CS_DATA_FRAME                0x00
+#define ZD_CS_PS_POLL_FRAME             0x04
+#define ZD_CS_MANAGEMENT_FRAME          0x08
+#define ZD_CS_NO_SEQUENCE_CTL_FRAME     0x0c
+#define ZD_CS_WAKE_DESTINATION          0x10
+#define ZD_CS_RTS                       0x20
+#define ZD_CS_ENCRYPT                   0x40
+#define ZD_CS_SELF_CTS                  0x80
+/* Incoming frames are prepended by a PLCP header */
+#define ZD_PLCP_HEADER_SIZE             5
+struct rx_length_info {
+        __le16 length[3];
+        __le16 tag;
+} __attribute__((packed));
+#define RX_LENGTH_INFO_TAG              0x697e
+struct rx_status {
+        /* rssi */
+        u8 signal_strength;
+        u8 signal_quality_cck;
+        u8 signal_quality_ofdm;
+        u8 decryption_type;
+        u8 frame_status;
+} __attribute__((packed));
+/* rx_status field decryption_type */
+#define ZD_RX_NO_WEP    0
+#define ZD_RX_WEP64     1
+#define ZD_RX_TKIP      2
+#define ZD_RX_AES       4
+#define ZD_RX_WEP128    5
+#define ZD_RX_WEP256    6
+/* rx_status field frame_status */
+#define ZD_RX_FRAME_MODULATION_MASK     0x01
+#define ZD_RX_CCK                       0x00
+#define ZD_RX_OFDM                      0x01
+#define ZD_RX_TIMEOUT_ERROR             0x02
+#define ZD_RX_FIFO_OVERRUN_ERROR        0x04
+#define ZD_RX_DECRYPTION_ERROR          0x08
+#define ZD_RX_CRC32_ERROR               0x10
+#define ZD_RX_NO_ADDR1_MATCH_ERROR      0x20
+#define ZD_RX_CRC16_ERROR               0x40
+#define ZD_RX_ERROR                     0x80
+enum mac_flags {
+        MAC_FIXED_CHANNEL = 0x01,
+};
+struct zd_mac {
+        struct net_device *netdev;
+        struct zd_chip chip;
+        spinlock_t lock;
+        /* Unlocked reading possible */
+        struct iw_statistics iw_stats;
+        u8 qual_average;
+        u8 rssi_average;
+        u8 regdomain;
+        u8 default_regdomain;
+        u8 requested_channel;
+};
+static inline struct ieee80211_device *zd_mac_to_ieee80211(struct zd_mac *mac)
+{
+        return zd_netdev_ieee80211(mac->netdev);
+}
+static inline struct zd_mac *zd_netdev_mac(struct net_device *netdev)
+{
+        return ieee80211softmac_priv(netdev);
+}
+static inline struct zd_mac *zd_chip_to_mac(struct zd_chip *chip)
+{
+        return container_of(chip, struct zd_mac, chip);
+}
+static inline struct zd_mac *zd_usb_to_mac(struct zd_usb *usb)
+{
+        return zd_chip_to_mac(zd_usb_to_chip(usb));
+}
+#define zd_mac_dev(mac) (zd_chip_dev(&(mac)->chip))
+int zd_mac_init(struct zd_mac *mac,
+                struct net_device *netdev,
+                struct usb_interface *intf);
+void zd_mac_clear(struct zd_mac *mac);
+int zd_mac_init_hw(struct zd_mac *mac, u8 device_type);
+int zd_mac_open(struct net_device *netdev);
+int zd_mac_stop(struct net_device *netdev);
+int zd_mac_set_mac_address(struct net_device *dev, void *p);
+int zd_mac_rx(struct zd_mac *mac, const u8 *buffer, unsigned int length);
+int zd_mac_set_regdomain(struct zd_mac *zd_mac, u8 regdomain);
+u8 zd_mac_get_regdomain(struct zd_mac *zd_mac);
+int zd_mac_request_channel(struct zd_mac *mac, u8 channel);
+int zd_mac_get_channel(struct zd_mac *mac, u8 *channel, u8 *flags);
+int zd_mac_set_mode(struct zd_mac *mac, u32 mode);
+int zd_mac_get_mode(struct zd_mac *mac, u32 *mode);
+int zd_mac_get_range(struct zd_mac *mac, struct iw_range *range);
+struct iw_statistics *zd_mac_get_wireless_stats(struct net_device *ndev);
+#ifdef DEBUG
+void zd_dump_rx_status(const struct rx_status *status);
+#else
+#define zd_dump_rx_status(status)
+#endif /* DEBUG */
+#endif /* _ZD_MAC_H */
diff --git a/drivers/net/wireless/zd1211rw/zd_netdev.c b/drivers/net/wireless/zd1211rw/zd_netdev.c
new file mode 100644
index 000000000000..9df232c2c863
--- /dev/null
+++ b/drivers/net/wireless/zd1211rw/zd_netdev.c
@@ -0,0 +1,267 @@
+/* zd_netdev.c
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#include <linux/netdevice.h>
+#include <linux/etherdevice.h>
+#include <linux/skbuff.h>
+#include <net/ieee80211.h>
+#include <net/ieee80211softmac.h>
+#include <net/ieee80211softmac_wx.h>
+#include <net/iw_handler.h>
+#include "zd_def.h"
+#include "zd_netdev.h"
+#include "zd_mac.h"
+#include "zd_ieee80211.h"
+/* Region 0 means reset regdomain to default. */
+static int zd_set_regdomain(struct net_device *netdev,
+                            struct iw_request_info *info,
+                            union iwreq_data *req, char *extra)
+{
+        const u8 *regdomain = (u8 *)req;
+        return zd_mac_set_regdomain(zd_netdev_mac(netdev), *regdomain);
+}
+static int zd_get_regdomain(struct net_device *netdev,
+                            struct iw_request_info *info,
+                            union iwreq_data *req, char *extra)
+{
+        u8 *regdomain = (u8 *)req;
+        if (!regdomain)
+                return -EINVAL;
+        *regdomain = zd_mac_get_regdomain(zd_netdev_mac(netdev));
+        return 0;
+}
+static const struct iw_priv_args zd_priv_args[] = {
+        {
+                .cmd = ZD_PRIV_SET_REGDOMAIN,
+                .set_args = IW_PRIV_TYPE_BYTE | IW_PRIV_SIZE_FIXED | 1,
+                .name = "set_regdomain",
+        },
+        {
+                .cmd = ZD_PRIV_GET_REGDOMAIN,
+                .get_args = IW_PRIV_TYPE_BYTE | IW_PRIV_SIZE_FIXED | 1,
+                .name = "get_regdomain",
+        },
+};
+#define PRIV_OFFSET(x) [(x)-SIOCIWFIRSTPRIV]
+static const iw_handler zd_priv_handler[] = {
+        PRIV_OFFSET(ZD_PRIV_SET_REGDOMAIN) = zd_set_regdomain,
+        PRIV_OFFSET(ZD_PRIV_GET_REGDOMAIN) = zd_get_regdomain,
+};
+static int iw_get_name(struct net_device *netdev,
+                       struct iw_request_info *info,
+                       union iwreq_data *req, char *extra)
+{
+        /* FIXME: check whether 802.11a will also supported, add also
+         *        zd1211B, if we support it.
+         */
+        strlcpy(req->name, "802.11g zd1211", IFNAMSIZ);
+        return 0;
+}
+static int iw_set_freq(struct net_device *netdev,
+                       struct iw_request_info *info,
+                       union iwreq_data *req, char *extra)
+{
+        int r;
+        struct zd_mac *mac = zd_netdev_mac(netdev);
+        struct iw_freq *freq = &req->freq;
+        u8 channel;
+        r = zd_find_channel(&channel, freq);
+        if (r < 0)
+                return r;
+        r = zd_mac_request_channel(mac, channel);
+        return r;
+}
+static int iw_get_freq(struct net_device *netdev,
+                   struct iw_request_info *info,
+                   union iwreq_data *req, char *extra)
+{
+        int r;
+        struct zd_mac *mac = zd_netdev_mac(netdev);
+        struct iw_freq *freq = &req->freq;
+        u8 channel;
+        u8 flags;
+        r = zd_mac_get_channel(mac, &channel, &flags);
+        if (r)
+                return r;
+        freq->flags = (flags & MAC_FIXED_CHANNEL) ?
+                      IW_FREQ_FIXED : IW_FREQ_AUTO;
+        dev_dbg_f(zd_mac_dev(mac), "channel %s\n",
+                  (flags & MAC_FIXED_CHANNEL) ? "fixed" : "auto");
+        return zd_channel_to_freq(freq, channel);
+}
+static int iw_set_mode(struct net_device *netdev,
+                       struct iw_request_info *info,
+                       union iwreq_data *req, char *extra)
+{
+        return zd_mac_set_mode(zd_netdev_mac(netdev), req->mode);
+}
+static int iw_get_mode(struct net_device *netdev,
+                       struct iw_request_info *info,
+                       union iwreq_data *req, char *extra)
+{
+        return zd_mac_get_mode(zd_netdev_mac(netdev), &req->mode);
+}
+static int iw_get_range(struct net_device *netdev,
+                       struct iw_request_info *info,
+                       union iwreq_data *req, char *extra)
+{
+        struct iw_range *range = (struct iw_range *)extra;
+        dev_dbg_f(zd_mac_dev(zd_netdev_mac(netdev)), "\n");
+        req->data.length = sizeof(*range);
+        return zd_mac_get_range(zd_netdev_mac(netdev), range);
+}
+static int iw_set_encode(struct net_device *netdev,
+                         struct iw_request_info *info,
+                         union iwreq_data *data,
+                         char *extra)
+{
+        return ieee80211_wx_set_encode(zd_netdev_ieee80211(netdev), info,
+                data, extra);
+}
+static int iw_get_encode(struct net_device *netdev,
+                         struct iw_request_info *info,
+                         union iwreq_data *data,
+                         char *extra)
+{
+        return ieee80211_wx_get_encode(zd_netdev_ieee80211(netdev), info,
+                data, extra);
+}
+static int iw_set_encodeext(struct net_device *netdev,
+                         struct iw_request_info *info,
+                         union iwreq_data *data,
+                         char *extra)
+{
+        return ieee80211_wx_set_encodeext(zd_netdev_ieee80211(netdev), info,
+                data, extra);
+}
+static int iw_get_encodeext(struct net_device *netdev,
+                         struct iw_request_info *info,
+                         union iwreq_data *data,
+                         char *extra)
+{
+        return ieee80211_wx_get_encodeext(zd_netdev_ieee80211(netdev), info,
+                data, extra);
+}
+#define WX(x) [(x)-SIOCIWFIRST]
+static const iw_handler zd_standard_iw_handlers[] = {
+        WX(SIOCGIWNAME)         = iw_get_name,
+        WX(SIOCSIWFREQ)         = iw_set_freq,
+        WX(SIOCGIWFREQ)         = iw_get_freq,
+        WX(SIOCSIWMODE)         = iw_set_mode,
+        WX(SIOCGIWMODE)         = iw_get_mode,
+        WX(SIOCGIWRANGE)        = iw_get_range,
+        WX(SIOCSIWENCODE)       = iw_set_encode,
+        WX(SIOCGIWENCODE)       = iw_get_encode,
+        WX(SIOCSIWENCODEEXT)    = iw_set_encodeext,
+        WX(SIOCGIWENCODEEXT)    = iw_get_encodeext,
+        WX(SIOCSIWAUTH)         = ieee80211_wx_set_auth,
+        WX(SIOCGIWAUTH)         = ieee80211_wx_get_auth,
+        WX(SIOCSIWSCAN)         = ieee80211softmac_wx_trigger_scan,
+        WX(SIOCGIWSCAN)         = ieee80211softmac_wx_get_scan_results,
+        WX(SIOCSIWESSID)        = ieee80211softmac_wx_set_essid,
+        WX(SIOCGIWESSID)        = ieee80211softmac_wx_get_essid,
+        WX(SIOCSIWAP)           = ieee80211softmac_wx_set_wap,
+        WX(SIOCGIWAP)           = ieee80211softmac_wx_get_wap,
+        WX(SIOCSIWRATE)         = ieee80211softmac_wx_set_rate,
+        WX(SIOCGIWRATE)         = ieee80211softmac_wx_get_rate,
+        WX(SIOCSIWGENIE)        = ieee80211softmac_wx_set_genie,
+        WX(SIOCGIWGENIE)        = ieee80211softmac_wx_get_genie,
+        WX(SIOCSIWMLME)         = ieee80211softmac_wx_set_mlme,
+};
+static const struct iw_handler_def iw_handler_def = {
+        .standard               = zd_standard_iw_handlers,
+        .num_standard           = ARRAY_SIZE(zd_standard_iw_handlers),
+        .private                = zd_priv_handler,
+        .num_private            = ARRAY_SIZE(zd_priv_handler),
+        .private_args           = zd_priv_args,
+        .num_private_args       = ARRAY_SIZE(zd_priv_args),
+        .get_wireless_stats     = zd_mac_get_wireless_stats,
+};
+struct net_device *zd_netdev_alloc(struct usb_interface *intf)
+{
+        int r;
+        struct net_device *netdev;
+        struct zd_mac *mac;
+        netdev = alloc_ieee80211softmac(sizeof(struct zd_mac));
+        if (!netdev) {
+                dev_dbg_f(&intf->dev, "out of memory\n");
+                return NULL;
+        }
+        mac = zd_netdev_mac(netdev);
+        r = zd_mac_init(mac, netdev, intf);
+        if (r) {
+                usb_set_intfdata(intf, NULL);
+                free_ieee80211(netdev);
+                return NULL;
+        }
+        SET_MODULE_OWNER(netdev);
+        SET_NETDEV_DEV(netdev, &intf->dev);
+        dev_dbg_f(&intf->dev, "netdev->flags %#06hx\n", netdev->flags);
+        dev_dbg_f(&intf->dev, "netdev->features %#010lx\n", netdev->features);
+        netdev->open = zd_mac_open;
+        netdev->stop = zd_mac_stop;
+        /* netdev->get_stats = */
+        /* netdev->set_multicast_list = */
+        netdev->set_mac_address = zd_mac_set_mac_address;
+        netdev->wireless_handlers = &iw_handler_def;
+        /* netdev->ethtool_ops = */
+        return netdev;
+}
+void zd_netdev_free(struct net_device *netdev)
+{
+        if (!netdev)
+                return;
+        zd_mac_clear(zd_netdev_mac(netdev));
+        free_ieee80211(netdev);
+}
+void zd_netdev_disconnect(struct net_device *netdev)
+{
+        unregister_netdev(netdev);
+}
diff --git a/drivers/net/wireless/zd1211rw/zd_netdev.h b/drivers/net/wireless/zd1211rw/zd_netdev.h
new file mode 100644
index 000000000000..374a957073c1
--- /dev/null
+++ b/drivers/net/wireless/zd1211rw/zd_netdev.h
@@ -0,0 +1,45 @@
+/* zd_netdev.h: Header for net device related functions.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#ifndef _ZD_NETDEV_H
+#define _ZD_NETDEV_H
+#include <linux/usb.h>
+#include <linux/netdevice.h>
+#include <net/ieee80211.h>
+#define ZD_PRIV_SET_REGDOMAIN (SIOCIWFIRSTPRIV)
+#define ZD_PRIV_GET_REGDOMAIN (SIOCIWFIRSTPRIV+1)
+static inline struct ieee80211_device *zd_netdev_ieee80211(
+        struct net_device *ndev)
+{
+        return netdev_priv(ndev);
+}
+static inline struct net_device *zd_ieee80211_to_netdev(
+        struct ieee80211_device *ieee)
+{
+        return ieee->dev;
+}
+struct net_device *zd_netdev_alloc(struct usb_interface *intf);
+void zd_netdev_free(struct net_device *netdev);
+void zd_netdev_disconnect(struct net_device *netdev);
+#endif /* _ZD_NETDEV_H */
diff --git a/drivers/net/wireless/zd1211rw/zd_rf.c b/drivers/net/wireless/zd1211rw/zd_rf.c
new file mode 100644
index 000000000000..d3770d2c61bc
--- /dev/null
+++ b/drivers/net/wireless/zd1211rw/zd_rf.c
@@ -0,0 +1,151 @@
+/* zd_rf.c
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#include <linux/errno.h>
+#include <linux/string.h>
+#include "zd_def.h"
+#include "zd_rf.h"
+#include "zd_ieee80211.h"
+#include "zd_chip.h"
+static const char *rfs[] = {
+        [0]             = "unknown RF0",
+        [1]             = "unknown RF1",
+        [UW2451_RF]     = "UW2451_RF",
+        [UCHIP_RF]      = "UCHIP_RF",
+        [AL2230_RF]     = "AL2230_RF",
+        [AL7230B_RF]    = "AL7230B_RF",
+        [THETA_RF]      = "THETA_RF",
+        [AL2210_RF]     = "AL2210_RF",
+        [MAXIM_NEW_RF]  = "MAXIM_NEW_RF",
+        [UW2453_RF]     = "UW2453_RF",
+        [AL2230S_RF]    = "AL2230S_RF",
+        [RALINK_RF]     = "RALINK_RF",
+        [INTERSIL_RF]   = "INTERSIL_RF",
+        [RF2959_RF]     = "RF2959_RF",
+        [MAXIM_NEW2_RF] = "MAXIM_NEW2_RF",
+        [PHILIPS_RF]    = "PHILIPS_RF",
+};
+const char *zd_rf_name(u8 type)
+{
+        if (type & 0xf0)
+                type = 0;
+        return rfs[type];
+}
+void zd_rf_init(struct zd_rf *rf)
+{
+        memset(rf, 0, sizeof(*rf));
+}
+void zd_rf_clear(struct zd_rf *rf)
+{
+        memset(rf, 0, sizeof(*rf));
+}
+int zd_rf_init_hw(struct zd_rf *rf, u8 type)
+{
+        int r, t;
+        struct zd_chip *chip = zd_rf_to_chip(rf);
+        ZD_ASSERT(mutex_is_locked(&chip->mutex));
+        switch (type) {
+        case RF2959_RF:
+                r = zd_rf_init_rf2959(rf);
+                if (r)
+                        return r;
+                break;
+        case AL2230_RF:
+                r = zd_rf_init_al2230(rf);
+                if (r)
+                        return r;
+                break;
+        default:
+                dev_err(zd_chip_dev(chip),
+                        "RF %s %#x is not supported\n", zd_rf_name(type), type);
+                rf->type = 0;
+                return -ENODEV;
+        }
+        rf->type = type;
+        r = zd_chip_lock_phy_regs(chip);
+        if (r)
+                return r;
+        t = rf->init_hw(rf);
+        r = zd_chip_unlock_phy_regs(chip);
+        if (t)
+                r = t;
+        return r;
+}
+int zd_rf_scnprint_id(struct zd_rf *rf, char *buffer, size_t size)
+{
+        return scnprintf(buffer, size, "%s", zd_rf_name(rf->type));
+}
+int zd_rf_set_channel(struct zd_rf *rf, u8 channel)
+{
+        int r;
+        ZD_ASSERT(mutex_is_locked(&zd_rf_to_chip(rf)->mutex));
+        if (channel < MIN_CHANNEL24)
+                return -EINVAL;
+        if (channel > MAX_CHANNEL24)
+                return -EINVAL;
+        dev_dbg_f(zd_chip_dev(zd_rf_to_chip(rf)), "channel: %d\n", channel);
+        r = rf->set_channel(rf, channel);
+        if (r >= 0)
+                rf->channel = channel;
+        return r;
+}
+int zd_switch_radio_on(struct zd_rf *rf)
+{
+        int r, t;
+        struct zd_chip *chip = zd_rf_to_chip(rf);
+        ZD_ASSERT(mutex_is_locked(&chip->mutex));
+        r = zd_chip_lock_phy_regs(chip);
+        if (r)
+                return r;
+        t = rf->switch_radio_on(rf);
+        r = zd_chip_unlock_phy_regs(chip);
+        if (t)
+                r = t;
+        return r;
+}
+int zd_switch_radio_off(struct zd_rf *rf)
+{
+        int r, t;
+        struct zd_chip *chip = zd_rf_to_chip(rf);
+        /* TODO: move phy regs handling to zd_chip */
+        ZD_ASSERT(mutex_is_locked(&chip->mutex));
+        r = zd_chip_lock_phy_regs(chip);
+        if (r)
+                return r;
+        t = rf->switch_radio_off(rf);
+        r = zd_chip_unlock_phy_regs(chip);
+        if (t)
+                r = t;
+        return r;
+}
diff --git a/drivers/net/wireless/zd1211rw/zd_rf.h b/drivers/net/wireless/zd1211rw/zd_rf.h
new file mode 100644
index 000000000000..ea30f693fcc8
--- /dev/null
+++ b/drivers/net/wireless/zd1211rw/zd_rf.h
@@ -0,0 +1,82 @@
+/* zd_rf.h
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#ifndef _ZD_RF_H
+#define _ZD_RF_H
+#include "zd_types.h"
+#define UW2451_RF                       0x2
+#define UCHIP_RF                        0x3
+#define AL2230_RF                       0x4
+#define AL7230B_RF                      0x5     /* a,b,g */
+#define THETA_RF                        0x6
+#define AL2210_RF                       0x7
+#define MAXIM_NEW_RF                    0x8
+#define UW2453_RF                       0x9
+#define AL2230S_RF                      0xa
+#define RALINK_RF                       0xb
+#define INTERSIL_RF                     0xc
+#define RF2959_RF                       0xd
+#define MAXIM_NEW2_RF                   0xe
+#define PHILIPS_RF                      0xf
+#define RF_CHANNEL(ch) [(ch)-1]
+/* Provides functions of the RF transceiver. */
+enum {
+        RF_REG_BITS = 6,
+        RF_VALUE_BITS = 18,
+        RF_RV_BITS = RF_REG_BITS + RF_VALUE_BITS,
+};
+struct zd_rf {
+        u8 type;
+        u8 channel;
+        /*
+         * Whether this RF should patch the 6M band edge
+         * (assuming E2P_POD agrees)
+         */
+        u8 patch_6m_band_edge:1;
+        /* RF-specific functions */
+        int (*init_hw)(struct zd_rf *rf);
+        int (*set_channel)(struct zd_rf *rf, u8 channel);
+        int (*switch_radio_on)(struct zd_rf *rf);
+        int (*switch_radio_off)(struct zd_rf *rf);
+};
+const char *zd_rf_name(u8 type);
+void zd_rf_init(struct zd_rf *rf);
+void zd_rf_clear(struct zd_rf *rf);
+int zd_rf_init_hw(struct zd_rf *rf, u8 type);
+int zd_rf_scnprint_id(struct zd_rf *rf, char *buffer, size_t size);
+int zd_rf_set_channel(struct zd_rf *rf, u8 channel);
+int zd_switch_radio_on(struct zd_rf *rf);
+int zd_switch_radio_off(struct zd_rf *rf);
+/* Functions for individual RF chips */
+int zd_rf_init_rf2959(struct zd_rf *rf);
+int zd_rf_init_al2230(struct zd_rf *rf);
+#endif /* _ZD_RF_H */
diff --git a/drivers/net/wireless/zd1211rw/zd_rf_al2230.c b/drivers/net/wireless/zd1211rw/zd_rf_al2230.c
new file mode 100644
index 000000000000..0948b25f660d
--- /dev/null
+++ b/drivers/net/wireless/zd1211rw/zd_rf_al2230.c
@@ -0,0 +1,308 @@
+/* zd_rf_al2230.c: Functions for the AL2230 RF controller
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#include <linux/kernel.h>
+#include "zd_rf.h"
+#include "zd_usb.h"
+#include "zd_chip.h"
+static const u32 al2230_table[][3] = {
+        RF_CHANNEL( 1) = { 0x03f790, 0x033331, 0x00000d, },
+        RF_CHANNEL( 2) = { 0x03f790, 0x0b3331, 0x00000d, },
+        RF_CHANNEL( 3) = { 0x03e790, 0x033331, 0x00000d, },
+        RF_CHANNEL( 4) = { 0x03e790, 0x0b3331, 0x00000d, },
+        RF_CHANNEL( 5) = { 0x03f7a0, 0x033331, 0x00000d, },
+        RF_CHANNEL( 6) = { 0x03f7a0, 0x0b3331, 0x00000d, },
+        RF_CHANNEL( 7) = { 0x03e7a0, 0x033331, 0x00000d, },
+        RF_CHANNEL( 8) = { 0x03e7a0, 0x0b3331, 0x00000d, },
+        RF_CHANNEL( 9) = { 0x03f7b0, 0x033331, 0x00000d, },
+        RF_CHANNEL(10) = { 0x03f7b0, 0x0b3331, 0x00000d, },
+        RF_CHANNEL(11) = { 0x03e7b0, 0x033331, 0x00000d, },
+        RF_CHANNEL(12) = { 0x03e7b0, 0x0b3331, 0x00000d, },
+        RF_CHANNEL(13) = { 0x03f7c0, 0x033331, 0x00000d, },
+        RF_CHANNEL(14) = { 0x03e7c0, 0x066661, 0x00000d, },
+};
+static int zd1211_al2230_init_hw(struct zd_rf *rf)
+{
+        int r;
+        struct zd_chip *chip = zd_rf_to_chip(rf);
+        static const struct zd_ioreq16 ioreqs[] = {
+                { CR15,   0x20 }, { CR23,   0x40 }, { CR24,  0x20 },
+                { CR26,   0x11 }, { CR28,   0x3e }, { CR29,  0x00 },
+                { CR44,   0x33 }, { CR106,  0x2a }, { CR107, 0x1a },
+                { CR109,  0x09 }, { CR110,  0x27 }, { CR111, 0x2b },
+                { CR112,  0x2b }, { CR119,  0x0a }, { CR10,  0x89 },
+                /* for newest (3rd cut) AL2300 */
+                { CR17,   0x28 },
+                { CR26,   0x93 }, { CR34,   0x30 },
+                /* for newest (3rd cut) AL2300 */
+                { CR35,   0x3e },
+                { CR41,   0x24 }, { CR44,   0x32 },
+                /* for newest (3rd cut) AL2300 */
+                { CR46,   0x96 },
+                { CR47,   0x1e }, { CR79,   0x58 }, { CR80,  0x30 },
+                { CR81,   0x30 }, { CR87,   0x0a }, { CR89,  0x04 },
+                { CR92,   0x0a }, { CR99,   0x28 }, { CR100, 0x00 },
+                { CR101,  0x13 }, { CR102,  0x27 }, { CR106, 0x24 },
+                { CR107,  0x2a }, { CR109,  0x09 }, { CR110, 0x13 },
+                { CR111,  0x1f }, { CR112,  0x1f }, { CR113, 0x27 },
+                { CR114,  0x27 },
+                /* for newest (3rd cut) AL2300 */
+                { CR115,  0x24 },
+                { CR116,  0x24 }, { CR117,  0xf4 }, { CR118, 0xfc },
+                { CR119,  0x10 }, { CR120,  0x4f }, { CR121, 0x77 },
+                { CR122,  0xe0 }, { CR137,  0x88 }, { CR252, 0xff },
+                { CR253,  0xff },
+                /* These following happen separately in the vendor driver */
+                { },
+                /* shdnb(PLL_ON)=0 */
+                { CR251,  0x2f },
+                /* shdnb(PLL_ON)=1 */
+                { CR251,  0x3f },
+                { CR138,  0x28 }, { CR203,  0x06 },
+        };
+        static const u32 rv[] = {
+                /* Channel 1 */
+                0x03f790,
+                0x033331,
+                0x00000d,
+                0x0b3331,
+                0x03b812,
+                0x00fff3,
+                0x000da4,
+                0x0f4dc5, /* fix freq shift, 0x04edc5 */
+                0x0805b6,
+                0x011687,
+                0x000688,
+                0x0403b9, /* external control TX power (CR31) */
+                0x00dbba,
+                0x00099b,
+                0x0bdffc,
+                0x00000d,
+                0x00500f,
+                /* These writes happen separately in the vendor driver */
+                0x00d00f,
+                0x004c0f,
+                0x00540f,
+                0x00700f,
+                0x00500f,
+        };
+        r = zd_iowrite16a_locked(chip, ioreqs, ARRAY_SIZE(ioreqs));
+        if (r)
+                return r;
+        r = zd_rfwritev_locked(chip, rv, ARRAY_SIZE(rv), RF_RV_BITS);
+        if (r)
+                return r;
+        return 0;
+}
+static int zd1211b_al2230_init_hw(struct zd_rf *rf)
+{
+        int r;
+        struct zd_chip *chip = zd_rf_to_chip(rf);
+        static const struct zd_ioreq16 ioreqs1[] = {
+                { CR10,  0x89 }, { CR15,  0x20 },
+                { CR17,  0x2B }, /* for newest(3rd cut) AL2230 */
+                { CR23,  0x40 }, { CR24,  0x20 }, { CR26,  0x93 },
+                { CR28,  0x3e }, { CR29,  0x00 },
+                { CR33,  0x28 }, /* 5621 */
+                { CR34,  0x30 },
+                { CR35,  0x3e }, /* for newest(3rd cut) AL2230 */
+                { CR41,  0x24 }, { CR44,  0x32 },
+                { CR46,  0x99 }, /* for newest(3rd cut) AL2230 */
+                { CR47,  0x1e },
+                /* ZD1211B 05.06.10 */
+                { CR48,  0x00 }, { CR49,  0x00 }, { CR51,  0x01 },
+                { CR52,  0x80 }, { CR53,  0x7e }, { CR65,  0x00 },
+                { CR66,  0x00 }, { CR67,  0x00 }, { CR68,  0x00 },
+                { CR69,  0x28 },
+                { CR79,  0x58 }, { CR80,  0x30 }, { CR81,  0x30 },
+                { CR87,  0x0a }, { CR89,  0x04 },
+                { CR91,  0x00 }, /* 5621 */
+                { CR92,  0x0a },
+                { CR98,  0x8d }, /* 4804,  for 1212 new algorithm */
+                { CR99,  0x00 }, /* 5621 */
+                { CR101, 0x13 }, { CR102, 0x27 },
+                { CR106, 0x24 }, /* for newest(3rd cut) AL2230 */
+                { CR107, 0x2a },
+                { CR109, 0x13 }, /* 4804, for 1212 new algorithm */
+                { CR110, 0x1f }, /* 4804, for 1212 new algorithm */
+                { CR111, 0x1f }, { CR112, 0x1f }, { CR113, 0x27 },
+                { CR114, 0x27 },
+                { CR115, 0x26 }, /* 24->26 at 4902 for newest(3rd cut) AL2230 */
+                { CR116, 0x24 },
+                { CR117, 0xfa }, /* for 1211b */
+                { CR118, 0xfa }, /* for 1211b */
+                { CR119, 0x10 },
+                { CR120, 0x4f },
+                { CR121, 0x6c }, /* for 1211b */
+                { CR122, 0xfc }, /* E0->FC at 4902 */
+                { CR123, 0x57 }, /* 5623 */
+                { CR125, 0xad }, /* 4804, for 1212 new algorithm */
+                { CR126, 0x6c }, /* 5614 */
+                { CR127, 0x03 }, /* 4804, for 1212 new algorithm */
+                { CR137, 0x50 }, /* 5614 */
+                { CR138, 0xa8 },
+                { CR144, 0xac }, /* 5621 */
+                { CR150, 0x0d }, { CR252, 0x00 }, { CR253, 0x00 },
+        };
+        static const u32 rv1[] = {
+                /* channel 1 */
+                0x03f790,
+                0x033331,
+                0x00000d,
+                0x0b3331,
+                0x03b812,
+                0x00fff3,
+                0x0005a4,
+                0x0f4dc5, /* fix freq shift 0x044dc5 */
+                0x0805b6,
+                0x0146c7,
+                0x000688,
+                0x0403b9, /* External control TX power (CR31) */
+                0x00dbba,
+                0x00099b,
+                0x0bdffc,
+                0x00000d,
+                0x00580f,
+        };
+        static const struct zd_ioreq16 ioreqs2[] = {
+                { CR47,  0x1e }, { CR_RFCFG, 0x03 },
+        };
+        static const u32 rv2[] = {
+                0x00880f,
+                0x00080f,
+        };
+        static const struct zd_ioreq16 ioreqs3[] = {
+                { CR_RFCFG, 0x00 }, { CR47, 0x1e }, { CR251, 0x7f },
+        };
+        static const u32 rv3[] = {
+                0x00d80f,
+                0x00780f,
+                0x00580f,
+        };
+        static const struct zd_ioreq16 ioreqs4[] = {
+                { CR138, 0x28 }, { CR203, 0x06 },
+        };
+        r = zd_iowrite16a_locked(chip, ioreqs1, ARRAY_SIZE(ioreqs1));
+        if (r)
+                return r;
+        r = zd_rfwritev_locked(chip, rv1, ARRAY_SIZE(rv1), RF_RV_BITS);
+        if (r)
+                return r;
+        r = zd_iowrite16a_locked(chip, ioreqs2, ARRAY_SIZE(ioreqs2));
+        if (r)
+                return r;
+        r = zd_rfwritev_locked(chip, rv2, ARRAY_SIZE(rv2), RF_RV_BITS);
+        if (r)
+                return r;
+        r = zd_iowrite16a_locked(chip, ioreqs3, ARRAY_SIZE(ioreqs3));
+        if (r)
+                return r;
+        r = zd_rfwritev_locked(chip, rv3, ARRAY_SIZE(rv3), RF_RV_BITS);
+        if (r)
+                return r;
+        return zd_iowrite16a_locked(chip, ioreqs4, ARRAY_SIZE(ioreqs4));
+}
+static int al2230_set_channel(struct zd_rf *rf, u8 channel)
+{
+        int r;
+        const u32 *rv = al2230_table[channel-1];
+        struct zd_chip *chip = zd_rf_to_chip(rf);
+        static const struct zd_ioreq16 ioreqs[] = {
+                { CR138, 0x28 },
+                { CR203, 0x06 },
+        };
+        r = zd_rfwritev_locked(chip, rv, 3, RF_RV_BITS);
+        if (r)
+                return r;
+        return zd_iowrite16a_locked(chip, ioreqs, ARRAY_SIZE(ioreqs));
+}
+static int zd1211_al2230_switch_radio_on(struct zd_rf *rf)
+{
+        struct zd_chip *chip = zd_rf_to_chip(rf);
+        static const struct zd_ioreq16 ioreqs[] = {
+                { CR11,  0x00 },
+                { CR251, 0x3f },
+        };
+        return zd_iowrite16a_locked(chip, ioreqs, ARRAY_SIZE(ioreqs));
+}
+static int zd1211b_al2230_switch_radio_on(struct zd_rf *rf)
+{
+        struct zd_chip *chip = zd_rf_to_chip(rf);
+        static const struct zd_ioreq16 ioreqs[] = {
+                { CR11,  0x00 },
+                { CR251, 0x7f },
+        };
+        return zd_iowrite16a_locked(chip, ioreqs, ARRAY_SIZE(ioreqs));
+}
+static int al2230_switch_radio_off(struct zd_rf *rf)
+{
+        struct zd_chip *chip = zd_rf_to_chip(rf);
+        static const struct zd_ioreq16 ioreqs[] = {
+                { CR11,  0x04 },
+                { CR251, 0x2f },
+        };
+        return zd_iowrite16a_locked(chip, ioreqs, ARRAY_SIZE(ioreqs));
+}
+int zd_rf_init_al2230(struct zd_rf *rf)
+{
+        struct zd_chip *chip = zd_rf_to_chip(rf);
+        rf->set_channel = al2230_set_channel;
+        rf->switch_radio_off = al2230_switch_radio_off;
+        if (chip->is_zd1211b) {
+                rf->init_hw = zd1211b_al2230_init_hw;
+                rf->switch_radio_on = zd1211b_al2230_switch_radio_on;
+        } else {
+                rf->init_hw = zd1211_al2230_init_hw;
+                rf->switch_radio_on = zd1211_al2230_switch_radio_on;
+        }
+        rf->patch_6m_band_edge = 1;
+        return 0;
+}
diff --git a/drivers/net/wireless/zd1211rw/zd_rf_rf2959.c b/drivers/net/wireless/zd1211rw/zd_rf_rf2959.c
new file mode 100644
index 000000000000..58247271cc24
--- /dev/null
+++ b/drivers/net/wireless/zd1211rw/zd_rf_rf2959.c
@@ -0,0 +1,279 @@
+/* zd_rf_rfmd.c: Functions for the RFMD RF controller
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#include <linux/kernel.h>
+#include "zd_rf.h"
+#include "zd_usb.h"
+#include "zd_chip.h"
+static u32 rf2959_table[][2] = {
+        RF_CHANNEL( 1) = { 0x181979, 0x1e6666 },
+        RF_CHANNEL( 2) = { 0x181989, 0x1e6666 },
+        RF_CHANNEL( 3) = { 0x181999, 0x1e6666 },
+        RF_CHANNEL( 4) = { 0x1819a9, 0x1e6666 },
+        RF_CHANNEL( 5) = { 0x1819b9, 0x1e6666 },
+        RF_CHANNEL( 6) = { 0x1819c9, 0x1e6666 },
+        RF_CHANNEL( 7) = { 0x1819d9, 0x1e6666 },
+        RF_CHANNEL( 8) = { 0x1819e9, 0x1e6666 },
+        RF_CHANNEL( 9) = { 0x1819f9, 0x1e6666 },
+        RF_CHANNEL(10) = { 0x181a09, 0x1e6666 },
+        RF_CHANNEL(11) = { 0x181a19, 0x1e6666 },
+        RF_CHANNEL(12) = { 0x181a29, 0x1e6666 },
+        RF_CHANNEL(13) = { 0x181a39, 0x1e6666 },
+        RF_CHANNEL(14) = { 0x181a60, 0x1c0000 },
+};
+#if 0
+static int bits(u32 rw, int from, int to)
+{
+        rw &= ~(0xffffffffU << (to+1));
+        rw >>= from;
+        return rw;
+}
+static int bit(u32 rw, int bit)
+{
+        return bits(rw, bit, bit);
+}
+static void dump_regwrite(u32 rw)
+{
+        int reg = bits(rw, 18, 22);
+        int rw_flag = bits(rw, 23, 23);
+        PDEBUG("rf2959 %#010x reg %d rw %d", rw, reg, rw_flag);
+        switch (reg) {
+        case 0:
+                PDEBUG("reg0 CFG1 ref_sel %d hybernate %d rf_vco_reg_en %d"
+                       " if_vco_reg_en %d if_vga_en %d",
+                       bits(rw, 14, 15), bit(rw, 3), bit(rw, 2), bit(rw, 1),
+                       bit(rw, 0));
+                break;
+        case 1:
+                PDEBUG("reg1 IFPLL1 pll_en1 %d kv_en1 %d vtc_en1 %d lpf1 %d"
+                       " cpl1 %d pdp1 %d autocal_en1 %d ld_en1 %d ifloopr %d"
+                       " ifloopc %d dac1 %d",
+                       bit(rw, 17), bit(rw, 16), bit(rw, 15), bit(rw, 14),
+                       bit(rw, 13), bit(rw, 12), bit(rw, 11), bit(rw, 10),
+                       bits(rw, 7, 9), bits(rw, 4, 6), bits(rw, 0, 3));
+                break;
+        case 2:
+                PDEBUG("reg2 IFPLL2 n1 %d num1 %d",
+                       bits(rw, 6, 17), bits(rw, 0, 5));
+                break;
+        case 3:
+                PDEBUG("reg3 IFPLL3 num %d", bits(rw, 0, 17));
+                break;
+        case 4:
+                PDEBUG("reg4 IFPLL4 dn1 %#04x ct_def1 %d kv_def1 %d",
+                       bits(rw, 8, 16), bits(rw, 4, 7), bits(rw, 0, 3));
+                break;
+        case 5:
+                PDEBUG("reg5 RFPLL1 pll_en %d kv_en %d vtc_en %d lpf %d cpl %d"
+                       " pdp %d autocal_en %d ld_en %d rfloopr %d rfloopc %d"
+                       " dac %d",
+                       bit(rw, 17), bit(rw, 16), bit(rw, 15), bit(rw, 14),
+                       bit(rw, 13), bit(rw, 12), bit(rw, 11), bit(rw, 10),
+                       bits(rw, 7, 9), bits(rw, 4, 6), bits(rw, 0,3));
+                break;
+        case 6:
+                PDEBUG("reg6 RFPLL2 n %d num %d",
+                       bits(rw, 6, 17), bits(rw, 0, 5));
+                break;
+        case 7:
+                PDEBUG("reg7 RFPLL3 num2 %d", bits(rw, 0, 17));
+                break;
+        case 8:
+                PDEBUG("reg8 RFPLL4 dn %#06x ct_def %d kv_def %d",
+                       bits(rw, 8, 16), bits(rw, 4, 7), bits(rw, 0, 3));
+                break;
+        case 9:
+                PDEBUG("reg9 CAL1 tvco %d tlock %d m_ct_value %d ld_window %d",
+                       bits(rw, 13, 17), bits(rw, 8, 12), bits(rw, 3, 7),
+                       bits(rw, 0, 2));
+                break;
+        case 10:
+                PDEBUG("reg10 TXRX1 rxdcfbbyps %d pcontrol %d txvgc %d"
+                       " rxlpfbw %d txlpfbw %d txdiffmode %d txenmode %d"
+                       " intbiasen %d tybypass %d",
+                       bit(rw, 17), bits(rw, 15, 16), bits(rw, 10, 14),
+                       bits(rw, 7, 9), bits(rw, 4, 6), bit(rw, 3), bit(rw, 2),
+                       bit(rw, 1), bit(rw, 0));
+                break;
+        case 11:
+                PDEBUG("reg11 PCNT1 mid_bias %d p_desired %d pc_offset %d"
+                        " tx_delay %d",
+                        bits(rw, 15, 17), bits(rw, 9, 14), bits(rw, 3, 8),
+                        bits(rw, 0, 2));
+                break;
+        case 12:
+                PDEBUG("reg12 PCNT2 max_power %d mid_power %d min_power %d",
+                       bits(rw, 12, 17), bits(rw, 6, 11), bits(rw, 0, 5));
+                break;
+        case 13:
+                PDEBUG("reg13 VCOT1 rfpll vco comp %d ifpll vco comp %d"
+                       " lobias %d if_biasbuf %d if_biasvco %d rf_biasbuf %d"
+                       " rf_biasvco %d",
+                       bit(rw, 17), bit(rw, 16), bit(rw, 15),
+                       bits(rw, 8, 9), bits(rw, 5, 7), bits(rw, 3, 4),
+                       bits(rw, 0, 2));
+                break;
+        case 14:
+                PDEBUG("reg14 IQCAL rx_acal %d rx_pcal %d"
+                       " tx_acal %d tx_pcal %d",
+                       bits(rw, 13, 17), bits(rw, 9, 12), bits(rw, 4, 8),
+                       bits(rw, 0, 3));
+                break;
+        }
+}
+#endif /* 0 */
+static int rf2959_init_hw(struct zd_rf *rf)
+{
+        int r;
+        struct zd_chip *chip = zd_rf_to_chip(rf);
+        static const struct zd_ioreq16 ioreqs[] = {
+                { CR2,   0x1E }, { CR9,   0x20 }, { CR10,  0x89 },
+                { CR11,  0x00 }, { CR15,  0xD0 }, { CR17,  0x68 },
+                { CR19,  0x4a }, { CR20,  0x0c }, { CR21,  0x0E },
+                { CR23,  0x48 },
+                /* normal size for cca threshold */
+                { CR24,  0x14 },
+                /* { CR24,  0x20 }, */
+                { CR26,  0x90 }, { CR27,  0x30 }, { CR29,  0x20 },
+                { CR31,  0xb2 }, { CR32,  0x43 }, { CR33,  0x28 },
+                { CR38,  0x30 }, { CR34,  0x0f }, { CR35,  0xF0 },
+                { CR41,  0x2a }, { CR46,  0x7F }, { CR47,  0x1E },
+                { CR51,  0xc5 }, { CR52,  0xc5 }, { CR53,  0xc5 },
+                { CR79,  0x58 }, { CR80,  0x30 }, { CR81,  0x30 },
+                { CR82,  0x00 }, { CR83,  0x24 }, { CR84,  0x04 },
+                { CR85,  0x00 }, { CR86,  0x10 }, { CR87,  0x2A },
+                { CR88,  0x10 }, { CR89,  0x24 }, { CR90,  0x18 },
+                /* { CR91,  0x18 }, */
+                /* should solve continous CTS frame problems */
+                { CR91,  0x00 },
+                { CR92,  0x0a }, { CR93,  0x00 }, { CR94,  0x01 },
+                { CR95,  0x00 }, { CR96,  0x40 }, { CR97,  0x37 },
+                { CR98,  0x05 }, { CR99,  0x28 }, { CR100, 0x00 },
+                { CR101, 0x13 }, { CR102, 0x27 }, { CR103, 0x27 },
+                { CR104, 0x18 }, { CR105, 0x12 },
+                /* normal size */
+                { CR106, 0x1a },
+                /* { CR106, 0x22 }, */
+                { CR107, 0x24 }, { CR108, 0x0a }, { CR109, 0x13 },
+                { CR110, 0x2F }, { CR111, 0x27 }, { CR112, 0x27 },
+                { CR113, 0x27 }, { CR114, 0x27 }, { CR115, 0x40 },
+                { CR116, 0x40 }, { CR117, 0xF0 }, { CR118, 0xF0 },
+                { CR119, 0x16 },
+                /* no TX continuation */
+                { CR122, 0x00 },
+                /* { CR122, 0xff }, */
+                { CR127, 0x03 }, { CR131, 0x08 }, { CR138, 0x28 },
+                { CR148, 0x44 }, { CR150, 0x10 }, { CR169, 0xBB },
+                { CR170, 0xBB },
+        };
+        static const u32 rv[] = {
+                0x000007,  /* REG0(CFG1) */
+                0x07dd43,  /* REG1(IFPLL1) */
+                0x080959,  /* REG2(IFPLL2) */
+                0x0e6666,
+                0x116a57,  /* REG4 */
+                0x17dd43,  /* REG5 */
+                0x1819f9,  /* REG6 */
+                0x1e6666,
+                0x214554,
+                0x25e7fa,
+                0x27fffa,
+                /* The Zydas driver somehow forgets to set this value. It's
+                 * only set for Japan. We are using internal power control
+                 * for now.
+                 */
+                0x294128, /* internal power */
+                /* 0x28252c, */ /* External control TX power */
+                /* CR31_CCK, CR51_6-36M, CR52_48M, CR53_54M */
+                0x2c0000,
+                0x300000,
+                0x340000,  /* REG13(0xD) */
+                0x381e0f,  /* REG14(0xE) */
+                /* Bogus, RF2959's data sheet doesn't know register 27, which is
+                 * actually referenced here. The commented 0x11 is 17.
+                 */
+                0x6c180f,  /* REG27(0x11) */
+        };
+        r = zd_iowrite16a_locked(chip, ioreqs, ARRAY_SIZE(ioreqs));
+        if (r)
+                return r;
+        return zd_rfwritev_locked(chip, rv, ARRAY_SIZE(rv), RF_RV_BITS);
+}
+static int rf2959_set_channel(struct zd_rf *rf, u8 channel)
+{
+        int i, r;
+        u32 *rv = rf2959_table[channel-1];
+        struct zd_chip *chip = zd_rf_to_chip(rf);
+        for (i = 0; i < 2; i++) {
+                r = zd_rfwrite_locked(chip, rv[i], RF_RV_BITS);
+                if (r)
+                        return r;
+        }
+        return 0;
+}
+static int rf2959_switch_radio_on(struct zd_rf *rf)
+{
+        static const struct zd_ioreq16 ioreqs[] = {
+                { CR10, 0x89 },
+                { CR11, 0x00 },
+        };
+        struct zd_chip *chip = zd_rf_to_chip(rf);
+        return zd_iowrite16a_locked(chip, ioreqs, ARRAY_SIZE(ioreqs));
+}
+static int rf2959_switch_radio_off(struct zd_rf *rf)
+{
+        static const struct zd_ioreq16 ioreqs[] = {
+                { CR10, 0x15 },
+                { CR11, 0x81 },
+        };
+        struct zd_chip *chip = zd_rf_to_chip(rf);
+        return zd_iowrite16a_locked(chip, ioreqs, ARRAY_SIZE(ioreqs));
+}
+int zd_rf_init_rf2959(struct zd_rf *rf)
+{
+        struct zd_chip *chip = zd_rf_to_chip(rf);
+        if (chip->is_zd1211b) {
+                dev_err(zd_chip_dev(chip),
+                       "RF2959 is currently not supported for ZD1211B"
+                       " devices\n");
+                return -ENODEV;
+        }
+        rf->init_hw = rf2959_init_hw;
+        rf->set_channel = rf2959_set_channel;
+        rf->switch_radio_on = rf2959_switch_radio_on;
+        rf->switch_radio_off = rf2959_switch_radio_off;
+        return 0;
+}
diff --git a/drivers/net/wireless/zd1211rw/zd_types.h b/drivers/net/wireless/zd1211rw/zd_types.h
new file mode 100644
index 000000000000..0155a1584ed3
--- /dev/null
+++ b/drivers/net/wireless/zd1211rw/zd_types.h
@@ -0,0 +1,71 @@
+/* zd_types.h
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#ifndef _ZD_TYPES_H
+#define _ZD_TYPES_H
+#include <linux/types.h>
+/* We have three register spaces mapped into the overall USB address space of
+ * 64K words (16-bit values). There is the control register space of
+ * double-word registers, the eeprom register space and the firmware register
+ * space. The control register space is byte mapped, the others are word
+ * mapped.
+ *
+ * For that reason, we are using byte offsets for control registers and word
+ * offsets for everything else.
+ */
+typedef u32 __nocast zd_addr_t;
+enum {
+        ADDR_BASE_MASK          = 0xff000000,
+        ADDR_OFFSET_MASK        = 0x0000ffff,
+        ADDR_ZERO_MASK          = 0x00ff0000,
+        NULL_BASE               = 0x00000000,
+        USB_BASE                = 0x01000000,
+        CR_BASE                 = 0x02000000,
+        CR_MAX_OFFSET           = 0x0b30,
+        E2P_BASE                = 0x03000000,
+        E2P_MAX_OFFSET          = 0x007e,
+        FW_BASE                 = 0x04000000,
+        FW_MAX_OFFSET           = 0x0005,
+};
+#define ZD_ADDR_BASE(addr) ((u32)(addr) & ADDR_BASE_MASK)
+#define ZD_OFFSET(addr) ((u32)(addr) & ADDR_OFFSET_MASK)
+#define ZD_ADDR(base, offset) \
+        ((zd_addr_t)(((base) & ADDR_BASE_MASK) | ((offset) & ADDR_OFFSET_MASK)))
+#define ZD_NULL_ADDR    ((zd_addr_t)0)
+#define USB_REG(offset)  ZD_ADDR(USB_BASE, offset)      /* word addressing */
+#define CTL_REG(offset)  ZD_ADDR(CR_BASE, offset)       /* byte addressing */
+#define E2P_REG(offset)  ZD_ADDR(E2P_BASE, offset)      /* word addressing */
+#define FW_REG(offset)   ZD_ADDR(FW_BASE, offset)       /* word addressing */
+static inline zd_addr_t zd_inc_word(zd_addr_t addr)
+{
+        u32 base = ZD_ADDR_BASE(addr);
+        u32 offset = ZD_OFFSET(addr);
+        offset += base == CR_BASE ? 2 : 1;
+        return base | offset;
+}
+#endif /* _ZD_TYPES_H */
diff --git a/drivers/net/wireless/zd1211rw/zd_usb.c b/drivers/net/wireless/zd1211rw/zd_usb.c
new file mode 100644
index 000000000000..ce1cb2c6aa8d
--- /dev/null
+++ b/drivers/net/wireless/zd1211rw/zd_usb.c
@@ -0,0 +1,1316 @@
+/* zd_usb.c
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#include <asm/unaligned.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/firmware.h>
+#include <linux/device.h>
+#include <linux/errno.h>
+#include <linux/skbuff.h>
+#include <linux/usb.h>
+#include <net/ieee80211.h>
+#include "zd_def.h"
+#include "zd_netdev.h"
+#include "zd_mac.h"
+#include "zd_usb.h"
+#include "zd_util.h"
+static struct usb_device_id usb_ids[] = {
+        /* ZD1211 */
+        { USB_DEVICE(0x0ace, 0x1211), .driver_info = DEVICE_ZD1211 },
+        { USB_DEVICE(0x07b8, 0x6001), .driver_info = DEVICE_ZD1211 },
+        { USB_DEVICE(0x126f, 0xa006), .driver_info = DEVICE_ZD1211 },
+        { USB_DEVICE(0x6891, 0xa727), .driver_info = DEVICE_ZD1211 },
+        { USB_DEVICE(0x0df6, 0x9071), .driver_info = DEVICE_ZD1211 },
+        { USB_DEVICE(0x157e, 0x300b), .driver_info = DEVICE_ZD1211 },
+        /* ZD1211B */
+        { USB_DEVICE(0x0ace, 0x1215), .driver_info = DEVICE_ZD1211B },
+        { USB_DEVICE(0x157e, 0x300d), .driver_info = DEVICE_ZD1211B },
+        {}
+};
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("USB driver for devices with the ZD1211 chip.");
+MODULE_AUTHOR("Ulrich Kunitz");
+MODULE_AUTHOR("Daniel Drake");
+MODULE_VERSION("1.0");
+MODULE_DEVICE_TABLE(usb, usb_ids);
+#define FW_ZD1211_PREFIX        "zd1211/zd1211_"
+#define FW_ZD1211B_PREFIX       "zd1211/zd1211b_"
+/* register address handling */
+#ifdef DEBUG
+static int check_addr(struct zd_usb *usb, zd_addr_t addr)
+{
+        u32 base = ZD_ADDR_BASE(addr);
+        u32 offset = ZD_OFFSET(addr);
+        if ((u32)addr & ADDR_ZERO_MASK)
+                goto invalid_address;
+        switch (base) {
+        case USB_BASE:
+                break;
+        case CR_BASE:
+                if (offset > CR_MAX_OFFSET) {
+                        dev_dbg(zd_usb_dev(usb),
+                                "CR offset %#010x larger than"
+                                " CR_MAX_OFFSET %#10x\n",
+                                offset, CR_MAX_OFFSET);
+                        goto invalid_address;
+                }
+                if (offset & 1) {
+                        dev_dbg(zd_usb_dev(usb),
+                                "CR offset %#010x is not a multiple of 2\n",
+                                offset);
+                        goto invalid_address;
+                }
+                break;
+        case E2P_BASE:
+                if (offset > E2P_MAX_OFFSET) {
+                        dev_dbg(zd_usb_dev(usb),
+                                "E2P offset %#010x larger than"
+                                " E2P_MAX_OFFSET %#010x\n",
+                                offset, E2P_MAX_OFFSET);
+                        goto invalid_address;
+                }
+                break;
+        case FW_BASE:
+                if (!usb->fw_base_offset) {
+                        dev_dbg(zd_usb_dev(usb),
+                               "ERROR: fw base offset has not been set\n");
+                        return -EAGAIN;
+                }
+                if (offset > FW_MAX_OFFSET) {
+                        dev_dbg(zd_usb_dev(usb),
+                                "FW offset %#10x is larger than"
+                                " FW_MAX_OFFSET %#010x\n",
+                                offset, FW_MAX_OFFSET);
+                        goto invalid_address;
+                }
+                break;
+        default:
+                dev_dbg(zd_usb_dev(usb),
+                        "address has unsupported base %#010x\n", addr);
+                goto invalid_address;
+        }
+        return 0;
+invalid_address:
+        dev_dbg(zd_usb_dev(usb),
+                "ERROR: invalid address: %#010x\n", addr);
+        return -EINVAL;
+}
+#endif /* DEBUG */
+static u16 usb_addr(struct zd_usb *usb, zd_addr_t addr)
+{
+        u32 base;
+        u16 offset;
+        base = ZD_ADDR_BASE(addr);
+        offset = ZD_OFFSET(addr);
+        ZD_ASSERT(check_addr(usb, addr) == 0);
+        switch (base) {
+        case CR_BASE:
+                offset += CR_BASE_OFFSET;
+                break;
+        case E2P_BASE:
+                offset += E2P_BASE_OFFSET;
+                break;
+        case FW_BASE:
+                offset += usb->fw_base_offset;
+                break;
+        }
+        return offset;
+}
+/* USB device initialization */
+static int request_fw_file(
+        const struct firmware **fw, const char *name, struct device *device)
+{
+        int r;
+        dev_dbg_f(device, "fw name %s\n", name);
+        r = request_firmware(fw, name, device);
+        if (r)
+                dev_err(device,
+                       "Could not load firmware file %s. Error number %d\n",
+                       name, r);
+        return r;
+}
+static inline u16 get_bcdDevice(const struct usb_device *udev)
+{
+        return le16_to_cpu(udev->descriptor.bcdDevice);
+}
+enum upload_code_flags {
+        REBOOT = 1,
+};
+/* Ensures that MAX_TRANSFER_SIZE is even. */
+#define MAX_TRANSFER_SIZE (USB_MAX_TRANSFER_SIZE & ~1)
+static int upload_code(struct usb_device *udev,
+        const u8 *data, size_t size, u16 code_offset, int flags)
+{
+        u8 *p;
+        int r;
+        /* USB request blocks need "kmalloced" buffers.
+         */
+        p = kmalloc(MAX_TRANSFER_SIZE, GFP_KERNEL);
+        if (!p) {
+                dev_err(&udev->dev, "out of memory\n");
+                r = -ENOMEM;
+                goto error;
+        }
+        size &= ~1;
+        while (size > 0) {
+                size_t transfer_size = size <= MAX_TRANSFER_SIZE ?
+                        size : MAX_TRANSFER_SIZE;
+                dev_dbg_f(&udev->dev, "transfer size %zu\n", transfer_size);
+                memcpy(p, data, transfer_size);
+                r = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
+                        USB_REQ_FIRMWARE_DOWNLOAD,
+                        USB_DIR_OUT | USB_TYPE_VENDOR,
+                        code_offset, 0, p, transfer_size, 1000 /* ms */);
+                if (r < 0) {
+                        dev_err(&udev->dev,
+                               "USB control request for firmware upload"
+                               " failed. Error number %d\n", r);
+                        goto error;
+                }
+                transfer_size = r & ~1;
+                size -= transfer_size;
+                data += transfer_size;
+                code_offset += transfer_size/sizeof(u16);
+        }
+        if (flags & REBOOT) {
+                u8 ret;
+                r = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
+                        USB_REQ_FIRMWARE_CONFIRM,
+                        USB_DIR_IN | USB_TYPE_VENDOR,
+                        0, 0, &ret, sizeof(ret), 5000 /* ms */);
+                if (r != sizeof(ret)) {
+                        dev_err(&udev->dev,
+                                "control request firmeware confirmation failed."
+                                " Return value %d\n", r);
+                        if (r >= 0)
+                                r = -ENODEV;
+                        goto error;
+                }
+                if (ret & 0x80) {
+                        dev_err(&udev->dev,
+                                "Internal error while downloading."
+                                " Firmware confirm return value %#04x\n",
+                                (unsigned int)ret);
+                        r = -ENODEV;
+                        goto error;
+                }
+                dev_dbg_f(&udev->dev, "firmware confirm return value %#04x\n",
+                        (unsigned int)ret);
+        }
+        r = 0;
+error:
+        kfree(p);
+        return r;
+}
+static u16 get_word(const void *data, u16 offset)
+{
+        const __le16 *p = data;
+        return le16_to_cpu(p[offset]);
+}
+static char *get_fw_name(char *buffer, size_t size, u8 device_type,
+                       const char* postfix)
+{
+        scnprintf(buffer, size, "%s%s",
+                device_type == DEVICE_ZD1211B ?
+                        FW_ZD1211B_PREFIX : FW_ZD1211_PREFIX,
+                postfix);
+        return buffer;
+}
+static int upload_firmware(struct usb_device *udev, u8 device_type)
+{
+        int r;
+        u16 fw_bcdDevice;
+        u16 bcdDevice;
+        const struct firmware *ub_fw = NULL;
+        const struct firmware *uph_fw = NULL;
+        char fw_name[128];
+        bcdDevice = get_bcdDevice(udev);
+        r = request_fw_file(&ub_fw,
+                get_fw_name(fw_name, sizeof(fw_name), device_type,  "ub"),
+                &udev->dev);
+        if (r)
+                goto error;
+        fw_bcdDevice = get_word(ub_fw->data, EEPROM_REGS_OFFSET);
+        /* FIXME: do we have any reason to perform the kludge that the vendor
+         * driver does when there is a version mismatch? (their driver uploads
+         * different firmwares and stuff)
+         */
+        if (fw_bcdDevice != bcdDevice) {
+                dev_info(&udev->dev,
+                        "firmware device id %#06x and actual device id "
+                        "%#06x differ, continuing anyway\n",
+                        fw_bcdDevice, bcdDevice);
+        } else {
+                dev_dbg_f(&udev->dev,
+                        "firmware device id %#06x is equal to the "
+                        "actual device id\n", fw_bcdDevice);
+        }
+        r = request_fw_file(&uph_fw,
+                get_fw_name(fw_name, sizeof(fw_name), device_type, "uphr"),
+                &udev->dev);
+        if (r)
+                goto error;
+        r = upload_code(udev, uph_fw->data, uph_fw->size, FW_START_OFFSET,
+                        REBOOT);
+        if (r) {
+                dev_err(&udev->dev,
+                        "Could not upload firmware code uph. Error number %d\n",
+                        r);
+        }
+        /* FALL-THROUGH */
+error:
+        release_firmware(ub_fw);
+        release_firmware(uph_fw);
+        return r;
+}
+static void disable_read_regs_int(struct zd_usb *usb)
+{
+        struct zd_usb_interrupt *intr = &usb->intr;
+        ZD_ASSERT(in_interrupt());
+        spin_lock(&intr->lock);
+        intr->read_regs_enabled = 0;
+        spin_unlock(&intr->lock);
+}
+#define urb_dev(urb) (&(urb)->dev->dev)
+static inline void handle_regs_int(struct urb *urb)
+{
+        struct zd_usb *usb = urb->context;
+        struct zd_usb_interrupt *intr = &usb->intr;
+        int len;
+        ZD_ASSERT(in_interrupt());
+        spin_lock(&intr->lock);
+        if (intr->read_regs_enabled) {
+                intr->read_regs.length = len = urb->actual_length;
+                if (len > sizeof(intr->read_regs.buffer))
+                        len = sizeof(intr->read_regs.buffer);
+                memcpy(intr->read_regs.buffer, urb->transfer_buffer, len);
+                intr->read_regs_enabled = 0;
+                complete(&intr->read_regs.completion);
+                goto out;
+        }
+        dev_dbg_f(urb_dev(urb), "regs interrupt ignored\n");
+out:
+        spin_unlock(&intr->lock);
+}
+static inline void handle_retry_failed_int(struct urb *urb)
+{
+        dev_dbg_f(urb_dev(urb), "retry failed interrupt\n");
+}
+static void int_urb_complete(struct urb *urb, struct pt_regs *pt_regs)
+{
+        int r;
+        struct usb_int_header *hdr;
+        switch (urb->status) {
+        case 0:
+                break;
+        case -ESHUTDOWN:
+        case -EINVAL:
+        case -ENODEV:
+        case -ENOENT:
+        case -ECONNRESET:
+                goto kfree;
+        case -EPIPE:
+                usb_clear_halt(urb->dev, EP_INT_IN);
+                /* FALL-THROUGH */
+        default:
+                goto resubmit;
+        }
+        if (urb->actual_length < sizeof(hdr)) {
+                dev_dbg_f(urb_dev(urb), "error: urb %p to small\n", urb);
+                goto resubmit;
+        }
+        hdr = urb->transfer_buffer;
+        if (hdr->type != USB_INT_TYPE) {
+                dev_dbg_f(urb_dev(urb), "error: urb %p wrong type\n", urb);
+                goto resubmit;
+        }
+        switch (hdr->id) {
+        case USB_INT_ID_REGS:
+                handle_regs_int(urb);
+                break;
+        case USB_INT_ID_RETRY_FAILED:
+                handle_retry_failed_int(urb);
+                break;
+        default:
+                dev_dbg_f(urb_dev(urb), "error: urb %p unknown id %x\n", urb,
+                        (unsigned int)hdr->id);
+                goto resubmit;
+        }
+resubmit:
+        r = usb_submit_urb(urb, GFP_ATOMIC);
+        if (r) {
+                dev_dbg_f(urb_dev(urb), "resubmit urb %p\n", urb);
+                goto kfree;
+        }
+        return;
+kfree:
+        kfree(urb->transfer_buffer);
+}
+static inline int int_urb_interval(struct usb_device *udev)
+{
+        switch (udev->speed) {
+        case USB_SPEED_HIGH:
+                return 4;
+        case USB_SPEED_LOW:
+                return 10;
+        case USB_SPEED_FULL:
+        default:
+                return 1;
+        }
+}
+static inline int usb_int_enabled(struct zd_usb *usb)
+{
+        unsigned long flags;
+        struct zd_usb_interrupt *intr = &usb->intr;
+        struct urb *urb;
+        spin_lock_irqsave(&intr->lock, flags);
+        urb = intr->urb;
+        spin_unlock_irqrestore(&intr->lock, flags);
+        return urb != NULL;
+}
+int zd_usb_enable_int(struct zd_usb *usb)
+{
+        int r;
+        struct usb_device *udev;
+        struct zd_usb_interrupt *intr = &usb->intr;
+        void *transfer_buffer = NULL;
+        struct urb *urb;
+        dev_dbg_f(zd_usb_dev(usb), "\n");
+        urb = usb_alloc_urb(0, GFP_NOFS);
+        if (!urb) {
+                r = -ENOMEM;
+                goto out;
+        }
+        ZD_ASSERT(!irqs_disabled());
+        spin_lock_irq(&intr->lock);
+        if (intr->urb) {
+                spin_unlock_irq(&intr->lock);
+                r = 0;
+                goto error_free_urb;
+        }
+        intr->urb = urb;
+        spin_unlock_irq(&intr->lock);
+        /* TODO: make it a DMA buffer */
+        r = -ENOMEM;
+        transfer_buffer = kmalloc(USB_MAX_EP_INT_BUFFER, GFP_NOFS);
+        if (!transfer_buffer) {
+                dev_dbg_f(zd_usb_dev(usb),
+                        "couldn't allocate transfer_buffer\n");
+                goto error_set_urb_null;
+        }
+        udev = zd_usb_to_usbdev(usb);
+        usb_fill_int_urb(urb, udev, usb_rcvintpipe(udev, EP_INT_IN),
+                         transfer_buffer, USB_MAX_EP_INT_BUFFER,
+                         int_urb_complete, usb,
+                         intr->interval);
+        dev_dbg_f(zd_usb_dev(usb), "submit urb %p\n", intr->urb);
+        r = usb_submit_urb(urb, GFP_NOFS);
+        if (r) {
+                dev_dbg_f(zd_usb_dev(usb),
+                         "Couldn't submit urb. Error number %d\n", r);
+                goto error;
+        }
+        return 0;
+error:
+        kfree(transfer_buffer);
+error_set_urb_null:
+        spin_lock_irq(&intr->lock);
+        intr->urb = NULL;
+        spin_unlock_irq(&intr->lock);
+error_free_urb:
+        usb_free_urb(urb);
+out:
+        return r;
+}
+void zd_usb_disable_int(struct zd_usb *usb)
+{
+        unsigned long flags;
+        struct zd_usb_interrupt *intr = &usb->intr;
+        struct urb *urb;
+        spin_lock_irqsave(&intr->lock, flags);
+        urb = intr->urb;
+        if (!urb) {
+                spin_unlock_irqrestore(&intr->lock, flags);
+                return;
+        }
+        intr->urb = NULL;
+        spin_unlock_irqrestore(&intr->lock, flags);
+        usb_kill_urb(urb);
+        dev_dbg_f(zd_usb_dev(usb), "urb %p killed\n", urb);
+        usb_free_urb(urb);
+}
+static void handle_rx_packet(struct zd_usb *usb, const u8 *buffer,
+                             unsigned int length)
+{
+        int i;
+        struct zd_mac *mac = zd_usb_to_mac(usb);
+        const struct rx_length_info *length_info;
+        if (length < sizeof(struct rx_length_info)) {
+                /* It's not a complete packet anyhow. */
+                return;
+        }
+        length_info = (struct rx_length_info *)
+                (buffer + length - sizeof(struct rx_length_info));
+        /* It might be that three frames are merged into a single URB
+         * transaction. We have to check for the length info tag.
+         *
+         * While testing we discovered that length_info might be unaligned,
+         * because if USB transactions are merged, the last packet will not
+         * be padded. Unaligned access might also happen if the length_info
+         * structure is not present.
+         */
+        if (get_unaligned(&length_info->tag) == RX_LENGTH_INFO_TAG) {
+                unsigned int l, k, n;
+                for (i = 0, l = 0;; i++) {
+                        k = le16_to_cpu(get_unaligned(
+                                &length_info->length[i]));
+                        n = l+k;
+                        if (n > length)
+                                return;
+                        zd_mac_rx(mac, buffer+l, k);
+                        if (i >= 2)
+                                return;
+                        l = (n+3) & ~3;
+                }
+        } else {
+                zd_mac_rx(mac, buffer, length);
+        }
+}
+static void rx_urb_complete(struct urb *urb, struct pt_regs *pt_regs)
+{
+        struct zd_usb *usb;
+        struct zd_usb_rx *rx;
+        const u8 *buffer;
+        unsigned int length;
+        switch (urb->status) {
+        case 0:
+                break;
+        case -ESHUTDOWN:
+        case -EINVAL:
+        case -ENODEV:
+        case -ENOENT:
+        case -ECONNRESET:
+                return;
+        case -EPIPE:
+                usb_clear_halt(urb->dev, EP_DATA_IN);
+                /* FALL-THROUGH */
+        default:
+                dev_dbg_f(urb_dev(urb), "urb %p error %d\n", urb, urb->status);
+                goto resubmit;
+        }
+        buffer = urb->transfer_buffer;
+        length = urb->actual_length;
+        usb = urb->context;
+        rx = &usb->rx;
+        if (length%rx->usb_packet_size > rx->usb_packet_size-4) {
+                /* If there is an old first fragment, we don't care. */
+                dev_dbg_f(urb_dev(urb), "*** first fragment ***\n");
+                ZD_ASSERT(length <= ARRAY_SIZE(rx->fragment));
+                spin_lock(&rx->lock);
+                memcpy(rx->fragment, buffer, length);
+                rx->fragment_length = length;
+                spin_unlock(&rx->lock);
+                goto resubmit;
+        }
+        spin_lock(&rx->lock);
+        if (rx->fragment_length > 0) {
+                /* We are on a second fragment, we believe */
+                ZD_ASSERT(length + rx->fragment_length <=
+                          ARRAY_SIZE(rx->fragment));
+                dev_dbg_f(urb_dev(urb), "*** second fragment ***\n");
+                memcpy(rx->fragment+rx->fragment_length, buffer, length);
+                handle_rx_packet(usb, rx->fragment,
+                                 rx->fragment_length + length);
+                rx->fragment_length = 0;
+                spin_unlock(&rx->lock);
+        } else {
+                spin_unlock(&rx->lock);
+                handle_rx_packet(usb, buffer, length);
+        }
+resubmit:
+        usb_submit_urb(urb, GFP_ATOMIC);
+}
+struct urb *alloc_urb(struct zd_usb *usb)
+{
+        struct usb_device *udev = zd_usb_to_usbdev(usb);
+        struct urb *urb;
+        void *buffer;
+        urb = usb_alloc_urb(0, GFP_NOFS);
+        if (!urb)
+                return NULL;
+        buffer = usb_buffer_alloc(udev, USB_MAX_RX_SIZE, GFP_NOFS,
+                                  &urb->transfer_dma);
+        if (!buffer) {
+                usb_free_urb(urb);
+                return NULL;
+        }
+        usb_fill_bulk_urb(urb, udev, usb_rcvbulkpipe(udev, EP_DATA_IN),
+                          buffer, USB_MAX_RX_SIZE,
+                          rx_urb_complete, usb);
+        urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
+        return urb;
+}
+void free_urb(struct urb *urb)
+{
+        if (!urb)
+                return;
+        usb_buffer_free(urb->dev, urb->transfer_buffer_length,
+                        urb->transfer_buffer, urb->transfer_dma);
+        usb_free_urb(urb);
+}
+int zd_usb_enable_rx(struct zd_usb *usb)
+{
+        int i, r;
+        struct zd_usb_rx *rx = &usb->rx;
+        struct urb **urbs;
+        dev_dbg_f(zd_usb_dev(usb), "\n");
+        r = -ENOMEM;
+        urbs = kcalloc(URBS_COUNT, sizeof(struct urb *), GFP_NOFS);
+        if (!urbs)
+                goto error;
+        for (i = 0; i < URBS_COUNT; i++) {
+                urbs[i] = alloc_urb(usb);
+                if (!urbs[i])
+                        goto error;
+        }
+        ZD_ASSERT(!irqs_disabled());
+        spin_lock_irq(&rx->lock);
+        if (rx->urbs) {
+                spin_unlock_irq(&rx->lock);
+                r = 0;
+                goto error;
+        }
+        rx->urbs = urbs;
+        rx->urbs_count = URBS_COUNT;
+        spin_unlock_irq(&rx->lock);
+        for (i = 0; i < URBS_COUNT; i++) {
+                r = usb_submit_urb(urbs[i], GFP_NOFS);
+                if (r)
+                        goto error_submit;
+        }
+        return 0;
+error_submit:
+        for (i = 0; i < URBS_COUNT; i++) {
+                usb_kill_urb(urbs[i]);
+        }
+        spin_lock_irq(&rx->lock);
+        rx->urbs = NULL;
+        rx->urbs_count = 0;
+        spin_unlock_irq(&rx->lock);
+error:
+        if (urbs) {
+                for (i = 0; i < URBS_COUNT; i++)
+                        free_urb(urbs[i]);
+        }
+        return r;
+}
+void zd_usb_disable_rx(struct zd_usb *usb)
+{
+        int i;
+        unsigned long flags;
+        struct urb **urbs;
+        unsigned int count;
+        struct zd_usb_rx *rx = &usb->rx;
+        spin_lock_irqsave(&rx->lock, flags);
+        urbs = rx->urbs;
+        count = rx->urbs_count;
+        spin_unlock_irqrestore(&rx->lock, flags);
+        if (!urbs)
+                return;
+        for (i = 0; i < count; i++) {
+                usb_kill_urb(urbs[i]);
+                free_urb(urbs[i]);
+        }
+        kfree(urbs);
+        spin_lock_irqsave(&rx->lock, flags);
+        rx->urbs = NULL;
+        rx->urbs_count = 0;
+        spin_unlock_irqrestore(&rx->lock, flags);
+}
+static void tx_urb_complete(struct urb *urb, struct pt_regs *pt_regs)
+{
+        int r;
+        switch (urb->status) {
+        case 0:
+                break;
+        case -ESHUTDOWN:
+        case -EINVAL:
+        case -ENODEV:
+        case -ENOENT:
+        case -ECONNRESET:
+                dev_dbg_f(urb_dev(urb), "urb %p error %d\n", urb, urb->status);
+                break;
+        case -EPIPE:
+                usb_clear_halt(urb->dev, EP_DATA_OUT);
+                /* FALL-THROUGH */
+        default:
+                dev_dbg_f(urb_dev(urb), "urb %p error %d\n", urb, urb->status);
+                goto resubmit;
+        }
+free_urb:
+        usb_buffer_free(urb->dev, urb->transfer_buffer_length,
+                        urb->transfer_buffer, urb->transfer_dma);
+        usb_free_urb(urb);
+        return;
+resubmit:
+        r = usb_submit_urb(urb, GFP_ATOMIC);
+        if (r) {
+                dev_dbg_f(urb_dev(urb), "error resubmit urb %p %d\n", urb, r);
+                goto free_urb;
+        }
+}
+/* Puts the frame on the USB endpoint. It doesn't wait for
+ * completion. The frame must contain the control set.
+ */
+int zd_usb_tx(struct zd_usb *usb, const u8 *frame, unsigned int length)
+{
+        int r;
+        struct usb_device *udev = zd_usb_to_usbdev(usb);
+        struct urb *urb;
+        void *buffer;
+        urb = usb_alloc_urb(0, GFP_ATOMIC);
+        if (!urb) {
+                r = -ENOMEM;
+                goto out;
+        }
+        buffer = usb_buffer_alloc(zd_usb_to_usbdev(usb), length, GFP_ATOMIC,
+                                  &urb->transfer_dma);
+        if (!buffer) {
+                r = -ENOMEM;
+                goto error_free_urb;
+        }
+        memcpy(buffer, frame, length);
+        usb_fill_bulk_urb(urb, udev, usb_sndbulkpipe(udev, EP_DATA_OUT),
+                          buffer, length, tx_urb_complete, NULL);
+        urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
+        r = usb_submit_urb(urb, GFP_ATOMIC);
+        if (r)
+                goto error;
+        return 0;
+error:
+        usb_buffer_free(zd_usb_to_usbdev(usb), length, buffer,
+                        urb->transfer_dma);
+error_free_urb:
+        usb_free_urb(urb);
+out:
+        return r;
+}
+static inline void init_usb_interrupt(struct zd_usb *usb)
+{
+        struct zd_usb_interrupt *intr = &usb->intr;
+        spin_lock_init(&intr->lock);
+        intr->interval = int_urb_interval(zd_usb_to_usbdev(usb));
+        init_completion(&intr->read_regs.completion);
+        intr->read_regs.cr_int_addr = cpu_to_le16(usb_addr(usb, CR_INTERRUPT));
+}
+static inline void init_usb_rx(struct zd_usb *usb)
+{
+        struct zd_usb_rx *rx = &usb->rx;
+        spin_lock_init(&rx->lock);
+        if (interface_to_usbdev(usb->intf)->speed == USB_SPEED_HIGH) {
+                rx->usb_packet_size = 512;
+        } else {
+                rx->usb_packet_size = 64;
+        }
+        ZD_ASSERT(rx->fragment_length == 0);
+}
+static inline void init_usb_tx(struct zd_usb *usb)
+{
+        /* FIXME: at this point we will allocate a fixed number of urb's for
+         * use in a cyclic scheme */
+}
+void zd_usb_init(struct zd_usb *usb, struct net_device *netdev,
+                 struct usb_interface *intf)
+{
+        memset(usb, 0, sizeof(*usb));
+        usb->intf = usb_get_intf(intf);
+        usb_set_intfdata(usb->intf, netdev);
+        init_usb_interrupt(usb);
+        init_usb_tx(usb);
+        init_usb_rx(usb);
+}
+int zd_usb_init_hw(struct zd_usb *usb)
+{
+        int r;
+        struct zd_chip *chip = zd_usb_to_chip(usb);
+        ZD_ASSERT(mutex_is_locked(&chip->mutex));
+        r = zd_ioread16_locked(chip, &usb->fw_base_offset,
+                        USB_REG((u16)FW_BASE_ADDR_OFFSET));
+        if (r)
+                return r;
+        dev_dbg_f(zd_usb_dev(usb), "fw_base_offset: %#06hx\n",
+                 usb->fw_base_offset);
+        return 0;
+}
+void zd_usb_clear(struct zd_usb *usb)
+{
+        usb_set_intfdata(usb->intf, NULL);
+        usb_put_intf(usb->intf);
+        memset(usb, 0, sizeof(*usb));
+        /* FIXME: usb_interrupt, usb_tx, usb_rx? */
+}
+static const char *speed(enum usb_device_speed speed)
+{
+        switch (speed) {
+        case USB_SPEED_LOW:
+                return "low";
+        case USB_SPEED_FULL:
+                return "full";
+        case USB_SPEED_HIGH:
+                return "high";
+        default:
+                return "unknown speed";
+        }
+}
+static int scnprint_id(struct usb_device *udev, char *buffer, size_t size)
+{
+        return scnprintf(buffer, size, "%04hx:%04hx v%04hx %s",
+                le16_to_cpu(udev->descriptor.idVendor),
+                le16_to_cpu(udev->descriptor.idProduct),
+                get_bcdDevice(udev),
+                speed(udev->speed));
+}
+int zd_usb_scnprint_id(struct zd_usb *usb, char *buffer, size_t size)
+{
+        struct usb_device *udev = interface_to_usbdev(usb->intf);
+        return scnprint_id(udev, buffer, size);
+}
+#ifdef DEBUG
+static void print_id(struct usb_device *udev)
+{
+        char buffer[40];
+        scnprint_id(udev, buffer, sizeof(buffer));
+        buffer[sizeof(buffer)-1] = 0;
+        dev_dbg_f(&udev->dev, "%s\n", buffer);
+}
+#else
+#define print_id(udev) do { } while (0)
+#endif
+static int probe(struct usb_interface *intf, const struct usb_device_id *id)
+{
+        int r;
+        struct usb_device *udev = interface_to_usbdev(intf);
+        struct net_device *netdev = NULL;
+        print_id(udev);
+        switch (udev->speed) {
+        case USB_SPEED_LOW:
+        case USB_SPEED_FULL:
+        case USB_SPEED_HIGH:
+                break;
+        default:
+                dev_dbg_f(&intf->dev, "Unknown USB speed\n");
+                r = -ENODEV;
+                goto error;
+        }
+        netdev = zd_netdev_alloc(intf);
+        if (netdev == NULL) {
+                r = -ENOMEM;
+                goto error;
+        }
+        r = upload_firmware(udev, id->driver_info);
+        if (r) {
+                dev_err(&intf->dev,
+                       "couldn't load firmware. Error number %d\n", r);
+                goto error;
+        }
+        r = usb_reset_configuration(udev);
+        if (r) {
+                dev_dbg_f(&intf->dev,
+                        "couldn't reset configuration. Error number %d\n", r);
+                goto error;
+        }
+        /* At this point the interrupt endpoint is not generally enabled. We
+         * save the USB bandwidth until the network device is opened. But
+         * notify that the initialization of the MAC will require the
+         * interrupts to be temporary enabled.
+         */
+        r = zd_mac_init_hw(zd_netdev_mac(netdev), id->driver_info);
+        if (r) {
+                dev_dbg_f(&intf->dev,
+                         "couldn't initialize mac. Error number %d\n", r);
+                goto error;
+        }
+        r = register_netdev(netdev);
+        if (r) {
+                dev_dbg_f(&intf->dev,
+                         "couldn't register netdev. Error number %d\n", r);
+                goto error;
+        }
+        dev_dbg_f(&intf->dev, "successful\n");
+        dev_info(&intf->dev,"%s\n", netdev->name);
+        return 0;
+error:
+        usb_reset_device(interface_to_usbdev(intf));
+        zd_netdev_free(netdev);
+        return r;
+}
+static void disconnect(struct usb_interface *intf)
+{
+        struct net_device *netdev = zd_intf_to_netdev(intf);
+        struct zd_mac *mac = zd_netdev_mac(netdev);
+        struct zd_usb *usb = &mac->chip.usb;
+        dev_dbg_f(zd_usb_dev(usb), "\n");
+        zd_netdev_disconnect(netdev);
+        /* Just in case something has gone wrong! */
+        zd_usb_disable_rx(usb);
+        zd_usb_disable_int(usb);
+        /* If the disconnect has been caused by a removal of the
+         * driver module, the reset allows reloading of the driver. If the
+         * reset will not be executed here, the upload of the firmware in the
+         * probe function caused by the reloading of the driver will fail.
+         */
+        usb_reset_device(interface_to_usbdev(intf));
+        /* If somebody still waits on this lock now, this is an error. */
+        zd_netdev_free(netdev);
+        dev_dbg(&intf->dev, "disconnected\n");
+}
+static struct usb_driver driver = {
+        .name           = "zd1211rw",
+        .id_table       = usb_ids,
+        .probe          = probe,
+        .disconnect     = disconnect,
+};
+static int __init usb_init(void)
+{
+        int r;
+        pr_debug("usb_init()\n");
+        r = usb_register(&driver);
+        if (r) {
+                printk(KERN_ERR "usb_register() failed. Error number %d\n", r);
+                return r;
+        }
+        pr_debug("zd1211rw initialized\n");
+        return 0;
+}
+static void __exit usb_exit(void)
+{
+        pr_debug("usb_exit()\n");
+        usb_deregister(&driver);
+}
+module_init(usb_init);
+module_exit(usb_exit);
+static int usb_int_regs_length(unsigned int count)
+{
+        return sizeof(struct usb_int_regs) + count * sizeof(struct reg_data);
+}
+static void prepare_read_regs_int(struct zd_usb *usb)
+{
+        struct zd_usb_interrupt *intr = &usb->intr;
+        spin_lock(&intr->lock);
+        intr->read_regs_enabled = 1;
+        INIT_COMPLETION(intr->read_regs.completion);
+        spin_unlock(&intr->lock);
+}
+static int get_results(struct zd_usb *usb, u16 *values,
+                       struct usb_req_read_regs *req, unsigned int count)
+{
+        int r;
+        int i;
+        struct zd_usb_interrupt *intr = &usb->intr;
+        struct read_regs_int *rr = &intr->read_regs;
+        struct usb_int_regs *regs = (struct usb_int_regs *)rr->buffer;
+        spin_lock(&intr->lock);
+        r = -EIO;
+        /* The created block size seems to be larger than expected.
+         * However results appear to be correct.
+         */
+        if (rr->length < usb_int_regs_length(count)) {
+                dev_dbg_f(zd_usb_dev(usb),
+                         "error: actual length %d less than expected %d\n",
+                         rr->length, usb_int_regs_length(count));
+                goto error_unlock;
+        }
+        if (rr->length > sizeof(rr->buffer)) {
+                dev_dbg_f(zd_usb_dev(usb),
+                         "error: actual length %d exceeds buffer size %zu\n",
+                         rr->length, sizeof(rr->buffer));
+                goto error_unlock;
+        }
+        for (i = 0; i < count; i++) {
+                struct reg_data *rd = &regs->regs[i];
+                if (rd->addr != req->addr[i]) {
+                        dev_dbg_f(zd_usb_dev(usb),
+                                 "rd[%d] addr %#06hx expected %#06hx\n", i,
+                                 le16_to_cpu(rd->addr),
+                                 le16_to_cpu(req->addr[i]));
+                        goto error_unlock;
+                }
+                values[i] = le16_to_cpu(rd->value);
+        }
+        r = 0;
+error_unlock:
+        spin_unlock(&intr->lock);
+        return r;
+}
+int zd_usb_ioread16v(struct zd_usb *usb, u16 *values,
+                     const zd_addr_t *addresses, unsigned int count)
+{
+        int r;
+        int i, req_len, actual_req_len;
+        struct usb_device *udev;
+        struct usb_req_read_regs *req = NULL;
+        unsigned long timeout;
+        if (count < 1) {
+                dev_dbg_f(zd_usb_dev(usb), "error: count is zero\n");
+                return -EINVAL;
+        }
+        if (count > USB_MAX_IOREAD16_COUNT) {
+                dev_dbg_f(zd_usb_dev(usb),
+                         "error: count %u exceeds possible max %u\n",
+                         count, USB_MAX_IOREAD16_COUNT);
+                return -EINVAL;
+        }
+        if (in_atomic()) {
+                dev_dbg_f(zd_usb_dev(usb),
+                         "error: io in atomic context not supported\n");
+                return -EWOULDBLOCK;
+        }
+        if (!usb_int_enabled(usb)) {
+                 dev_dbg_f(zd_usb_dev(usb),
+                          "error: usb interrupt not enabled\n");
+                return -EWOULDBLOCK;
+        }
+        req_len = sizeof(struct usb_req_read_regs) + count * sizeof(__le16);
+        req = kmalloc(req_len, GFP_NOFS);
+        if (!req)
+                return -ENOMEM;
+        req->id = cpu_to_le16(USB_REQ_READ_REGS);
+        for (i = 0; i < count; i++)
+                req->addr[i] = cpu_to_le16(usb_addr(usb, addresses[i]));
+        udev = zd_usb_to_usbdev(usb);
+        prepare_read_regs_int(usb);
+        r = usb_bulk_msg(udev, usb_sndbulkpipe(udev, EP_REGS_OUT),
+                         req, req_len, &actual_req_len, 1000 /* ms */);
+        if (r) {
+                dev_dbg_f(zd_usb_dev(usb),
+                        "error in usb_bulk_msg(). Error number %d\n", r);
+                goto error;
+        }
+        if (req_len != actual_req_len) {
+                dev_dbg_f(zd_usb_dev(usb), "error in usb_bulk_msg()\n"
+                        " req_len %d != actual_req_len %d\n",
+                        req_len, actual_req_len);
+                r = -EIO;
+                goto error;
+        }
+        timeout = wait_for_completion_timeout(&usb->intr.read_regs.completion,
+                                              msecs_to_jiffies(1000));
+        if (!timeout) {
+                disable_read_regs_int(usb);
+                dev_dbg_f(zd_usb_dev(usb), "read timed out\n");
+                r = -ETIMEDOUT;
+                goto error;
+        }
+        r = get_results(usb, values, req, count);
+error:
+        kfree(req);
+        return r;
+}
+int zd_usb_iowrite16v(struct zd_usb *usb, const struct zd_ioreq16 *ioreqs,
+                      unsigned int count)
+{
+        int r;
+        struct usb_device *udev;
+        struct usb_req_write_regs *req = NULL;
+        int i, req_len, actual_req_len;
+        if (count == 0)
+                return 0;
+        if (count > USB_MAX_IOWRITE16_COUNT) {
+                dev_dbg_f(zd_usb_dev(usb),
+                        "error: count %u exceeds possible max %u\n",
+                        count, USB_MAX_IOWRITE16_COUNT);
+                return -EINVAL;
+        }
+        if (in_atomic()) {
+                dev_dbg_f(zd_usb_dev(usb),
+                        "error: io in atomic context not supported\n");
+                return -EWOULDBLOCK;
+        }
+        req_len = sizeof(struct usb_req_write_regs) +
+                  count * sizeof(struct reg_data);
+        req = kmalloc(req_len, GFP_NOFS);
+        if (!req)
+                return -ENOMEM;
+        req->id = cpu_to_le16(USB_REQ_WRITE_REGS);
+        for (i = 0; i < count; i++) {
+                struct reg_data *rw  = &req->reg_writes[i];
+                rw->addr = cpu_to_le16(usb_addr(usb, ioreqs[i].addr));
+                rw->value = cpu_to_le16(ioreqs[i].value);
+        }
+        udev = zd_usb_to_usbdev(usb);
+        r = usb_bulk_msg(udev, usb_sndbulkpipe(udev, EP_REGS_OUT),
+                         req, req_len, &actual_req_len, 1000 /* ms */);
+        if (r) {
+                dev_dbg_f(zd_usb_dev(usb),
+                        "error in usb_bulk_msg(). Error number %d\n", r);
+                goto error;
+        }
+        if (req_len != actual_req_len) {
+                dev_dbg_f(zd_usb_dev(usb),
+                        "error in usb_bulk_msg()"
+                        " req_len %d != actual_req_len %d\n",
+                        req_len, actual_req_len);
+                r = -EIO;
+                goto error;
+        }
+        /* FALL-THROUGH with r == 0 */
+error:
+        kfree(req);
+        return r;
+}
+int zd_usb_rfwrite(struct zd_usb *usb, u32 value, u8 bits)
+{
+        int r;
+        struct usb_device *udev;
+        struct usb_req_rfwrite *req = NULL;
+        int i, req_len, actual_req_len;
+        u16 bit_value_template;
+        if (in_atomic()) {
+                dev_dbg_f(zd_usb_dev(usb),
+                        "error: io in atomic context not supported\n");
+                return -EWOULDBLOCK;
+        }
+        if (bits < USB_MIN_RFWRITE_BIT_COUNT) {
+                dev_dbg_f(zd_usb_dev(usb),
+                        "error: bits %d are smaller than"
+                        " USB_MIN_RFWRITE_BIT_COUNT %d\n",
+                        bits, USB_MIN_RFWRITE_BIT_COUNT);
+                return -EINVAL;
+        }
+        if (bits > USB_MAX_RFWRITE_BIT_COUNT) {
+                dev_dbg_f(zd_usb_dev(usb),
+                        "error: bits %d exceed USB_MAX_RFWRITE_BIT_COUNT %d\n",
+                        bits, USB_MAX_RFWRITE_BIT_COUNT);
+                return -EINVAL;
+        }
+#ifdef DEBUG
+        if (value & (~0UL << bits)) {
+                dev_dbg_f(zd_usb_dev(usb),
+                        "error: value %#09x has bits >= %d set\n",
+                        value, bits);
+                return -EINVAL;
+        }
+#endif /* DEBUG */
+        dev_dbg_f(zd_usb_dev(usb), "value %#09x bits %d\n", value, bits);
+        r = zd_usb_ioread16(usb, &bit_value_template, CR203);
+        if (r) {
+                dev_dbg_f(zd_usb_dev(usb),
+                        "error %d: Couldn't read CR203\n", r);
+                goto out;
+        }
+        bit_value_template &= ~(RF_IF_LE|RF_CLK|RF_DATA);
+        req_len = sizeof(struct usb_req_rfwrite) + bits * sizeof(__le16);
+        req = kmalloc(req_len, GFP_NOFS);
+        if (!req)
+                return -ENOMEM;
+        req->id = cpu_to_le16(USB_REQ_WRITE_RF);
+        /* 1: 3683a, but not used in ZYDAS driver */
+        req->value = cpu_to_le16(2);
+        req->bits = cpu_to_le16(bits);
+        for (i = 0; i < bits; i++) {
+                u16 bv = bit_value_template;
+                if (value & (1 << (bits-1-i)))
+                        bv |= RF_DATA;
+                req->bit_values[i] = cpu_to_le16(bv);
+        }
+        udev = zd_usb_to_usbdev(usb);
+        r = usb_bulk_msg(udev, usb_sndbulkpipe(udev, EP_REGS_OUT),
+                         req, req_len, &actual_req_len, 1000 /* ms */);
+        if (r) {
+                dev_dbg_f(zd_usb_dev(usb),
+                        "error in usb_bulk_msg(). Error number %d\n", r);
+                goto out;
+        }
+        if (req_len != actual_req_len) {
+                dev_dbg_f(zd_usb_dev(usb), "error in usb_bulk_msg()"
+                        " req_len %d != actual_req_len %d\n",
+                        req_len, actual_req_len);
+                r = -EIO;
+                goto out;
+        }
+        /* FALL-THROUGH with r == 0 */
+out:
+        kfree(req);
+        return r;
+}
diff --git a/drivers/net/wireless/zd1211rw/zd_usb.h b/drivers/net/wireless/zd1211rw/zd_usb.h
new file mode 100644
index 000000000000..d6420283bd5a
--- /dev/null
+++ b/drivers/net/wireless/zd1211rw/zd_usb.h
@@ -0,0 +1,240 @@
+/* zd_usb.h: Header for USB interface implemented by ZD1211 chip
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#ifndef _ZD_USB_H
+#define _ZD_USB_H
+#include <linux/completion.h>
+#include <linux/netdevice.h>
+#include <linux/spinlock.h>
+#include <linux/skbuff.h>
+#include <linux/usb.h>
+#include "zd_def.h"
+#include "zd_types.h"
+enum devicetype {
+        DEVICE_ZD1211  = 0,
+        DEVICE_ZD1211B = 1,
+};
+enum endpoints {
+        EP_CTRL     = 0,
+        EP_DATA_OUT = 1,
+        EP_DATA_IN  = 2,
+        EP_INT_IN   = 3,
+        EP_REGS_OUT = 4,
+};
+enum {
+        USB_MAX_TRANSFER_SIZE           = 4096, /* bytes */
+        /* FIXME: The original driver uses this value. We have to check,
+         * whether the MAX_TRANSFER_SIZE is sufficient and this needs only be
+         * used if one combined frame is split over two USB transactions.
+         */
+        USB_MAX_RX_SIZE                 = 4800, /* bytes */
+        USB_MAX_IOWRITE16_COUNT         = 15,
+        USB_MAX_IOWRITE32_COUNT         = USB_MAX_IOWRITE16_COUNT/2,
+        USB_MAX_IOREAD16_COUNT          = 15,
+        USB_MAX_IOREAD32_COUNT          = USB_MAX_IOREAD16_COUNT/2,
+        USB_MIN_RFWRITE_BIT_COUNT       = 16,
+        USB_MAX_RFWRITE_BIT_COUNT       = 28,
+        USB_MAX_EP_INT_BUFFER           = 64,
+        USB_ZD1211B_BCD_DEVICE          = 0x4810,
+};
+enum control_requests {
+        USB_REQ_WRITE_REGS              = 0x21,
+        USB_REQ_READ_REGS               = 0x22,
+        USB_REQ_WRITE_RF                = 0x23,
+        USB_REQ_PROG_FLASH              = 0x24,
+        USB_REQ_EEPROM_START            = 0x0128, /* ? request is a byte */
+        USB_REQ_EEPROM_MID              = 0x28,
+        USB_REQ_EEPROM_END              = 0x0228, /* ? request is a byte */
+        USB_REQ_FIRMWARE_DOWNLOAD       = 0x30,
+        USB_REQ_FIRMWARE_CONFIRM        = 0x31,
+        USB_REQ_FIRMWARE_READ_DATA      = 0x32,
+};
+struct usb_req_read_regs {
+        __le16 id;
+        __le16 addr[0];
+} __attribute__((packed));
+struct reg_data {
+        __le16 addr;
+        __le16 value;
+} __attribute__((packed));
+struct usb_req_write_regs {
+        __le16 id;
+        struct reg_data reg_writes[0];
+} __attribute__((packed));
+enum {
+        RF_IF_LE = 0x02,
+        RF_CLK   = 0x04,
+        RF_DATA  = 0x08,
+};
+struct usb_req_rfwrite {
+        __le16 id;
+        __le16 value;
+        /* 1: 3683a */
+        /* 2: other (default) */
+        __le16 bits;
+        /* RF2595: 24 */
+        __le16 bit_values[0];
+        /* (CR203 & ~(RF_IF_LE | RF_CLK | RF_DATA)) | (bit ? RF_DATA : 0) */
+} __attribute__((packed));
+/* USB interrupt */
+enum usb_int_id {
+        USB_INT_TYPE                    = 0x01,
+        USB_INT_ID_REGS                 = 0x90,
+        USB_INT_ID_RETRY_FAILED         = 0xa0,
+};
+enum usb_int_flags {
+        USB_INT_READ_REGS_EN            = 0x01,
+};
+struct usb_int_header {
+        u8 type;        /* must always be 1 */
+        u8 id;
+} __attribute__((packed));
+struct usb_int_regs {
+        struct usb_int_header hdr;
+        struct reg_data regs[0];
+} __attribute__((packed));
+struct usb_int_retry_fail {
+        struct usb_int_header hdr;
+        u8 new_rate;
+        u8 _dummy;
+        u8 addr[ETH_ALEN];
+        u8 ibss_wakeup_dest;
+} __attribute__((packed));
+struct read_regs_int {
+        struct completion completion;
+        /* Stores the USB int structure and contains the USB address of the
+         * first requested register before request.
+         */
+        u8 buffer[USB_MAX_EP_INT_BUFFER];
+        int length;
+        __le16 cr_int_addr;
+};
+struct zd_ioreq16 {
+        zd_addr_t addr;
+        u16 value;
+};
+struct zd_ioreq32 {
+        zd_addr_t addr;
+        u32 value;
+};
+struct zd_usb_interrupt {
+        struct read_regs_int read_regs;
+        spinlock_t lock;
+        struct urb *urb;
+        int interval;
+        u8 read_regs_enabled:1;
+};
+static inline struct usb_int_regs *get_read_regs(struct zd_usb_interrupt *intr)
+{
+        return (struct usb_int_regs *)intr->read_regs.buffer;
+}
+#define URBS_COUNT 5
+struct zd_usb_rx {
+        spinlock_t lock;
+        u8 fragment[2*USB_MAX_RX_SIZE];
+        unsigned int fragment_length;
+        unsigned int usb_packet_size;
+        struct urb **urbs;
+        int urbs_count;
+};
+struct zd_usb_tx {
+        spinlock_t lock;
+};
+/* Contains the usb parts. The structure doesn't require a lock, because intf
+ * and fw_base_offset, will not be changed after initialization.
+ */
+struct zd_usb {
+        struct zd_usb_interrupt intr;
+        struct zd_usb_rx rx;
+        struct zd_usb_tx tx;
+        struct usb_interface *intf;
+        u16 fw_base_offset;
+};
+#define zd_usb_dev(usb) (&usb->intf->dev)
+static inline struct usb_device *zd_usb_to_usbdev(struct zd_usb *usb)
+{
+        return interface_to_usbdev(usb->intf);
+}
+static inline struct net_device *zd_intf_to_netdev(struct usb_interface *intf)
+{
+        return usb_get_intfdata(intf);
+}
+static inline struct net_device *zd_usb_to_netdev(struct zd_usb *usb)
+{
+        return zd_intf_to_netdev(usb->intf);
+}
+void zd_usb_init(struct zd_usb *usb, struct net_device *netdev,
+                 struct usb_interface *intf);
+int zd_usb_init_hw(struct zd_usb *usb);
+void zd_usb_clear(struct zd_usb *usb);
+int zd_usb_scnprint_id(struct zd_usb *usb, char *buffer, size_t size);
+int zd_usb_enable_int(struct zd_usb *usb);
+void zd_usb_disable_int(struct zd_usb *usb);
+int zd_usb_enable_rx(struct zd_usb *usb);
+void zd_usb_disable_rx(struct zd_usb *usb);
+int zd_usb_tx(struct zd_usb *usb, const u8 *frame, unsigned int length);
+int zd_usb_ioread16v(struct zd_usb *usb, u16 *values,
+                 const zd_addr_t *addresses, unsigned int count);
+static inline int zd_usb_ioread16(struct zd_usb *usb, u16 *value,
+                              const zd_addr_t addr)
+{
+        return zd_usb_ioread16v(usb, value, (const zd_addr_t *)&addr, 1);
+}
+int zd_usb_iowrite16v(struct zd_usb *usb, const struct zd_ioreq16 *ioreqs,
+                      unsigned int count);
+int zd_usb_rfwrite(struct zd_usb *usb, u32 value, u8 bits);
+#endif /* _ZD_USB_H */
diff --git a/drivers/net/wireless/zd1211rw/zd_util.c b/drivers/net/wireless/zd1211rw/zd_util.c
new file mode 100644
index 000000000000..d20036c15d11
--- /dev/null
+++ b/drivers/net/wireless/zd1211rw/zd_util.c
@@ -0,0 +1,82 @@
+/* zd_util.c
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Utility program
+ */
+#include "zd_def.h"
+#include "zd_util.h"
+#ifdef DEBUG
+static char hex(u8 v)
+{
+        v &= 0xf;
+        return (v < 10 ? '0' : 'a' - 10) + v;
+}
+static char hex_print(u8 c)
+{
+        return (0x20 <= c && c < 0x7f) ? c : '.';
+}
+static void dump_line(const u8 *bytes, size_t size)
+{
+        char c;
+        size_t i;
+        size = size <= 8 ? size : 8;
+        printk(KERN_DEBUG "zd1211 %p ", bytes);
+        for (i = 0; i < 8; i++) {
+                switch (i) {
+                case 1:
+                case 5:
+                        c = '.';
+                        break;
+                case 3:
+                        c = ':';
+                        break;
+                default:
+                        c = ' ';
+                }
+                if (i < size) {
+                        printk("%c%c%c", hex(bytes[i] >> 4), hex(bytes[i]), c);
+                } else {
+                        printk("  %c", c);
+                }
+        }
+        for (i = 0; i < size; i++)
+                printk("%c", hex_print(bytes[i]));
+        printk("\n");
+}
+void zd_hexdump(const void *bytes, size_t size)
+{
+        size_t i = 0;
+        do {
+                dump_line((u8 *)bytes + i, size-i);
+                i += 8;
+        } while (i < size);
+}
+#endif /* DEBUG */
+void *zd_tail(const void *buffer, size_t buffer_size, size_t tail_size)
+{
+        if (buffer_size < tail_size)
+                return NULL;
+        return (u8 *)buffer + (buffer_size - tail_size);
+}
diff --git a/drivers/net/wireless/zd1211rw/zd_util.h b/drivers/net/wireless/zd1211rw/zd_util.h
new file mode 100644
index 000000000000..ce26f7adea92
--- /dev/null
+++ b/drivers/net/wireless/zd1211rw/zd_util.h
@@ -0,0 +1,29 @@
+/* zd_util.h
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#ifndef _ZD_UTIL_H
+#define _ZD_UTIL_H
+void *zd_tail(const void *buffer, size_t buffer_size, size_t tail_size);
+#ifdef DEBUG
+void zd_hexdump(const void *bytes, size_t size);
+#else
+#define zd_hexdump(bytes, size)
+#endif /* DEBUG */
+#endif /* _ZD_UTIL_H */
diff --git a/drivers/net/yellowfin.c b/drivers/net/yellowfin.c
index fd0f43b7db5b..8459a18254a4 100644
--- a/drivers/net/yellowfin.c
+++ b/drivers/net/yellowfin.c
@@ -19,37 +19,13 @@
        Support and updates available at
        http://www.scyld.com/network/yellowfin.html
+        [link no longer provides useful info -jgarzik]
-        Linux kernel changelog:
-        -----------------------
-        LK1.1.1 (jgarzik): Port to 2.4 kernel
-        LK1.1.2 (jgarzik):
-        * Merge in becker version 1.05
-        LK1.1.3 (jgarzik):
-        * Various cleanups
-        * Update yellowfin_timer to correctly calculate duplex.
-        (suggested by Manfred Spraul)
-        LK1.1.4 (val@nmt.edu):
-        * Fix three endian-ness bugs
-        * Support dual function SYM53C885E ethernet chip
-        
-        LK1.1.5 (val@nmt.edu):
-        * Fix forced full-duplex bug I introduced
-        LK1.1.6 (val@nmt.edu):
-        * Only print warning on truly "oversized" packets
-        * Fix theoretical bug on gigabit cards - return to 1.1.3 behavior
-        
 */
 #define DRV_NAME        "yellowfin"
-#define DRV_VERSION     "1.05+LK1.1.6"
+#define DRV_VERSION     "2.0"
-#define DRV_RELDATE     "Feb 11, 2002"
+#define DRV_RELDATE     "Jun 27, 2006"
 #define PFX DRV_NAME ": "
@@ -234,26 +210,16 @@ See Packet Engines confidential appendix (prototype chips only).
-enum pci_id_flags_bits {
-        /* Set PCI command register bits before calling probe1(). */
-        PCI_USES_IO=1, PCI_USES_MEM=2, PCI_USES_MASTER=4,
-        /* Read and map the single following PCI BAR. */
-        PCI_ADDR0=0<<4, PCI_ADDR1=1<<4, PCI_ADDR2=2<<4, PCI_ADDR3=3<<4,
-        PCI_ADDR_64BITS=0x100, PCI_NO_ACPI_WAKE=0x200, PCI_NO_MIN_LATENCY=0x400,
-        PCI_UNUSED_IRQ=0x800,
-};
 enum capability_flags {
        HasMII=1, FullTxStatus=2, IsGigabit=4, HasMulticastBug=8, FullRxStatus=16,
        HasMACAddrBug=32, /* Only on early revs.  */
        DontUseEeprom=64, /* Don't read the MAC from the EEPROm. */
 };
 /* The PCI I/O space extent. */
-#define YELLOWFIN_SIZE 0x100
+enum {
-#ifdef USE_IO_OPS
+        YELLOWFIN_SIZE  = 0x100,
-#define PCI_IOTYPE (PCI_USES_MASTER | PCI_USES_IO  | PCI_ADDR0)
+};
-#else
-#define PCI_IOTYPE (PCI_USES_MASTER | PCI_USES_MEM | PCI_ADDR1)
-#endif
 struct pci_id_info {
        const char *name;
@@ -261,24 +227,21 @@ struct pci_id_info {
                int     pci, pci_mask, subsystem, subsystem_mask;
                int revision, revision_mask;                            /* Only 8 bits. */
        } id;
-        enum pci_id_flags_bits pci_flags;
-        int io_size;                            /* Needed for I/O region check or ioremap(). */
        int drv_flags;                          /* Driver use, intended as capability flags. */
 };
 static const struct pci_id_info pci_id_tbl[] = {
        {"Yellowfin G-NIC Gigabit Ethernet", { 0x07021000, 0xffffffff},
-         PCI_IOTYPE, YELLOWFIN_SIZE,
         FullTxStatus | IsGigabit | HasMulticastBug | HasMACAddrBug | DontUseEeprom},
        {"Symbios SYM83C885", { 0x07011000, 0xffffffff},
-         PCI_IOTYPE, YELLOWFIN_SIZE, HasMII | DontUseEeprom },
+          HasMII | DontUseEeprom },
-        {NULL,},
+        { }
 };
-static struct pci_device_id yellowfin_pci_tbl[] = {
+static const struct pci_device_id yellowfin_pci_tbl[] = {
        { 0x1000, 0x0702, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
        { 0x1000, 0x0701, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1 },
-        { 0, }
+        { }
 };
 MODULE_DEVICE_TABLE (pci, yellowfin_pci_tbl);
@@ -616,7 +579,7 @@ static int yellowfin_open(struct net_device *dev)
        /* Reset the chip. */
        iowrite32(0x80000000, ioaddr + DMACtrl);
-        i = request_irq(dev->irq, &yellowfin_interrupt, SA_SHIRQ, dev->name, dev);
+        i = request_irq(dev->irq, &yellowfin_interrupt, IRQF_SHARED, dev->name, dev);
        if (i) return i;
        if (yellowfin_debug > 1)
@@ -862,13 +825,11 @@ static int yellowfin_start_xmit(struct sk_buff *skb, struct net_device *dev)
                /* Fix GX chipset errata. */
                if (cacheline_end > 24  || cacheline_end == 0) {
                        len = skb->len + 32 - cacheline_end + 1;
-                        if (len != skb->len)
+                        if (skb_padto(skb, len)) {
-                                skb = skb_padto(skb, len);
+                                yp->tx_skbuff[entry] = NULL;
-                }
+                                netif_wake_queue(dev);
-                if (skb == NULL) {
+                                return 0;
-                        yp->tx_skbuff[entry] = NULL;
+                        }
-                        netif_wake_queue(dev);
-                        return 0;
                }
        }
        yp->tx_skbuff[entry] = skb;
diff --git a/drivers/net/znet.c b/drivers/net/znet.c
index 3ac047bc727d..9f0291f35290 100644
--- a/drivers/net/znet.c
+++ b/drivers/net/znet.c
@@ -85,7 +85,6 @@
   - Understand why some traffic patterns add a 1s latency...
 */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
@@ -544,8 +543,7 @@ static int znet_send_packet(struct sk_buff *skb, struct net_device *dev)
                printk(KERN_DEBUG "%s: ZNet_send_packet.\n", dev->name);
        if (length < ETH_ZLEN) {
-                skb = skb_padto(skb, ETH_ZLEN);
+                if (skb_padto(skb, ETH_ZLEN))
-                if (skb == NULL)
                        return 0;
                length = ETH_ZLEN;
        }
diff --git a/drivers/net/zorro8390.c b/drivers/net/zorro8390.c
index 8037e5806d0a..df04e050c647 100644
--- a/drivers/net/zorro8390.c
+++ b/drivers/net/zorro8390.c
@@ -201,7 +201,7 @@ static int __devinit zorro8390_init(struct net_device *dev,
    dev->irq = IRQ_AMIGA_PORTS;
    /* Install the Interrupt handler */
-    i = request_irq(IRQ_AMIGA_PORTS, ei_interrupt, SA_SHIRQ, DRV_NAME, dev);
+    i = request_irq(IRQ_AMIGA_PORTS, ei_interrupt, IRQF_SHARED, DRV_NAME, dev);
    if (i) return i;
    for(i = 0; i < ETHER_ADDR_LEN; i++) {