167 files changed, 2671 insertions, 2099 deletions
diff --git a/drivers/net/3c509.c b/drivers/net/3c509.c
index edda6e10ebe5..8fafac987e0b 100644
--- a/drivers/net/3c509.c
+++ b/drivers/net/3c509.c
@@ -385,6 +385,7 @@ static int __init el3_probe(int card_idx)
 #if defined(__ISAPNP__)
        static int pnp_cards;
        struct pnp_dev *idev = NULL;
+        int pnp_found = 0;
        if (nopnp == 1)
                goto no_pnp;
@@ -430,6 +431,7 @@ __again:
                        pnp_cards++;
                        netdev_boot_setup_check(dev);
+                        pnp_found = 1;
                        goto found;
                }
        }
@@ -560,6 +562,8 @@ no_pnp:
        lp = netdev_priv(dev);
 #if defined(__ISAPNP__)
        lp->dev = &idev->dev;
+        if (pnp_found)
+                lp->type = EL3_PNP;
 #endif
        err = el3_common_init(dev);
diff --git a/drivers/net/3c515.c b/drivers/net/3c515.c
index 275e7510ebaf..684bab781015 100644
--- a/drivers/net/3c515.c
+++ b/drivers/net/3c515.c
@@ -243,14 +243,16 @@ enum eeprom_offset {
 enum Window3 {                  /* Window 3: MAC/config bits. */
        Wn3_Config = 0, Wn3_MAC_Ctrl = 6, Wn3_Options = 8,
 };
-union wn3_config {
+enum wn3_config {
-        int i;
+        Ram_size = 7,
-        struct w3_config_fields {
+        Ram_width = 8,
-                unsigned int ram_size:3, ram_width:1, ram_speed:2, rom_size:2;
+        Ram_speed = 0x30,
-                int pad8:8;
+        Rom_size = 0xc0,
-                unsigned int ram_split:2, pad18:2, xcvr:3, pad21:1, autoselect:1;
+        Ram_split_shift = 16,
-                int pad24:7;
+        Ram_split = 3 << Ram_split_shift,
-        } u;
+        Xcvr_shift = 20,
+        Xcvr = 7 << Xcvr_shift,
+        Autoselect = 0x1000000,
 };
 enum Window4 {
@@ -614,7 +616,7 @@ static int corkscrew_setup(struct net_device *dev, int ioaddr,
        /* Read the station address from the EEPROM. */
        EL3WINDOW(0);
        for (i = 0; i < 0x18; i++) {
-                short *phys_addr = (short *) dev->dev_addr;
+                __be16 *phys_addr = (__be16 *) dev->dev_addr;
                int timer;
                outw(EEPROM_Read + i, ioaddr + Wn0EepromCmd);
                /* Pause for at least 162 us. for the read to take place. */
@@ -646,22 +648,22 @@ static int corkscrew_setup(struct net_device *dev, int ioaddr,
        {
                char *ram_split[] = { "5:3", "3:1", "1:1", "3:5" };
-                union wn3_config config;
+                __u32 config;
                EL3WINDOW(3);
                vp->available_media = inw(ioaddr + Wn3_Options);
-                config.i = inl(ioaddr + Wn3_Config);
+                config = inl(ioaddr + Wn3_Config);
                if (corkscrew_debug > 1)
                        printk(KERN_INFO "  Internal config register is %4.4x, transceivers %#x.\n",
-                                config.i, inw(ioaddr + Wn3_Options));
+                                config, inw(ioaddr + Wn3_Options));
                printk(KERN_INFO "  %dK %s-wide RAM %s Rx:Tx split, %s%s interface.\n",
-                        8 << config.u.ram_size,
+                        8 << config & Ram_size,
-                        config.u.ram_width ? "word" : "byte",
+                        config & Ram_width ? "word" : "byte",
-                        ram_split[config.u.ram_split],
+                        ram_split[(config & Ram_split) >> Ram_split_shift],
-                        config.u.autoselect ? "autoselect/" : "",
+                        config & Autoselect ? "autoselect/" : "",
-                        media_tbl[config.u.xcvr].name);
+                        media_tbl[(config & Xcvr) >> Xcvr_shift].name);
-                dev->if_port = config.u.xcvr;
+                vp->default_media = (config & Xcvr) >> Xcvr_shift;
-                vp->default_media = config.u.xcvr;
+                vp->autoselect = config & Autoselect ? 1 : 0;
-                vp->autoselect = config.u.autoselect;
+                dev->if_port = vp->default_media;
        }
        if (vp->media_override != 7) {
                printk(KERN_INFO "  Media override to transceiver type %d (%s).\n",
@@ -694,14 +696,14 @@ static int corkscrew_open(struct net_device *dev)
 {
        int ioaddr = dev->base_addr;
        struct corkscrew_private *vp = netdev_priv(dev);
-        union wn3_config config;
+        __u32 config;
        int i;
        /* Before initializing select the active media port. */
        EL3WINDOW(3);
        if (vp->full_duplex)
                outb(0x20, ioaddr + Wn3_MAC_Ctrl);      /* Set the full-duplex bit. */
-        config.i = inl(ioaddr + Wn3_Config);
+        config = inl(ioaddr + Wn3_Config);
        if (vp->media_override != 7) {
                if (corkscrew_debug > 1)
@@ -727,12 +729,12 @@ static int corkscrew_open(struct net_device *dev)
        } else
                dev->if_port = vp->default_media;
-        config.u.xcvr = dev->if_port;
+        config = (config & ~Xcvr) | (dev->if_port << Xcvr_shift);
-        outl(config.i, ioaddr + Wn3_Config);
+        outl(config, ioaddr + Wn3_Config);
        if (corkscrew_debug > 1) {
                printk("%s: corkscrew_open() InternalConfig %8.8x.\n",
-                       dev->name, config.i);
+                       dev->name, config);
        }
        outw(TxReset, ioaddr + EL3_CMD);
@@ -901,7 +903,7 @@ static void corkscrew_timer(unsigned long data)
                        ok = 1;
                }
                if (!ok) {
-                        union wn3_config config;
+                        __u32 config;
                        do {
                                dev->if_port =
@@ -928,9 +930,9 @@ static void corkscrew_timer(unsigned long data)
                             ioaddr + Wn4_Media);
                        EL3WINDOW(3);
-                        config.i = inl(ioaddr + Wn3_Config);
+                        config = inl(ioaddr + Wn3_Config);
-                        config.u.xcvr = dev->if_port;
+                        config = (config & ~Xcvr) | (dev->if_port << Xcvr_shift);
-                        outl(config.i, ioaddr + Wn3_Config);
+                        outl(config, ioaddr + Wn3_Config);
                        outw(dev->if_port == 3 ? StartCoax : StopCoax,
                             ioaddr + EL3_CMD);
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index e8d69b0adf90..9af05a2f4af3 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -166,16 +166,6 @@ config NET_SB1000
          If you don't have this card, of course say N.
-config IP1000
-        tristate "IP1000 Gigabit Ethernet support"
-        depends on PCI && EXPERIMENTAL
-        select MII
-        ---help---
-          This driver supports IP1000 gigabit Ethernet cards.
-          To compile this driver as a module, choose M here: the module
-          will be called ipg.  This is recommended.
 source "drivers/net/arcnet/Kconfig"
 source "drivers/net/phy/Kconfig"
@@ -888,7 +878,7 @@ config SMC91X
        tristate "SMC 91C9x/91C1xxx support"
        select CRC32
        select MII
-        depends on ARM || REDWOOD_5 || REDWOOD_6 || M32R || SUPERH || SOC_AU1X00 || BFIN
+        depends on ARM || REDWOOD_5 || REDWOOD_6 || M32R || SUPERH || SOC_AU1X00 || BLACKFIN
        help
          This is a driver for SMC's 91x series of Ethernet chipsets,
          including the SMC91C94 and the SMC91C111. Say Y if you want it
@@ -926,7 +916,7 @@ config SMC911X
        tristate "SMSC LAN911[5678] support"
        select CRC32
        select MII
-        depends on ARCH_PXA || SUPERH
+        depends on ARCH_PXA || SH_MAGIC_PANEL_R2
        help
          This is a driver for SMSC's LAN911x series of Ethernet chipsets
          including the new LAN9115, LAN9116, LAN9117, and LAN9118.
@@ -1986,12 +1976,19 @@ config E1000E
          <http://support.intel.com>
-          More specific information on configuring the driver is in
-          <file:Documentation/networking/e1000e.txt>.
          To compile this driver as a module, choose M here. The module
          will be called e1000e.
+config IP1000
+        tristate "IP1000 Gigabit Ethernet support"
+        depends on PCI && EXPERIMENTAL
+        select MII
+        ---help---
+          This driver supports IP1000 gigabit Ethernet cards.
+          To compile this driver as a module, choose M here: the module
+          will be called ipg.  This is recommended.
 source "drivers/net/ixp2000/Kconfig"
 config MYRI_SBUS
@@ -2468,9 +2465,6 @@ config IXGBE
          <http://support.intel.com>
-          More specific information on configuring the driver is in
-          <file:Documentation/networking/ixgbe.txt>.
          To compile this driver as a module, choose M here. The module
          will be called ixgbe.
diff --git a/drivers/net/amd8111e.c b/drivers/net/amd8111e.c
index eebf5bb2b03a..e7fdd81919bd 100644
--- a/drivers/net/amd8111e.c
+++ b/drivers/net/amd8111e.c
@@ -1340,7 +1340,9 @@ static int amd8111e_close(struct net_device * dev)
        struct amd8111e_priv *lp = netdev_priv(dev);
        netif_stop_queue(dev);
+#ifdef CONFIG_AMD8111E_NAPI
        napi_disable(&lp->napi);
+#endif
        spin_lock_irq(&lp->lock);
@@ -1372,7 +1374,9 @@ static int amd8111e_open(struct net_device * dev )
                                         dev->name, dev))
                return -EAGAIN;
+#ifdef CONFIG_AMD8111E_NAPI
        napi_enable(&lp->napi);
+#endif
        spin_lock_irq(&lp->lock);
@@ -1380,7 +1384,9 @@ static int amd8111e_open(struct net_device * dev )
        if(amd8111e_restart(dev)){
                spin_unlock_irq(&lp->lock);
+#ifdef CONFIG_AMD8111E_NAPI
                napi_disable(&lp->napi);
+#endif
                if (dev->irq)
                        free_irq(dev->irq, dev);
                return -ENOMEM;
diff --git a/drivers/net/atl1/atl1_main.c b/drivers/net/atl1/atl1_main.c
index 35b0a7dd4ef4..9200ee59d854 100644
--- a/drivers/net/atl1/atl1_main.c
+++ b/drivers/net/atl1/atl1_main.c
@@ -120,7 +120,7 @@ static int __devinit atl1_sw_init(struct atl1_adapter *adapter)
        struct atl1_hw *hw = &adapter->hw;
        struct net_device *netdev = adapter->netdev;
-        hw->max_frame_size = netdev->mtu + ETH_HLEN + ETH_FCS_LEN;
+        hw->max_frame_size = netdev->mtu + ETH_HLEN + ETH_FCS_LEN + VLAN_HLEN;
        hw->min_frame_size = ETH_ZLEN + ETH_FCS_LEN;
        adapter->wol = 0;
@@ -688,7 +688,7 @@ static int atl1_change_mtu(struct net_device *netdev, int new_mtu)
 {
        struct atl1_adapter *adapter = netdev_priv(netdev);
        int old_mtu = netdev->mtu;
-        int max_frame = new_mtu + ETH_HLEN + ETH_FCS_LEN;
+        int max_frame = new_mtu + ETH_HLEN + ETH_FCS_LEN + VLAN_HLEN;
        if ((max_frame < ETH_ZLEN + ETH_FCS_LEN) ||
            (max_frame > MAX_JUMBO_FRAME_SIZE)) {
@@ -853,8 +853,8 @@ static u32 atl1_configure(struct atl1_adapter *adapter)
        /* set Interrupt Clear Timer */
        iowrite16(adapter->ict, hw->hw_addr + REG_CMBDISDMA_TIMER);
-        /* set MTU, 4 : VLAN */
+        /* set max frame size hw will accept */
-        iowrite32(hw->max_frame_size + 4, hw->hw_addr + REG_MTU);
+        iowrite32(hw->max_frame_size, hw->hw_addr + REG_MTU);
        /* jumbo size & rrd retirement timer */
        value = (((u32) hw->rx_jumbo_th & RXQ_JMBOSZ_TH_MASK)
diff --git a/drivers/net/bfin_mac.c b/drivers/net/bfin_mac.c
index 084acfd6fc5f..eb971755a3ff 100644
--- a/drivers/net/bfin_mac.c
+++ b/drivers/net/bfin_mac.c
@@ -676,7 +676,7 @@ static void bf537mac_rx(struct net_device *dev)
        skb->protocol = eth_type_trans(skb, dev);
 #if defined(BFIN_MAC_CSUM_OFFLOAD)
        skb->csum = current_rx_ptr->status.ip_payload_csum;
-        skb->ip_summed = CHECKSUM_PARTIAL;
+        skb->ip_summed = CHECKSUM_COMPLETE;
 #endif
        netif_rx(skb);
@@ -924,7 +924,7 @@ static int __init bf537mac_probe(struct net_device *dev)
        if (!is_valid_ether_addr(dev->dev_addr)) {
                /* Grab the MAC from the board somehow - this is done in the
                   arch/blackfin/mach-bf537/boards/eth_mac.c */
-                get_bf537_ether_addr(dev->dev_addr);
+                bfin_get_ether_addr(dev->dev_addr);
        }
        /* If still not valid, get a random one */
diff --git a/drivers/net/bfin_mac.h b/drivers/net/bfin_mac.h
index 3a107ad75381..5970ea7142cd 100644
--- a/drivers/net/bfin_mac.h
+++ b/drivers/net/bfin_mac.h
@@ -92,4 +92,4 @@ struct bf537mac_local {
        struct mii_bus mii_bus;
 };
-extern void get_bf537_ether_addr(char *addr);
+extern void bfin_get_ether_addr(char *addr);
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index da767d3d5af5..4e7b46e44874 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -56,8 +56,8 @@
 #define DRV_MODULE_NAME         "bnx2"
 #define PFX DRV_MODULE_NAME     ": "
-#define DRV_MODULE_VERSION      "1.6.8"
+#define DRV_MODULE_VERSION      "1.6.9"
-#define DRV_MODULE_RELDATE      "October 17, 2007"
+#define DRV_MODULE_RELDATE      "December 8, 2007"
 #define RUN_AT(x) (jiffies + (x))
@@ -2387,18 +2387,24 @@ bnx2_reuse_rx_skb(struct bnx2 *bp, struct sk_buff *skb,
        prod_bd->rx_bd_haddr_lo = cons_bd->rx_bd_haddr_lo;
 }
+static inline u16
+bnx2_get_hw_rx_cons(struct bnx2 *bp)
+{
+        u16 cons = bp->status_blk->status_rx_quick_consumer_index0;
+        if (unlikely((cons & MAX_RX_DESC_CNT) == MAX_RX_DESC_CNT))
+                cons++;
+        return cons;
+}
 static int
 bnx2_rx_int(struct bnx2 *bp, int budget)
 {
-        struct status_block *sblk = bp->status_blk;
        u16 hw_cons, sw_cons, sw_ring_cons, sw_prod, sw_ring_prod;
        struct l2_fhdr *rx_hdr;
        int rx_pkt = 0;
-        hw_cons = bp->hw_rx_cons = sblk->status_rx_quick_consumer_index0;
+        hw_cons = bnx2_get_hw_rx_cons(bp);
-        if ((hw_cons & MAX_RX_DESC_CNT) == MAX_RX_DESC_CNT) {
-                hw_cons++;
-        }
        sw_cons = bp->rx_cons;
        sw_prod = bp->rx_prod;
@@ -2515,10 +2521,7 @@ next_rx:
                /* Refresh hw_cons to see if there is new work */
                if (sw_cons == hw_cons) {
-                        hw_cons = bp->hw_rx_cons =
+                        hw_cons = bnx2_get_hw_rx_cons(bp);
-                                sblk->status_rx_quick_consumer_index0;
-                        if ((hw_cons & MAX_RX_DESC_CNT) == MAX_RX_DESC_CNT)
-                                hw_cons++;
                        rmb();
                }
        }
@@ -2622,7 +2625,7 @@ bnx2_has_work(struct bnx2 *bp)
 {
        struct status_block *sblk = bp->status_blk;
-        if ((sblk->status_rx_quick_consumer_index0 != bp->hw_rx_cons) ||
+        if ((bnx2_get_hw_rx_cons(bp) != bp->rx_cons) ||
            (sblk->status_tx_quick_consumer_index0 != bp->hw_tx_cons))
                return 1;
@@ -2655,7 +2658,7 @@ static int bnx2_poll_work(struct bnx2 *bp, int work_done, int budget)
        if (sblk->status_tx_quick_consumer_index0 != bp->hw_tx_cons)
                bnx2_tx_int(bp);
-        if (sblk->status_rx_quick_consumer_index0 != bp->hw_rx_cons)
+        if (bnx2_get_hw_rx_cons(bp) != bp->rx_cons)
                work_done += bnx2_rx_int(bp, budget - work_done);
        return work_done;
@@ -4177,7 +4180,6 @@ bnx2_init_rx_ring(struct bnx2 *bp)
        ring_prod = prod = bp->rx_prod = 0;
        bp->rx_cons = 0;
-        bp->hw_rx_cons = 0;
        bp->rx_prod_bseq = 0;
        for (i = 0; i < bp->rx_max_ring; i++) {
@@ -6685,8 +6687,9 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)
        } else if (CHIP_NUM(bp) == CHIP_NUM_5706 ||
                   CHIP_NUM(bp) == CHIP_NUM_5708)
                bp->phy_flags |= PHY_CRC_FIX_FLAG;
-        else if (CHIP_ID(bp) == CHIP_ID_5709_A0 ||
+        else if (CHIP_NUM(bp) == CHIP_NUM_5709 &&
-                 CHIP_ID(bp) == CHIP_ID_5709_A1)
+                 (CHIP_REV(bp) == CHIP_REV_Ax ||
+                  CHIP_REV(bp) == CHIP_REV_Bx))
                bp->phy_flags |= PHY_DIS_EARLY_DAC_FLAG;
        if ((CHIP_ID(bp) == CHIP_ID_5708_A0) ||
diff --git a/drivers/net/bnx2.h b/drivers/net/bnx2.h
index 1dce0d1a2581..30ba366608b0 100644
--- a/drivers/net/bnx2.h
+++ b/drivers/net/bnx2.h
@@ -6513,7 +6513,6 @@ struct bnx2 {
        u32                     rx_prod_bseq;
        u16                     rx_prod;
        u16                     rx_cons;
-        u16                     hw_rx_cons;
        u32                     rx_csum;
diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c
index 25b8dbf6cfd7..b57bc9467dbe 100644
--- a/drivers/net/bonding/bond_alb.c
+++ b/drivers/net/bonding/bond_alb.c
@@ -979,7 +979,7 @@ static void alb_swap_mac_addr(struct bonding *bond, struct slave *slave1, struct
 /*
 * Send learning packets after MAC address swap.
 *
- * Called with RTNL and bond->lock held for read.
+ * Called with RTNL and no other locks
 */
 static void alb_fasten_mac_swap(struct bonding *bond, struct slave *slave1,
                                struct slave *slave2)
@@ -987,6 +987,8 @@ static void alb_fasten_mac_swap(struct bonding *bond, struct slave *slave1,
        int slaves_state_differ = (SLAVE_IS_OK(slave1) != SLAVE_IS_OK(slave2));
        struct slave *disabled_slave = NULL;
+        ASSERT_RTNL();
        /* fasten the change in the switch */
        if (SLAVE_IS_OK(slave1)) {
                alb_send_learning_packets(slave1, slave1->dev->dev_addr);
@@ -1031,7 +1033,7 @@ static void alb_fasten_mac_swap(struct bonding *bond, struct slave *slave1,
 * a slave that has @slave's permanet address as its current address.
 * We'll make sure that that slave no longer uses @slave's permanent address.
 *
- * Caller must hold bond lock
+ * Caller must hold RTNL and no other locks
 */
 static void alb_change_hw_addr_on_detach(struct bonding *bond, struct slave *slave)
 {
@@ -1542,7 +1544,12 @@ int bond_alb_init_slave(struct bonding *bond, struct slave *slave)
        return 0;
 }
-/* Caller must hold bond lock for write */
+/*
+ * Remove slave from tlb and rlb hash tables, and fix up MAC addresses
+ * if necessary.
+ *
+ * Caller must hold RTNL and no other locks
+ */
 void bond_alb_deinit_slave(struct bonding *bond, struct slave *slave)
 {
        if (bond->slave_cnt > 1) {
@@ -1601,9 +1608,6 @@ void bond_alb_handle_active_change(struct bonding *bond, struct slave *new_slave
        struct slave *swap_slave;
        int i;
-        if (new_slave)
-                ASSERT_RTNL();
        if (bond->curr_active_slave == new_slave) {
                return;
        }
@@ -1649,6 +1653,8 @@ void bond_alb_handle_active_change(struct bonding *bond, struct slave *new_slave
        write_unlock_bh(&bond->curr_slave_lock);
        read_unlock(&bond->lock);
+        ASSERT_RTNL();
        /* curr_active_slave must be set before calling alb_swap_mac_addr */
        if (swap_slave) {
                /* swap mac address */
@@ -1659,12 +1665,11 @@ void bond_alb_handle_active_change(struct bonding *bond, struct slave *new_slave
                                       bond->alb_info.rlb_enabled);
        }
-        read_lock(&bond->lock);
        if (swap_slave) {
                alb_fasten_mac_swap(bond, swap_slave, new_slave);
+                read_lock(&bond->lock);
        } else {
-                /* fasten bond mac on new current slave */
+                read_lock(&bond->lock);
                alb_send_learning_packets(new_slave, bond->dev->dev_addr);
        }
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 423298c84a1d..49a198206e3d 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -74,6 +74,7 @@
 #include <linux/ethtool.h>
 #include <linux/if_vlan.h>
 #include <linux/if_bonding.h>
+#include <linux/jiffies.h>
 #include <net/route.h>
 #include <net/net_namespace.h>
 #include "bonding.h"
@@ -174,6 +175,7 @@ struct bond_parm_tbl bond_mode_tbl[] = {
 struct bond_parm_tbl xmit_hashtype_tbl[] = {
 {       "layer2",               BOND_XMIT_POLICY_LAYER2},
 {       "layer3+4",             BOND_XMIT_POLICY_LAYER34},
+{       "layer2+3",             BOND_XMIT_POLICY_LAYER23},
 {       NULL,                   -1},
 };
@@ -1744,7 +1746,9 @@ int bond_release(struct net_device *bond_dev, struct net_device *slave_dev)
                 * has been cleared (if our_slave == old_current),
                 * but before a new active slave is selected.
                 */
+                write_unlock_bh(&bond->lock);
                bond_alb_deinit_slave(bond, slave);
+                write_lock_bh(&bond->lock);
        }
        if (oldcurrent == slave) {
@@ -1903,6 +1907,12 @@ static int bond_release_all(struct net_device *bond_dev)
                slave_dev = slave->dev;
                bond_detach_slave(bond, slave);
+                /* now that the slave is detached, unlock and perform
+                 * all the undo steps that should not be called from
+                 * within a lock.
+                 */
+                write_unlock_bh(&bond->lock);
                if ((bond->params.mode == BOND_MODE_TLB) ||
                    (bond->params.mode == BOND_MODE_ALB)) {
                        /* must be called only after the slave
@@ -1913,12 +1923,6 @@ static int bond_release_all(struct net_device *bond_dev)
                bond_compute_features(bond);
-                /* now that the slave is detached, unlock and perform
-                 * all the undo steps that should not be called from
-                 * within a lock.
-                 */
-                write_unlock_bh(&bond->lock);
                bond_destroy_slave_symlinks(bond_dev, slave_dev);
                bond_del_vlans_from_slave(bond, slave_dev);
@@ -2382,7 +2386,9 @@ void bond_mii_monitor(struct work_struct *work)
                rtnl_lock();
                read_lock(&bond->lock);
                __bond_mii_monitor(bond, 1);
-                rtnl_unlock();
+                read_unlock(&bond->lock);
+                rtnl_unlock();  /* might sleep, hold no other locks */
+                read_lock(&bond->lock);
        }
        delay = ((bond->params.miimon * HZ) / 1000) ? : 1;
@@ -2722,8 +2728,8 @@ void bond_loadbalance_arp_mon(struct work_struct *work)
         */
        bond_for_each_slave(bond, slave, i) {
                if (slave->link != BOND_LINK_UP) {
-                        if (((jiffies - slave->dev->trans_start) <= delta_in_ticks) &&
+                        if (time_before_eq(jiffies, slave->dev->trans_start + delta_in_ticks) &&
-                            ((jiffies - slave->dev->last_rx) <= delta_in_ticks)) {
+                            time_before_eq(jiffies, slave->dev->last_rx + delta_in_ticks)) {
                                slave->link  = BOND_LINK_UP;
                                slave->state = BOND_STATE_ACTIVE;
@@ -2754,8 +2760,8 @@ void bond_loadbalance_arp_mon(struct work_struct *work)
                         * when the source ip is 0, so don't take the link down
                         * if we don't know our ip yet
                         */
-                        if (((jiffies - slave->dev->trans_start) >= (2*delta_in_ticks)) ||
+                        if (time_after_eq(jiffies, slave->dev->trans_start + 2*delta_in_ticks) ||
-                            (((jiffies - slave->dev->last_rx) >= (2*delta_in_ticks)) &&
+                            (time_after_eq(jiffies, slave->dev->last_rx + 2*delta_in_ticks) &&
                             bond_has_ip(bond))) {
                                slave->link  = BOND_LINK_DOWN;
@@ -2848,8 +2854,8 @@ void bond_activebackup_arp_mon(struct work_struct *work)
         */
        bond_for_each_slave(bond, slave, i) {
                if (slave->link != BOND_LINK_UP) {
-                        if ((jiffies - slave_last_rx(bond, slave)) <=
+                        if (time_before_eq(jiffies,
-                             delta_in_ticks) {
+                            slave_last_rx(bond, slave) + delta_in_ticks)) {
                                slave->link = BOND_LINK_UP;
@@ -2858,7 +2864,7 @@ void bond_activebackup_arp_mon(struct work_struct *work)
                                write_lock_bh(&bond->curr_slave_lock);
                                if ((!bond->curr_active_slave) &&
-                                    ((jiffies - slave->dev->trans_start) <= delta_in_ticks)) {
+                                    time_before_eq(jiffies, slave->dev->trans_start + delta_in_ticks)) {
                                        bond_change_active_slave(bond, slave);
                                        bond->current_arp_slave = NULL;
                                } else if (bond->curr_active_slave != slave) {
@@ -2897,7 +2903,7 @@ void bond_activebackup_arp_mon(struct work_struct *work)
                        if ((slave != bond->curr_active_slave) &&
                            (!bond->current_arp_slave) &&
-                            (((jiffies - slave_last_rx(bond, slave)) >= 3*delta_in_ticks) &&
+                            (time_after_eq(jiffies, slave_last_rx(bond, slave) + 3*delta_in_ticks) &&
                             bond_has_ip(bond))) {
                                /* a backup slave has gone down; three times
                                 * the delta allows the current slave to be
@@ -2943,10 +2949,10 @@ void bond_activebackup_arp_mon(struct work_struct *work)
                 * before being taken out. if a primary is being used, check
                 * if it is up and needs to take over as the curr_active_slave
                 */
-                if ((((jiffies - slave->dev->trans_start) >= (2*delta_in_ticks)) ||
+                if ((time_after_eq(jiffies, slave->dev->trans_start + 2*delta_in_ticks) ||
-            (((jiffies - slave_last_rx(bond, slave)) >= (2*delta_in_ticks)) &&
+                        (time_after_eq(jiffies, slave_last_rx(bond, slave) + 2*delta_in_ticks) &&
-             bond_has_ip(bond))) &&
+                         bond_has_ip(bond))) &&
-                    ((jiffies - slave->jiffies) >= 2*delta_in_ticks)) {
+                        time_after_eq(jiffies, slave->jiffies + 2*delta_in_ticks)) {
                        slave->link  = BOND_LINK_DOWN;
@@ -3397,9 +3403,7 @@ static int bond_master_netdev_event(unsigned long event, struct net_device *bond
        case NETDEV_CHANGENAME:
                return bond_event_changename(event_bond);
        case NETDEV_UNREGISTER:
-                /*
+                bond_release_all(event_bond->dev);
-                 * TODO: remove a bond from the list?
-                 */
                break;
        default:
                break;
@@ -3604,6 +3608,24 @@ void bond_unregister_arp(struct bonding *bond)
 /*---------------------------- Hashing Policies -----------------------------*/
 /*
+ * Hash for the output device based upon layer 2 and layer 3 data. If
+ * the packet is not IP mimic bond_xmit_hash_policy_l2()
+ */
+static int bond_xmit_hash_policy_l23(struct sk_buff *skb,
+                                     struct net_device *bond_dev, int count)
+{
+        struct ethhdr *data = (struct ethhdr *)skb->data;
+        struct iphdr *iph = ip_hdr(skb);
+        if (skb->protocol == __constant_htons(ETH_P_IP)) {
+                return ((ntohl(iph->saddr ^ iph->daddr) & 0xffff) ^
+                        (data->h_dest[5] ^ bond_dev->dev_addr[5])) % count;
+        }
+        return (data->h_dest[5] ^ bond_dev->dev_addr[5]) % count;
+}
+/*
 * Hash for the output device based upon layer 3 and layer 4 data. If
 * the packet is a frag or not TCP or UDP, just use layer 3 data.  If it is
 * altogether not IP, mimic bond_xmit_hash_policy_l2()
@@ -4305,6 +4327,22 @@ out:
 /*------------------------- Device initialization ---------------------------*/
+static void bond_set_xmit_hash_policy(struct bonding *bond)
+{
+        switch (bond->params.xmit_policy) {
+        case BOND_XMIT_POLICY_LAYER23:
+                bond->xmit_hash_policy = bond_xmit_hash_policy_l23;
+                break;
+        case BOND_XMIT_POLICY_LAYER34:
+                bond->xmit_hash_policy = bond_xmit_hash_policy_l34;
+                break;
+        case BOND_XMIT_POLICY_LAYER2:
+        default:
+                bond->xmit_hash_policy = bond_xmit_hash_policy_l2;
+                break;
+        }
+}
 /*
 * set bond mode specific net device operations
 */
@@ -4321,10 +4359,7 @@ void bond_set_mode_ops(struct bonding *bond, int mode)
                break;
        case BOND_MODE_XOR:
                bond_dev->hard_start_xmit = bond_xmit_xor;
-                if (bond->params.xmit_policy == BOND_XMIT_POLICY_LAYER34)
+                bond_set_xmit_hash_policy(bond);
-                        bond->xmit_hash_policy = bond_xmit_hash_policy_l34;
-                else
-                        bond->xmit_hash_policy = bond_xmit_hash_policy_l2;
                break;
        case BOND_MODE_BROADCAST:
                bond_dev->hard_start_xmit = bond_xmit_broadcast;
@@ -4332,10 +4367,7 @@ void bond_set_mode_ops(struct bonding *bond, int mode)
        case BOND_MODE_8023AD:
                bond_set_master_3ad_flags(bond);
                bond_dev->hard_start_xmit = bond_3ad_xmit_xor;
-                if (bond->params.xmit_policy == BOND_XMIT_POLICY_LAYER34)
+                bond_set_xmit_hash_policy(bond);
-                        bond->xmit_hash_policy = bond_xmit_hash_policy_l34;
-                else
-                        bond->xmit_hash_policy = bond_xmit_hash_policy_l2;
                break;
        case BOND_MODE_ALB:
                bond_set_master_alb_flags(bond);
@@ -4462,6 +4494,27 @@ static void bond_deinit(struct net_device *bond_dev)
 #endif
 }
+static void bond_work_cancel_all(struct bonding *bond)
+{
+        write_lock_bh(&bond->lock);
+        bond->kill_timers = 1;
+        write_unlock_bh(&bond->lock);
+        if (bond->params.miimon && delayed_work_pending(&bond->mii_work))
+                cancel_delayed_work(&bond->mii_work);
+        if (bond->params.arp_interval && delayed_work_pending(&bond->arp_work))
+                cancel_delayed_work(&bond->arp_work);
+        if (bond->params.mode == BOND_MODE_ALB &&
+            delayed_work_pending(&bond->alb_work))
+                cancel_delayed_work(&bond->alb_work);
+        if (bond->params.mode == BOND_MODE_8023AD &&
+            delayed_work_pending(&bond->ad_work))
+                cancel_delayed_work(&bond->ad_work);
+}
 /* Unregister and free all bond devices.
 * Caller must hold rtnl_lock.
 */
@@ -4472,6 +4525,7 @@ static void bond_free_all(void)
        list_for_each_entry_safe(bond, nxt, &bond_dev_list, bond_list) {
                struct net_device *bond_dev = bond->dev;
+                bond_work_cancel_all(bond);
                bond_mc_list_destroy(bond);
                /* Release the bonded slaves */
                bond_release_all(bond_dev);
@@ -4488,19 +4542,27 @@ static void bond_free_all(void)
 /*
 * Convert string input module parms.  Accept either the
- * number of the mode or its string name.
+ * number of the mode or its string name.  A bit complicated because
+ * some mode names are substrings of other names, and calls from sysfs
+ * may have whitespace in the name (trailing newlines, for example).
 */
-int bond_parse_parm(char *mode_arg, struct bond_parm_tbl *tbl)
+int bond_parse_parm(const char *buf, struct bond_parm_tbl *tbl)
 {
-        int i;
+        int mode = -1, i, rv;
+        char modestr[BOND_MAX_MODENAME_LEN + 1] = { 0, };
+        rv = sscanf(buf, "%d", &mode);
+        if (!rv) {
+                rv = sscanf(buf, "%20s", modestr);
+                if (!rv)
+                        return -1;
+        }
        for (i = 0; tbl[i].modename; i++) {
-                if ((isdigit(*mode_arg) &&
+                if (mode == tbl[i].mode)
-                     tbl[i].mode == simple_strtol(mode_arg, NULL, 0)) ||
+                        return tbl[i].mode;
-                    (strncmp(mode_arg, tbl[i].modename,
+                if (strcmp(modestr, tbl[i].modename) == 0)
-                             strlen(tbl[i].modename)) == 0)) {
                        return tbl[i].mode;
-                }
        }
        return -1;
@@ -4814,9 +4876,22 @@ static struct lock_class_key bonding_netdev_xmit_lock_key;
 int bond_create(char *name, struct bond_params *params, struct bonding **newbond)
 {
        struct net_device *bond_dev;
+        struct bonding *bond, *nxt;
        int res;
        rtnl_lock();
+        down_write(&bonding_rwsem);
+        /* Check to see if the bond already exists. */
+        list_for_each_entry_safe(bond, nxt, &bond_dev_list, bond_list)
+                if (strnicmp(bond->dev->name, name, IFNAMSIZ) == 0) {
+                        printk(KERN_ERR DRV_NAME
+                               ": cannot add bond %s; it already exists\n",
+                               name);
+                        res = -EPERM;
+                        goto out_rtnl;
+                }
        bond_dev = alloc_netdev(sizeof(struct bonding), name ? name : "",
                                ether_setup);
        if (!bond_dev) {
@@ -4855,10 +4930,12 @@ int bond_create(char *name, struct bond_params *params, struct bonding **newbond
        netif_carrier_off(bond_dev);
+        up_write(&bonding_rwsem);
        rtnl_unlock(); /* allows sysfs registration of net device */
        res = bond_create_sysfs_entry(bond_dev->priv);
        if (res < 0) {
                rtnl_lock();
+                down_write(&bonding_rwsem);
                goto out_bond;
        }
@@ -4869,31 +4946,11 @@ out_bond:
 out_netdev:
        free_netdev(bond_dev);
 out_rtnl:
+        up_write(&bonding_rwsem);
        rtnl_unlock();
        return res;
 }
-static void bond_work_cancel_all(struct bonding *bond)
-{
-        write_lock_bh(&bond->lock);
-        bond->kill_timers = 1;
-        write_unlock_bh(&bond->lock);
-        if (bond->params.miimon && delayed_work_pending(&bond->mii_work))
-                cancel_delayed_work(&bond->mii_work);
-        if (bond->params.arp_interval && delayed_work_pending(&bond->arp_work))
-                cancel_delayed_work(&bond->arp_work);
-        if (bond->params.mode == BOND_MODE_ALB &&
-            delayed_work_pending(&bond->alb_work))
-                cancel_delayed_work(&bond->alb_work);
-        if (bond->params.mode == BOND_MODE_8023AD &&
-            delayed_work_pending(&bond->ad_work))
-                cancel_delayed_work(&bond->ad_work);
-}
 static int __init bonding_init(void)
 {
        int i;
@@ -4910,6 +4967,9 @@ static int __init bonding_init(void)
 #ifdef CONFIG_PROC_FS
        bond_create_proc_dir();
 #endif
+        init_rwsem(&bonding_rwsem);
        for (i = 0; i < max_bonds; i++) {
                res = bond_create(NULL, &bonding_defaults, NULL);
                if (res)
diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c
index b29330d8e309..90a1f31e8e63 100644
--- a/drivers/net/bonding/bond_sysfs.c
+++ b/drivers/net/bonding/bond_sysfs.c
@@ -74,7 +74,7 @@ struct rw_semaphore bonding_rwsem;
 * "show" function for the bond_masters attribute.
 * The class parameter is ignored.
 */
-static ssize_t bonding_show_bonds(struct class *cls, char *buffer)
+static ssize_t bonding_show_bonds(struct class *cls, char *buf)
 {
        int res = 0;
        struct bonding *bond;
@@ -86,14 +86,13 @@ static ssize_t bonding_show_bonds(struct class *cls, char *buffer)
                        /* not enough space for another interface name */
                        if ((PAGE_SIZE - res) > 10)
                                res = PAGE_SIZE - 10;
-                        res += sprintf(buffer + res, "++more++");
+                        res += sprintf(buf + res, "++more++ ");
                        break;
                }
-                res += sprintf(buffer + res, "%s ",
+                res += sprintf(buf + res, "%s ", bond->dev->name);
-                               bond->dev->name);
        }
-        res += sprintf(buffer + res, "\n");
+        if (res)
-        res++;
+                buf[res-1] = '\n'; /* eat the leftover space */
        up_read(&(bonding_rwsem));
        return res;
 }
@@ -110,11 +109,10 @@ static ssize_t bonding_store_bonds(struct class *cls, const char *buffer, size_t
 {
        char command[IFNAMSIZ + 1] = {0, };
        char *ifname;
-        int res = count;
+        int rv, res = count;
        struct bonding *bond;
        struct bonding *nxt;
-        down_write(&(bonding_rwsem));
        sscanf(buffer, "%16s", command); /* IFNAMSIZ*/
        ifname = command + 1;
        if ((strlen(command) <= 1) ||
@@ -122,39 +120,28 @@ static ssize_t bonding_store_bonds(struct class *cls, const char *buffer, size_t
                goto err_no_cmd;
        if (command[0] == '+') {
-                /* Check to see if the bond already exists. */
-                list_for_each_entry_safe(bond, nxt, &bond_dev_list, bond_list)
-                        if (strnicmp(bond->dev->name, ifname, IFNAMSIZ) == 0) {
-                                printk(KERN_ERR DRV_NAME
-                                        ": cannot add bond %s; it already exists\n",
-                                        ifname);
-                                res = -EPERM;
-                                goto out;
-                        }
                printk(KERN_INFO DRV_NAME
                        ": %s is being created...\n", ifname);
-                if (bond_create(ifname, &bonding_defaults, &bond)) {
+                rv = bond_create(ifname, &bonding_defaults, &bond);
-                        printk(KERN_INFO DRV_NAME
+                if (rv) {
-                        ": %s interface already exists. Bond creation failed.\n",
+                        printk(KERN_INFO DRV_NAME ": Bond creation failed.\n");
-                        ifname);
+                        res = rv;
-                        res = -EPERM;
                }
                goto out;
        }
        if (command[0] == '-') {
+                rtnl_lock();
+                down_write(&bonding_rwsem);
                list_for_each_entry_safe(bond, nxt, &bond_dev_list, bond_list)
                        if (strnicmp(bond->dev->name, ifname, IFNAMSIZ) == 0) {
-                                rtnl_lock();
                                /* check the ref count on the bond's kobject.
                                 * If it's > expected, then there's a file open,
                                 * and we have to fail.
                                 */
                                if (atomic_read(&bond->dev->dev.kobj.kref.refcount)
                                                        > expected_refcount){
-                                        rtnl_unlock();
                                        printk(KERN_INFO DRV_NAME
                                                ": Unable remove bond %s due to open references.\n",
                                                ifname);
@@ -165,6 +152,7 @@ static ssize_t bonding_store_bonds(struct class *cls, const char *buffer, size_t
                                        ": %s is being deleted...\n",
                                        bond->dev->name);
                                bond_destroy(bond);
+                                up_write(&bonding_rwsem);
                                rtnl_unlock();
                                goto out;
                        }
@@ -172,6 +160,8 @@ static ssize_t bonding_store_bonds(struct class *cls, const char *buffer, size_t
                printk(KERN_ERR DRV_NAME
                        ": unable to delete non-existent bond %s\n", ifname);
                res = -ENODEV;
+                up_write(&bonding_rwsem);
+                rtnl_unlock();
                goto out;
        }
@@ -184,7 +174,6 @@ err_no_cmd:
         * get called forever, which is bad.
         */
 out:
-        up_write(&(bonding_rwsem));
        return res;
 }
 /* class attribute for bond_masters file.  This ends up in /sys/class/net */
@@ -235,14 +224,14 @@ static ssize_t bonding_show_slaves(struct device *d,
                        /* not enough space for another interface name */
                        if ((PAGE_SIZE - res) > 10)
                                res = PAGE_SIZE - 10;
-                        res += sprintf(buf + res, "++more++");
+                        res += sprintf(buf + res, "++more++ ");
                        break;
                }
                res += sprintf(buf + res, "%s ", slave->dev->name);
        }
        read_unlock(&bond->lock);
-        res += sprintf(buf + res, "\n");
+        if (res)
-        res++;
+                buf[res-1] = '\n'; /* eat the leftover space */
        return res;
 }
@@ -272,6 +261,9 @@ static ssize_t bonding_store_slaves(struct device *d,
        /* Note:  We can't hold bond->lock here, as bond_create grabs it. */
+        rtnl_lock();
+        down_write(&(bonding_rwsem));
        sscanf(buffer, "%16s", command); /* IFNAMSIZ*/
        ifname = command + 1;
        if ((strlen(command) <= 1) ||
@@ -337,12 +329,10 @@ static ssize_t bonding_store_slaves(struct device *d,
                                dev->mtu = bond->dev->mtu;
                        }
                }
-                rtnl_lock();
                res = bond_enslave(bond->dev, dev);
                bond_for_each_slave(bond, slave, i)
                        if (strnicmp(slave->dev->name, ifname, IFNAMSIZ) == 0)
                                slave->original_mtu = original_mtu;
-                rtnl_unlock();
                if (res) {
                        ret = res;
                }
@@ -360,12 +350,10 @@ static ssize_t bonding_store_slaves(struct device *d,
                if (dev) {
                        printk(KERN_INFO DRV_NAME ": %s: Removing slave %s\n",
                                bond->dev->name, dev->name);
-                        rtnl_lock();
                        if (bond->setup_by_slave)
                                res = bond_release_and_destroy(bond->dev, dev);
                        else
                                res = bond_release(bond->dev, dev);
-                        rtnl_unlock();
                        if (res) {
                                ret = res;
                                goto out;
@@ -390,6 +378,8 @@ err_no_cmd:
        ret = -EPERM;
 out:
+        up_write(&(bonding_rwsem));
+        rtnl_unlock();
        return ret;
 }
@@ -406,7 +396,7 @@ static ssize_t bonding_show_mode(struct device *d,
        return sprintf(buf, "%s %d\n",
                        bond_mode_tbl[bond->params.mode].modename,
-                        bond->params.mode) + 1;
+                        bond->params.mode);
 }
 static ssize_t bonding_store_mode(struct device *d,
@@ -424,7 +414,7 @@ static ssize_t bonding_store_mode(struct device *d,
                goto out;
        }
-        new_value = bond_parse_parm((char *)buf, bond_mode_tbl);
+        new_value = bond_parse_parm(buf, bond_mode_tbl);
        if (new_value < 0)  {
                printk(KERN_ERR DRV_NAME
                       ": %s: Ignoring invalid mode value %.*s.\n",
@@ -457,20 +447,11 @@ static ssize_t bonding_show_xmit_hash(struct device *d,
                                      struct device_attribute *attr,
                                      char *buf)
 {
-        int count;
        struct bonding *bond = to_bond(d);
-        if ((bond->params.mode != BOND_MODE_XOR) &&
+        return sprintf(buf, "%s %d\n",
-            (bond->params.mode != BOND_MODE_8023AD)) {
+                       xmit_hashtype_tbl[bond->params.xmit_policy].modename,
-                // Not Applicable
+                       bond->params.xmit_policy);
-                count = sprintf(buf, "NA\n") + 1;
-        } else {
-                count = sprintf(buf, "%s %d\n",
-                        xmit_hashtype_tbl[bond->params.xmit_policy].modename,
-                        bond->params.xmit_policy) + 1;
-        }
-        return count;
 }
 static ssize_t bonding_store_xmit_hash(struct device *d,
@@ -488,16 +469,7 @@ static ssize_t bonding_store_xmit_hash(struct device *d,
                goto out;
        }
-        if ((bond->params.mode != BOND_MODE_XOR) &&
+        new_value = bond_parse_parm(buf, xmit_hashtype_tbl);
-            (bond->params.mode != BOND_MODE_8023AD)) {
-                printk(KERN_ERR DRV_NAME
-                       "%s: Transmit hash policy is irrelevant in this mode.\n",
-                       bond->dev->name);
-                ret = -EPERM;
-                goto out;
-        }
-        new_value = bond_parse_parm((char *)buf, xmit_hashtype_tbl);
        if (new_value < 0)  {
                printk(KERN_ERR DRV_NAME
                       ": %s: Ignoring invalid xmit hash policy value %.*s.\n",
@@ -527,7 +499,7 @@ static ssize_t bonding_show_arp_validate(struct device *d,
        return sprintf(buf, "%s %d\n",
                       arp_validate_tbl[bond->params.arp_validate].modename,
-                       bond->params.arp_validate) + 1;
+                       bond->params.arp_validate);
 }
 static ssize_t bonding_store_arp_validate(struct device *d,
@@ -537,7 +509,7 @@ static ssize_t bonding_store_arp_validate(struct device *d,
        int new_value;
        struct bonding *bond = to_bond(d);
-        new_value = bond_parse_parm((char *)buf, arp_validate_tbl);
+        new_value = bond_parse_parm(buf, arp_validate_tbl);
        if (new_value < 0) {
                printk(KERN_ERR DRV_NAME
                       ": %s: Ignoring invalid arp_validate value %s\n",
@@ -627,7 +599,7 @@ static ssize_t bonding_show_arp_interval(struct device *d,
 {
        struct bonding *bond = to_bond(d);
-        return sprintf(buf, "%d\n", bond->params.arp_interval) + 1;
+        return sprintf(buf, "%d\n", bond->params.arp_interval);
 }
 static ssize_t bonding_store_arp_interval(struct device *d,
@@ -712,9 +684,7 @@ static ssize_t bonding_show_arp_targets(struct device *d,
                               NIPQUAD(bond->params.arp_targets[i]));
        }
        if (res)
-                res--;  /* eat the leftover space */
+                buf[res-1] = '\n'; /* eat the leftover space */
-        res += sprintf(buf + res, "\n");
-        res++;
        return res;
 }
@@ -815,7 +785,7 @@ static ssize_t bonding_show_downdelay(struct device *d,
 {
        struct bonding *bond = to_bond(d);
-        return sprintf(buf, "%d\n", bond->params.downdelay * bond->params.miimon) + 1;
+        return sprintf(buf, "%d\n", bond->params.downdelay * bond->params.miimon);
 }
 static ssize_t bonding_store_downdelay(struct device *d,
@@ -872,7 +842,7 @@ static ssize_t bonding_show_updelay(struct device *d,
 {
        struct bonding *bond = to_bond(d);
-        return sprintf(buf, "%d\n", bond->params.updelay * bond->params.miimon) + 1;
+        return sprintf(buf, "%d\n", bond->params.updelay * bond->params.miimon);
 }
@@ -936,7 +906,7 @@ static ssize_t bonding_show_lacp(struct device *d,
        return sprintf(buf, "%s %d\n",
                bond_lacp_tbl[bond->params.lacp_fast].modename,
-                bond->params.lacp_fast) + 1;
+                bond->params.lacp_fast);
 }
 static ssize_t bonding_store_lacp(struct device *d,
@@ -962,7 +932,7 @@ static ssize_t bonding_store_lacp(struct device *d,
                goto out;
        }
-        new_value = bond_parse_parm((char *)buf, bond_lacp_tbl);
+        new_value = bond_parse_parm(buf, bond_lacp_tbl);
        if ((new_value == 1) || (new_value == 0)) {
                bond->params.lacp_fast = new_value;
@@ -992,7 +962,7 @@ static ssize_t bonding_show_miimon(struct device *d,
 {
        struct bonding *bond = to_bond(d);
-        return sprintf(buf, "%d\n", bond->params.miimon) + 1;
+        return sprintf(buf, "%d\n", bond->params.miimon);
 }
 static ssize_t bonding_store_miimon(struct device *d,
@@ -1083,9 +1053,7 @@ static ssize_t bonding_show_primary(struct device *d,
        struct bonding *bond = to_bond(d);
        if (bond->primary_slave)
-                count = sprintf(buf, "%s\n", bond->primary_slave->dev->name) + 1;
+                count = sprintf(buf, "%s\n", bond->primary_slave->dev->name);
-        else
-                count = sprintf(buf, "\n") + 1;
        return count;
 }
@@ -1098,7 +1066,10 @@ static ssize_t bonding_store_primary(struct device *d,
        struct slave *slave;
        struct bonding *bond = to_bond(d);
-        write_lock_bh(&bond->lock);
+        rtnl_lock();
+        read_lock(&bond->lock);
+        write_lock_bh(&bond->curr_slave_lock);
        if (!USES_PRIMARY(bond->params.mode)) {
                printk(KERN_INFO DRV_NAME
                       ": %s: Unable to set primary slave; %s is in mode %d\n",
@@ -1132,8 +1103,8 @@ static ssize_t bonding_store_primary(struct device *d,
                }
        }
 out:
-        write_unlock_bh(&bond->lock);
+        write_unlock_bh(&bond->curr_slave_lock);
+        read_unlock(&bond->lock);
        rtnl_unlock();
        return count;
@@ -1149,7 +1120,7 @@ static ssize_t bonding_show_carrier(struct device *d,
 {
        struct bonding *bond = to_bond(d);
-        return sprintf(buf, "%d\n", bond->params.use_carrier) + 1;
+        return sprintf(buf, "%d\n", bond->params.use_carrier);
 }
 static ssize_t bonding_store_carrier(struct device *d,
@@ -1191,16 +1162,14 @@ static ssize_t bonding_show_active_slave(struct device *d,
 {
        struct slave *curr;
        struct bonding *bond = to_bond(d);
-        int count;
+        int count = 0;
        read_lock(&bond->curr_slave_lock);
        curr = bond->curr_active_slave;
        read_unlock(&bond->curr_slave_lock);
        if (USES_PRIMARY(bond->params.mode) && curr)
-                count = sprintf(buf, "%s\n", curr->dev->name) + 1;
+                count = sprintf(buf, "%s\n", curr->dev->name);
-        else
-                count = sprintf(buf, "\n") + 1;
        return count;
 }
@@ -1215,7 +1184,8 @@ static ssize_t bonding_store_active_slave(struct device *d,
        struct bonding *bond = to_bond(d);
        rtnl_lock();
-        write_lock_bh(&bond->lock);
+        read_lock(&bond->lock);
+        write_lock_bh(&bond->curr_slave_lock);
        if (!USES_PRIMARY(bond->params.mode)) {
                printk(KERN_INFO DRV_NAME
@@ -1272,7 +1242,8 @@ static ssize_t bonding_store_active_slave(struct device *d,
                }
        }
 out:
-        write_unlock_bh(&bond->lock);
+        write_unlock_bh(&bond->curr_slave_lock);
+        read_unlock(&bond->lock);
        rtnl_unlock();
        return count;
@@ -1295,7 +1266,7 @@ static ssize_t bonding_show_mii_status(struct device *d,
        curr = bond->curr_active_slave;
        read_unlock(&bond->curr_slave_lock);
-        return sprintf(buf, "%s\n", (curr) ? "up" : "down") + 1;
+        return sprintf(buf, "%s\n", (curr) ? "up" : "down");
 }
 static DEVICE_ATTR(mii_status, S_IRUGO, bonding_show_mii_status, NULL);
@@ -1312,10 +1283,8 @@ static ssize_t bonding_show_ad_aggregator(struct device *d,
        if (bond->params.mode == BOND_MODE_8023AD) {
                struct ad_info ad_info;
-                count = sprintf(buf, "%d\n", (bond_3ad_get_active_agg_info(bond, &ad_info)) ?  0 : ad_info.aggregator_id) + 1;
+                count = sprintf(buf, "%d\n", (bond_3ad_get_active_agg_info(bond, &ad_info)) ?  0 : ad_info.aggregator_id);
        }
-        else
-                count = sprintf(buf, "\n") + 1;
        return count;
 }
@@ -1334,10 +1303,8 @@ static ssize_t bonding_show_ad_num_ports(struct device *d,
        if (bond->params.mode == BOND_MODE_8023AD) {
                struct ad_info ad_info;
-                count = sprintf(buf, "%d\n", (bond_3ad_get_active_agg_info(bond, &ad_info)) ?  0: ad_info.ports) + 1;
+                count = sprintf(buf, "%d\n", (bond_3ad_get_active_agg_info(bond, &ad_info)) ?  0: ad_info.ports);
        }
-        else
-                count = sprintf(buf, "\n") + 1;
        return count;
 }
@@ -1356,10 +1323,8 @@ static ssize_t bonding_show_ad_actor_key(struct device *d,
        if (bond->params.mode == BOND_MODE_8023AD) {
                struct ad_info ad_info;
-                count = sprintf(buf, "%d\n", (bond_3ad_get_active_agg_info(bond, &ad_info)) ?  0 : ad_info.actor_key) + 1;
+                count = sprintf(buf, "%d\n", (bond_3ad_get_active_agg_info(bond, &ad_info)) ?  0 : ad_info.actor_key);
        }
-        else
-                count = sprintf(buf, "\n") + 1;
        return count;
 }
@@ -1378,10 +1343,8 @@ static ssize_t bonding_show_ad_partner_key(struct device *d,
        if (bond->params.mode == BOND_MODE_8023AD) {
                struct ad_info ad_info;
-                count = sprintf(buf, "%d\n", (bond_3ad_get_active_agg_info(bond, &ad_info)) ?  0 : ad_info.partner_key) + 1;
+                count = sprintf(buf, "%d\n", (bond_3ad_get_active_agg_info(bond, &ad_info)) ?  0 : ad_info.partner_key);
        }
-        else
-                count = sprintf(buf, "\n") + 1;
        return count;
 }
@@ -1403,12 +1366,9 @@ static ssize_t bonding_show_ad_partner_mac(struct device *d,
                struct ad_info ad_info;
                if (!bond_3ad_get_active_agg_info(bond, &ad_info)) {
                        count = sprintf(buf,"%s\n",
-                                        print_mac(mac, ad_info.partner_system))
+                                        print_mac(mac, ad_info.partner_system));
-                                + 1;
                }
        }
-        else
-                count = sprintf(buf, "\n") + 1;
        return count;
 }
@@ -1454,8 +1414,6 @@ int bond_create_sysfs(void)
        int ret = 0;
        struct bonding *firstbond;
-        init_rwsem(&bonding_rwsem);
        /* get the netdev class pointer */
        firstbond = container_of(bond_dev_list.next, struct bonding, bond_list);
        if (!firstbond)
diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h
index 61c1b4536d34..6d83be49899a 100644
--- a/drivers/net/bonding/bonding.h
+++ b/drivers/net/bonding/bonding.h
@@ -22,8 +22,8 @@
 #include "bond_3ad.h"
 #include "bond_alb.h"
-#define DRV_VERSION     "3.2.1"
+#define DRV_VERSION     "3.2.3"
-#define DRV_RELDATE     "October 15, 2007"
+#define DRV_RELDATE     "December 6, 2007"
 #define DRV_NAME        "bonding"
 #define DRV_DESCRIPTION "Ethernet Channel Bonding Driver"
@@ -141,6 +141,8 @@ struct bond_parm_tbl {
        int mode;
 };
+#define BOND_MAX_MODENAME_LEN 20
 struct vlan_entry {
        struct list_head vlan_list;
        __be32 vlan_ip;
@@ -314,7 +316,7 @@ void bond_mii_monitor(struct work_struct *);
 void bond_loadbalance_arp_mon(struct work_struct *);
 void bond_activebackup_arp_mon(struct work_struct *);
 void bond_set_mode_ops(struct bonding *bond, int mode);
-int bond_parse_parm(char *mode_arg, struct bond_parm_tbl *tbl);
+int bond_parse_parm(const char *mode_arg, struct bond_parm_tbl *tbl);
 void bond_select_active_slave(struct bonding *bond);
 void bond_change_active_slave(struct bonding *bond, struct slave *new_active);
 void bond_register_arp(struct bonding *);
diff --git a/drivers/net/cassini.c b/drivers/net/cassini.c
index 7df31b5561cc..d66915d82b24 100644
--- a/drivers/net/cassini.c
+++ b/drivers/net/cassini.c
@@ -142,8 +142,8 @@
 #define DRV_MODULE_NAME         "cassini"
 #define PFX DRV_MODULE_NAME     ": "
-#define DRV_MODULE_VERSION      "1.4"
+#define DRV_MODULE_VERSION      "1.5"
-#define DRV_MODULE_RELDATE      "1 July 2004"
+#define DRV_MODULE_RELDATE      "4 Jan 2008"
 #define CAS_DEF_MSG_ENABLE        \
        (NETIF_MSG_DRV          | \
@@ -336,30 +336,6 @@ static inline void cas_mask_intr(struct cas *cp)
                cas_disable_irq(cp, i);
 }
-static inline void cas_buffer_init(cas_page_t *cp)
-{
-        struct page *page = cp->buffer;
-        atomic_set((atomic_t *)&page->lru.next, 1);
-}
-static inline int cas_buffer_count(cas_page_t *cp)
-{
-        struct page *page = cp->buffer;
-        return atomic_read((atomic_t *)&page->lru.next);
-}
-static inline void cas_buffer_inc(cas_page_t *cp)
-{
-        struct page *page = cp->buffer;
-        atomic_inc((atomic_t *)&page->lru.next);
-}
-static inline void cas_buffer_dec(cas_page_t *cp)
-{
-        struct page *page = cp->buffer;
-        atomic_dec((atomic_t *)&page->lru.next);
-}
 static void cas_enable_irq(struct cas *cp, const int ring)
 {
        if (ring == 0) { /* all but TX_DONE */
@@ -497,7 +473,6 @@ static int cas_page_free(struct cas *cp, cas_page_t *page)
 {
        pci_unmap_page(cp->pdev, page->dma_addr, cp->page_size,
                       PCI_DMA_FROMDEVICE);
-        cas_buffer_dec(page);
        __free_pages(page->buffer, cp->page_order);
        kfree(page);
        return 0;
@@ -527,7 +502,6 @@ static cas_page_t *cas_page_alloc(struct cas *cp, const gfp_t flags)
        page->buffer = alloc_pages(flags, cp->page_order);
        if (!page->buffer)
                goto page_err;
-        cas_buffer_init(page);
        page->dma_addr = pci_map_page(cp->pdev, page->buffer, 0,
                                      cp->page_size, PCI_DMA_FROMDEVICE);
        return page;
@@ -606,7 +580,7 @@ static void cas_spare_recover(struct cas *cp, const gfp_t flags)
        list_for_each_safe(elem, tmp, &list) {
                cas_page_t *page = list_entry(elem, cas_page_t, list);
-                if (cas_buffer_count(page) > 1)
+                if (page_count(page->buffer) > 1)
                        continue;
                list_del(elem);
@@ -1374,7 +1348,7 @@ static inline cas_page_t *cas_page_spare(struct cas *cp, const int index)
        cas_page_t *page = cp->rx_pages[1][index];
        cas_page_t *new;
-        if (cas_buffer_count(page) == 1)
+        if (page_count(page->buffer) == 1)
                return page;
        new = cas_page_dequeue(cp);
@@ -1394,7 +1368,7 @@ static cas_page_t *cas_page_swap(struct cas *cp, const int ring,
        cas_page_t **page1 = cp->rx_pages[1];
        /* swap if buffer is in use */
-        if (cas_buffer_count(page0[index]) > 1) {
+        if (page_count(page0[index]->buffer) > 1) {
                cas_page_t *new = cas_page_spare(cp, index);
                if (new) {
                        page1[index] = page0[index];
@@ -1979,6 +1953,7 @@ static int cas_rx_process_pkt(struct cas *cp, struct cas_rx_comp *rxc,
        struct cas_page *page;
        struct sk_buff *skb;
        void *addr, *crcaddr;
+        __sum16 csum;
        char *p;
        hlen = CAS_VAL(RX_COMP2_HDR_SIZE, words[1]);
@@ -2062,10 +2037,10 @@ static int cas_rx_process_pkt(struct cas *cp, struct cas_rx_comp *rxc,
                skb_shinfo(skb)->nr_frags++;
                skb->data_len += hlen - swivel;
+                skb->truesize += hlen - swivel;
                skb->len      += hlen - swivel;
                get_page(page->buffer);
-                cas_buffer_inc(page);
                frag->page = page->buffer;
                frag->page_offset = off;
                frag->size = hlen - swivel;
@@ -2090,7 +2065,6 @@ static int cas_rx_process_pkt(struct cas *cp, struct cas_rx_comp *rxc,
                        frag++;
                        get_page(page->buffer);
-                        cas_buffer_inc(page);
                        frag->page = page->buffer;
                        frag->page_offset = 0;
                        frag->size = hlen;
@@ -2158,14 +2132,15 @@ end_copy_pkt:
                skb_put(skb, alloclen);
        }
-        i = CAS_VAL(RX_COMP4_TCP_CSUM, words[3]);
+        csum = (__force __sum16)htons(CAS_VAL(RX_COMP4_TCP_CSUM, words[3]));
        if (cp->crc_size) {
                /* checksum includes FCS. strip it out. */
-                i = csum_fold(csum_partial(crcaddr, cp->crc_size, i));
+                csum = csum_fold(csum_partial(crcaddr, cp->crc_size,
+                                              csum_unfold(csum)));
                if (addr)
                        cas_page_unmap(addr);
        }
-        skb->csum = ntohs(i ^ 0xffff);
+        skb->csum = csum_unfold(~csum);
        skb->ip_summed = CHECKSUM_COMPLETE;
        skb->protocol = eth_type_trans(skb, cp->dev);
        return len;
@@ -2253,7 +2228,7 @@ static int cas_post_rxds_ringN(struct cas *cp, int ring, int num)
        released = 0;
        while (entry != last) {
                /* make a new buffer if it's still in use */
-                if (cas_buffer_count(page[entry]) > 1) {
+                if (page_count(page[entry]->buffer) > 1) {
                        cas_page_t *new = cas_page_dequeue(cp);
                        if (!new) {
                                /* let the timer know that we need to
@@ -2611,7 +2586,7 @@ static int cas_poll(struct napi_struct *napi, int budget)
 {
        struct cas *cp = container_of(napi, struct cas, napi);
        struct net_device *dev = cp->dev;
-        int i, enable_intr, todo, credits;
+        int i, enable_intr, credits;
        u32 status = readl(cp->regs + REG_INTR_STATUS);
        unsigned long flags;
@@ -4375,7 +4350,7 @@ static int cas_close(struct net_device *dev)
        struct cas *cp = netdev_priv(dev);
 #ifdef USE_NAPI
-        napi_enable(&cp->napi);
+        napi_disable(&cp->napi);
 #endif
        /* Make sure we don't get distracted by suspend/resume */
        mutex_lock(&cp->pm_mutex);
@@ -4872,6 +4847,90 @@ static int cas_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
        return rc;
 }
+/* When this chip sits underneath an Intel 31154 bridge, it is the
+ * only subordinate device and we can tweak the bridge settings to
+ * reflect that fact.
+ */
+static void __devinit cas_program_bridge(struct pci_dev *cas_pdev)
+{
+        struct pci_dev *pdev = cas_pdev->bus->self;
+        u32 val;
+        if (!pdev)
+                return;
+        if (pdev->vendor != 0x8086 || pdev->device != 0x537c)
+                return;
+        /* Clear bit 10 (Bus Parking Control) in the Secondary
+         * Arbiter Control/Status Register which lives at offset
+         * 0x41.  Using a 32-bit word read/modify/write at 0x40
+         * is much simpler so that's how we do this.
+         */
+        pci_read_config_dword(pdev, 0x40, &val);
+        val &= ~0x00040000;
+        pci_write_config_dword(pdev, 0x40, val);
+        /* Max out the Multi-Transaction Timer settings since
+         * Cassini is the only device present.
+         *
+         * The register is 16-bit and lives at 0x50.  When the
+         * settings are enabled, it extends the GRANT# signal
+         * for a requestor after a transaction is complete.  This
+         * allows the next request to run without first needing
+         * to negotiate the GRANT# signal back.
+         *
+         * Bits 12:10 define the grant duration:
+         *
+         *      1       --      16 clocks
+         *      2       --      32 clocks
+         *      3       --      64 clocks
+         *      4       --      128 clocks
+         *      5       --      256 clocks
+         *
+         * All other values are illegal.
+         *
+         * Bits 09:00 define which REQ/GNT signal pairs get the
+         * GRANT# signal treatment.  We set them all.
+         */
+        pci_write_config_word(pdev, 0x50, (5 << 10) | 0x3ff);
+        /* The Read Prefecth Policy register is 16-bit and sits at
+         * offset 0x52.  It enables a "smart" pre-fetch policy.  We
+         * enable it and max out all of the settings since only one
+         * device is sitting underneath and thus bandwidth sharing is
+         * not an issue.
+         *
+         * The register has several 3 bit fields, which indicates a
+         * multiplier applied to the base amount of prefetching the
+         * chip would do.  These fields are at:
+         *
+         *      15:13   ---     ReRead Primary Bus
+         *      12:10   ---     FirstRead Primary Bus
+         *      09:07   ---     ReRead Secondary Bus
+         *      06:04   ---     FirstRead Secondary Bus
+         *
+         * Bits 03:00 control which REQ/GNT pairs the prefetch settings
+         * get enabled on.  Bit 3 is a grouped enabler which controls
+         * all of the REQ/GNT pairs from [8:3].  Bits 2 to 0 control
+         * the individual REQ/GNT pairs [2:0].
+         */
+        pci_write_config_word(pdev, 0x52,
+                              (0x7 << 13) |
+                              (0x7 << 10) |
+                              (0x7 <<  7) |
+                              (0x7 <<  4) |
+                              (0xf <<  0));
+        /* Force cacheline size to 0x8 */
+        pci_write_config_byte(pdev, PCI_CACHE_LINE_SIZE, 0x08);
+        /* Force latency timer to maximum setting so Cassini can
+         * sit on the bus as long as it likes.
+         */
+        pci_write_config_byte(pdev, PCI_LATENCY_TIMER, 0xff);
+}
 static int __devinit cas_init_one(struct pci_dev *pdev,
                                  const struct pci_device_id *ent)
 {
@@ -4927,6 +4986,8 @@ static int __devinit cas_init_one(struct pci_dev *pdev,
                printk(KERN_WARNING PFX "Could not enable MWI for %s\n",
                       pci_name(pdev));
+        cas_program_bridge(pdev);
        /*
         * On some architectures, the default cache line size set
         * by pci_try_set_mwi reduces perforamnce.  We have to increase
diff --git a/drivers/net/cassini.h b/drivers/net/cassini.h
index 2f93f83342d2..552af89ca1cf 100644
--- a/drivers/net/cassini.h
+++ b/drivers/net/cassini.h
@@ -4122,8 +4122,8 @@ cas_saturn_patch_t cas_saturn_patch[] = {
                                                             inserted into
                                                             outgoing frame. */
 struct cas_tx_desc {
-        u64     control;
+        __le64     control;
-        u64     buffer;
+        __le64     buffer;
 };
 /* descriptor ring for free buffers contains page-sized buffers. the index
@@ -4131,8 +4131,8 @@ struct cas_tx_desc {
 * the completion ring.
 */
 struct cas_rx_desc {
-        u64     index;
+        __le64     index;
-        u64     buffer;
+        __le64     buffer;
 };
 /* received packets are put on the completion ring. */
@@ -4210,10 +4210,10 @@ struct cas_rx_desc {
 #define RX_INDEX_RELEASE                  0x0000000000002000ULL
 struct cas_rx_comp {
-        u64     word1;
+        __le64     word1;
-        u64     word2;
+        __le64     word2;
-        u64     word3;
+        __le64     word3;
-        u64     word4;
+        __le64     word4;
 };
 enum link_state {
@@ -4252,7 +4252,7 @@ struct cas_init_block {
        struct cas_rx_comp rxcs[N_RX_COMP_RINGS][INIT_BLOCK_RX_COMP];
        struct cas_rx_desc rxds[N_RX_DESC_RINGS][INIT_BLOCK_RX_DESC];
        struct cas_tx_desc txds[N_TX_RINGS][INIT_BLOCK_TX];
-        u64 tx_compwb;
+        __le64 tx_compwb;
 };
 /* tiny buffers to deal with target abort issue. we allocate a bit
diff --git a/drivers/net/chelsio/cxgb2.c b/drivers/net/chelsio/cxgb2.c
index 2dbf8dc116c6..c5975047c89b 100644
--- a/drivers/net/chelsio/cxgb2.c
+++ b/drivers/net/chelsio/cxgb2.c
@@ -374,7 +374,9 @@ static char stats_strings[][ETH_GSTRING_LEN] = {
        "TxInternalMACXmitError",
        "TxFramesWithExcessiveDeferral",
        "TxFCSErrors",
+        "TxJumboFramesOk",
+        "TxJumboOctetsOk",
+        
        "RxOctetsOK",
        "RxOctetsBad",
        "RxUnicastFramesOK",
@@ -392,16 +394,17 @@ static char stats_strings[][ETH_GSTRING_LEN] = {
        "RxInRangeLengthErrors",
        "RxOutOfRangeLengthField",
        "RxFrameTooLongErrors",
+        "RxJumboFramesOk",
+        "RxJumboOctetsOk",
        /* Port stats */
-        "RxPackets",
        "RxCsumGood",
-        "TxPackets",
        "TxCsumOffload",
        "TxTso",
        "RxVlan",
        "TxVlan",
+        "TxNeedHeadroom", 
+        
        /* Interrupt stats */
        "rx drops",
        "pure_rsps",
@@ -463,23 +466,56 @@ static void get_stats(struct net_device *dev, struct ethtool_stats *stats,
        const struct cmac_statistics *s;
        const struct sge_intr_counts *t;
        struct sge_port_stats ss;
-        unsigned int len;
        s = mac->ops->statistics_update(mac, MAC_STATS_UPDATE_FULL);
+        t = t1_sge_get_intr_counts(adapter->sge);
-        len = sizeof(u64)*(&s->TxFCSErrors + 1 - &s->TxOctetsOK);
-        memcpy(data, &s->TxOctetsOK, len);
-        data += len;
-        len = sizeof(u64)*(&s->RxFrameTooLongErrors + 1 - &s->RxOctetsOK);
-        memcpy(data, &s->RxOctetsOK, len);
-        data += len;
        t1_sge_get_port_stats(adapter->sge, dev->if_port, &ss);
-        memcpy(data, &ss, sizeof(ss));
-        data += sizeof(ss);
-        t = t1_sge_get_intr_counts(adapter->sge);
+        *data++ = s->TxOctetsOK;
+        *data++ = s->TxOctetsBad;
+        *data++ = s->TxUnicastFramesOK;
+        *data++ = s->TxMulticastFramesOK;
+        *data++ = s->TxBroadcastFramesOK;
+        *data++ = s->TxPauseFrames;
+        *data++ = s->TxFramesWithDeferredXmissions;
+        *data++ = s->TxLateCollisions;
+        *data++ = s->TxTotalCollisions;
+        *data++ = s->TxFramesAbortedDueToXSCollisions;
+        *data++ = s->TxUnderrun;
+        *data++ = s->TxLengthErrors;
+        *data++ = s->TxInternalMACXmitError;
+        *data++ = s->TxFramesWithExcessiveDeferral;
+        *data++ = s->TxFCSErrors;
+        *data++ = s->TxJumboFramesOK;
+        *data++ = s->TxJumboOctetsOK;
+        *data++ = s->RxOctetsOK;
+        *data++ = s->RxOctetsBad;
+        *data++ = s->RxUnicastFramesOK;
+        *data++ = s->RxMulticastFramesOK;
+        *data++ = s->RxBroadcastFramesOK;
+        *data++ = s->RxPauseFrames;
+        *data++ = s->RxFCSErrors;
+        *data++ = s->RxAlignErrors;
+        *data++ = s->RxSymbolErrors;
+        *data++ = s->RxDataErrors;
+        *data++ = s->RxSequenceErrors;
+        *data++ = s->RxRuntErrors;
+        *data++ = s->RxJabberErrors;
+        *data++ = s->RxInternalMACRcvError;
+        *data++ = s->RxInRangeLengthErrors;
+        *data++ = s->RxOutOfRangeLengthField;
+        *data++ = s->RxFrameTooLongErrors;
+        *data++ = s->RxJumboFramesOK;
+        *data++ = s->RxJumboOctetsOK;
+        *data++ = ss.rx_cso_good;
+        *data++ = ss.tx_cso;
+        *data++ = ss.tx_tso;
+        *data++ = ss.vlan_xtract;
+        *data++ = ss.vlan_insert;
+        *data++ = ss.tx_need_hdrroom;
+        
        *data++ = t->rx_drops;
        *data++ = t->pure_rsps;
        *data++ = t->unhandled_irqs;
diff --git a/drivers/net/chelsio/pm3393.c b/drivers/net/chelsio/pm3393.c
index 678778a8d133..2117c4fbb107 100644
--- a/drivers/net/chelsio/pm3393.c
+++ b/drivers/net/chelsio/pm3393.c
@@ -45,7 +45,7 @@
 #include <linux/crc32.h>
-#define OFFSET(REG_ADDR)    (REG_ADDR << 2)
+#define OFFSET(REG_ADDR)    ((REG_ADDR) << 2)
 /* Max frame size PM3393 can handle. Includes Ethernet header and CRC. */
 #define MAX_FRAME_SIZE  9600
@@ -428,69 +428,26 @@ static int pm3393_set_speed_duplex_fc(struct cmac *cmac, int speed, int duplex,
        return 0;
 }
-static void pm3393_rmon_update(struct adapter *adapter, u32 offs, u64 *val,
+#define RMON_UPDATE(mac, name, stat_name) \
-                               int over)
+{ \
-{
+        t1_tpi_read((mac)->adapter, OFFSET(name), &val0);     \
-        u32 val0, val1, val2;
+        t1_tpi_read((mac)->adapter, OFFSET((name)+1), &val1); \
+        t1_tpi_read((mac)->adapter, OFFSET((name)+2), &val2); \
-        t1_tpi_read(adapter, offs, &val0);
+        (mac)->stats.stat_name = (u64)(val0 & 0xffff) | \
-        t1_tpi_read(adapter, offs + 4, &val1);
+                                 ((u64)(val1 & 0xffff) << 16) | \
-        t1_tpi_read(adapter, offs + 8, &val2);
+                                 ((u64)(val2 & 0xff) << 32) | \
+                                 ((mac)->stats.stat_name & \
-        *val &= ~0ull << 40;
+                                        0xffffff0000000000ULL); \
-        *val |= val0 & 0xffff;
+        if (ro & \
-        *val |= (val1 & 0xffff) << 16;
+            (1ULL << ((name - SUNI1x10GEXP_REG_MSTAT_COUNTER_0_LOW) >> 2))) \
-        *val |= (u64)(val2 & 0xff) << 32;
+                (mac)->stats.stat_name += 1ULL << 40; \
-        if (over)
-                *val += 1ull << 40;
 }
 static const struct cmac_statistics *pm3393_update_statistics(struct cmac *mac,
                                                              int flag)
 {
-        static struct {
+        u64     ro;
-                unsigned int reg;
+        u32     val0, val1, val2, val3;
-                unsigned int offset;
-        } hw_stats [] = {
-#define HW_STAT(name, stat_name) \
-        { name, (&((struct cmac_statistics *)NULL)->stat_name) - (u64 *)NULL }
-                /* Rx stats */
-                HW_STAT(RxOctetsReceivedOK, RxOctetsOK),
-                HW_STAT(RxUnicastFramesReceivedOK, RxUnicastFramesOK),
-                HW_STAT(RxMulticastFramesReceivedOK, RxMulticastFramesOK),
-                HW_STAT(RxBroadcastFramesReceivedOK, RxBroadcastFramesOK),
-                HW_STAT(RxPAUSEMACCtrlFramesReceived, RxPauseFrames),
-                HW_STAT(RxFrameCheckSequenceErrors, RxFCSErrors),
-                HW_STAT(RxFramesLostDueToInternalMACErrors,
-                                RxInternalMACRcvError),
-                HW_STAT(RxSymbolErrors, RxSymbolErrors),
-                HW_STAT(RxInRangeLengthErrors, RxInRangeLengthErrors),
-                HW_STAT(RxFramesTooLongErrors , RxFrameTooLongErrors),
-                HW_STAT(RxJabbers, RxJabberErrors),
-                HW_STAT(RxFragments, RxRuntErrors),
-                HW_STAT(RxUndersizedFrames, RxRuntErrors),
-                HW_STAT(RxJumboFramesReceivedOK, RxJumboFramesOK),
-                HW_STAT(RxJumboOctetsReceivedOK, RxJumboOctetsOK),
-                /* Tx stats */
-                HW_STAT(TxOctetsTransmittedOK, TxOctetsOK),
-                HW_STAT(TxFramesLostDueToInternalMACTransmissionError,
-                                TxInternalMACXmitError),
-                HW_STAT(TxTransmitSystemError, TxFCSErrors),
-                HW_STAT(TxUnicastFramesTransmittedOK, TxUnicastFramesOK),
-                HW_STAT(TxMulticastFramesTransmittedOK, TxMulticastFramesOK),
-                HW_STAT(TxBroadcastFramesTransmittedOK, TxBroadcastFramesOK),
-                HW_STAT(TxPAUSEMACCtrlFramesTransmitted, TxPauseFrames),
-                HW_STAT(TxJumboFramesReceivedOK, TxJumboFramesOK),
-                HW_STAT(TxJumboOctetsReceivedOK, TxJumboOctetsOK)
-        }, *p = hw_stats;
-        u64 ro;
-        u32 val0, val1, val2, val3;
-        u64 *stats = (u64 *) &mac->stats;
-        unsigned int i;
        /* Snap the counters */
        pmwrite(mac, SUNI1x10GEXP_REG_MSTAT_CONTROL,
@@ -504,14 +461,35 @@ static const struct cmac_statistics *pm3393_update_statistics(struct cmac *mac,
        ro = ((u64)val0 & 0xffff) | (((u64)val1 & 0xffff) << 16) |
                (((u64)val2 & 0xffff) << 32) | (((u64)val3 & 0xffff) << 48);
-        for (i = 0; i < ARRAY_SIZE(hw_stats); i++) {
+        /* Rx stats */
-                unsigned reg = p->reg - SUNI1x10GEXP_REG_MSTAT_COUNTER_0_LOW;
+        RMON_UPDATE(mac, RxOctetsReceivedOK, RxOctetsOK);
+        RMON_UPDATE(mac, RxUnicastFramesReceivedOK, RxUnicastFramesOK);
-                pm3393_rmon_update((mac)->adapter, OFFSET(p->reg),
+        RMON_UPDATE(mac, RxMulticastFramesReceivedOK, RxMulticastFramesOK);
-                                   stats + p->offset, ro & (reg >> 2));
+        RMON_UPDATE(mac, RxBroadcastFramesReceivedOK, RxBroadcastFramesOK);
-        }
+        RMON_UPDATE(mac, RxPAUSEMACCtrlFramesReceived, RxPauseFrames);
+        RMON_UPDATE(mac, RxFrameCheckSequenceErrors, RxFCSErrors);
+        RMON_UPDATE(mac, RxFramesLostDueToInternalMACErrors,
+                                RxInternalMACRcvError);
+        RMON_UPDATE(mac, RxSymbolErrors, RxSymbolErrors);
+        RMON_UPDATE(mac, RxInRangeLengthErrors, RxInRangeLengthErrors);
+        RMON_UPDATE(mac, RxFramesTooLongErrors , RxFrameTooLongErrors);
+        RMON_UPDATE(mac, RxJabbers, RxJabberErrors);
+        RMON_UPDATE(mac, RxFragments, RxRuntErrors);
+        RMON_UPDATE(mac, RxUndersizedFrames, RxRuntErrors);
+        RMON_UPDATE(mac, RxJumboFramesReceivedOK, RxJumboFramesOK);
+        RMON_UPDATE(mac, RxJumboOctetsReceivedOK, RxJumboOctetsOK);
+        /* Tx stats */
+        RMON_UPDATE(mac, TxOctetsTransmittedOK, TxOctetsOK);
+        RMON_UPDATE(mac, TxFramesLostDueToInternalMACTransmissionError,
+                                TxInternalMACXmitError);
+        RMON_UPDATE(mac, TxTransmitSystemError, TxFCSErrors);
+        RMON_UPDATE(mac, TxUnicastFramesTransmittedOK, TxUnicastFramesOK);
+        RMON_UPDATE(mac, TxMulticastFramesTransmittedOK, TxMulticastFramesOK);
+        RMON_UPDATE(mac, TxBroadcastFramesTransmittedOK, TxBroadcastFramesOK);
+        RMON_UPDATE(mac, TxPAUSEMACCtrlFramesTransmitted, TxPauseFrames);
+        RMON_UPDATE(mac, TxJumboFramesReceivedOK, TxJumboFramesOK);
+        RMON_UPDATE(mac, TxJumboOctetsReceivedOK, TxJumboOctetsOK);
        return &mac->stats;
 }
diff --git a/drivers/net/chelsio/sge.c b/drivers/net/chelsio/sge.c
index 443666292a5c..b301c0428ae0 100644
--- a/drivers/net/chelsio/sge.c
+++ b/drivers/net/chelsio/sge.c
@@ -986,11 +986,10 @@ void t1_sge_get_port_stats(const struct sge *sge, int port,
        for_each_possible_cpu(cpu) {
                struct sge_port_stats *st = per_cpu_ptr(sge->port_stats[port], cpu);
-                ss->rx_packets += st->rx_packets;
                ss->rx_cso_good += st->rx_cso_good;
-                ss->tx_packets += st->tx_packets;
                ss->tx_cso += st->tx_cso;
                ss->tx_tso += st->tx_tso;
+                ss->tx_need_hdrroom += st->tx_need_hdrroom;
                ss->vlan_xtract += st->vlan_xtract;
                ss->vlan_insert += st->vlan_insert;
        }
@@ -1380,7 +1379,6 @@ static void sge_rx(struct sge *sge, struct freelQ *fl, unsigned int len)
        __skb_pull(skb, sizeof(*p));
        st = per_cpu_ptr(sge->port_stats[p->iff], smp_processor_id());
-        st->rx_packets++;
        skb->protocol = eth_type_trans(skb, adapter->port[p->iff].dev);
        skb->dev->last_rx = jiffies;
@@ -1624,11 +1622,9 @@ int t1_poll(struct napi_struct *napi, int budget)
 {
        struct adapter *adapter = container_of(napi, struct adapter, napi);
        struct net_device *dev = adapter->port[0].dev;
-        int work_done;
+        int work_done = process_responses(adapter, budget);
-        work_done = process_responses(adapter, budget);
-        if (likely(!responses_pending(adapter))) {
+        if (likely(work_done < budget)) {
                netif_rx_complete(dev, napi);
                writel(adapter->sge->respQ.cidx,
                       adapter->regs + A_SG_SLEEPING);
@@ -1848,7 +1844,8 @@ int t1_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
        struct adapter *adapter = dev->priv;
        struct sge *sge = adapter->sge;
-        struct sge_port_stats *st = per_cpu_ptr(sge->port_stats[dev->if_port], smp_processor_id());
+        struct sge_port_stats *st = per_cpu_ptr(sge->port_stats[dev->if_port],
+                                                smp_processor_id());
        struct cpl_tx_pkt *cpl;
        struct sk_buff *orig_skb = skb;
        int ret;
@@ -1856,6 +1853,18 @@ int t1_start_xmit(struct sk_buff *skb, struct net_device *dev)
        if (skb->protocol == htons(ETH_P_CPL5))
                goto send;
+        /*
+         * We are using a non-standard hard_header_len.
+         * Allocate more header room in the rare cases it is not big enough.
+         */
+        if (unlikely(skb_headroom(skb) < dev->hard_header_len - ETH_HLEN)) {
+                skb = skb_realloc_headroom(skb, sizeof(struct cpl_tx_pkt_lso));
+                ++st->tx_need_hdrroom;
+                dev_kfree_skb_any(orig_skb);
+                if (!skb)
+                        return NETDEV_TX_OK;
+        }
        if (skb_shinfo(skb)->gso_size) {
                int eth_type;
                struct cpl_tx_pkt_lso *hdr;
@@ -1889,24 +1898,6 @@ int t1_start_xmit(struct sk_buff *skb, struct net_device *dev)
                        return NETDEV_TX_OK;
                }
-                /*
-                 * We are using a non-standard hard_header_len and some kernel
-                 * components, such as pktgen, do not handle it right.
-                 * Complain when this happens but try to fix things up.
-                 */
-                if (unlikely(skb_headroom(skb) < dev->hard_header_len - ETH_HLEN)) {
-                        pr_debug("%s: headroom %d header_len %d\n", dev->name,
-                                 skb_headroom(skb), dev->hard_header_len);
-                        if (net_ratelimit())
-                                printk(KERN_ERR "%s: inadequate headroom in "
-                                       "Tx packet\n", dev->name);
-                        skb = skb_realloc_headroom(skb, sizeof(*cpl));
-                        dev_kfree_skb_any(orig_skb);
-                        if (!skb)
-                                return NETDEV_TX_OK;
-                }
                if (!(adapter->flags & UDP_CSUM_CAPABLE) &&
                    skb->ip_summed == CHECKSUM_PARTIAL &&
                    ip_hdr(skb)->protocol == IPPROTO_UDP) {
@@ -1952,7 +1943,6 @@ int t1_start_xmit(struct sk_buff *skb, struct net_device *dev)
                cpl->vlan_valid = 0;
 send:
-        st->tx_packets++;
        dev->trans_start = jiffies;
        ret = t1_sge_tx(skb, adapter, 0, dev);
diff --git a/drivers/net/chelsio/sge.h b/drivers/net/chelsio/sge.h
index 713d9c55f24d..cced9dff91c5 100644
--- a/drivers/net/chelsio/sge.h
+++ b/drivers/net/chelsio/sge.h
@@ -57,13 +57,12 @@ struct sge_intr_counts {
 };
 struct sge_port_stats {
-        u64 rx_packets;      /* # of Ethernet packets received */
        u64 rx_cso_good;     /* # of successful RX csum offloads */
-        u64 tx_packets;      /* # of TX packets */
        u64 tx_cso;          /* # of TX checksum offloads */
        u64 tx_tso;          /* # of TSO requests */
        u64 vlan_xtract;     /* # of VLAN tag extractions */
        u64 vlan_insert;     /* # of VLAN tag insertions */
+        u64 tx_need_hdrroom; /* # of TX skbs in need of more header room */
 };
 struct sk_buff;
diff --git a/drivers/net/cpmac.c b/drivers/net/cpmac.c
index 6fd95a2c8cec..6e12d48351b8 100644
--- a/drivers/net/cpmac.c
+++ b/drivers/net/cpmac.c
@@ -459,7 +459,7 @@ static int cpmac_start_xmit(struct sk_buff *skb, struct net_device *dev)
                return NETDEV_TX_OK;
        len = max(skb->len, ETH_ZLEN);
-        queue = skb->queue_mapping;
+        queue = skb_get_queue_mapping(skb);
 #ifdef CONFIG_NETDEVICES_MULTIQUEUE
        netif_stop_subqueue(dev, queue);
 #else
diff --git a/drivers/net/cxgb3/regs.h b/drivers/net/cxgb3/regs.h
index 5e1bc0dec5f1..6e12bf4bc6cf 100644
--- a/drivers/net/cxgb3/regs.h
+++ b/drivers/net/cxgb3/regs.h
@@ -1937,6 +1937,10 @@
 #define A_XGM_RXFIFO_CFG 0x884
+#define S_RXFIFO_EMPTY    31
+#define V_RXFIFO_EMPTY(x) ((x) << S_RXFIFO_EMPTY)
+#define F_RXFIFO_EMPTY    V_RXFIFO_EMPTY(1U)
 #define S_RXFIFOPAUSEHWM    17
 #define M_RXFIFOPAUSEHWM    0xfff
@@ -1961,6 +1965,10 @@
 #define A_XGM_TXFIFO_CFG 0x888
+#define S_UNDERUNFIX    22
+#define V_UNDERUNFIX(x) ((x) << S_UNDERUNFIX)
+#define F_UNDERUNFIX    V_UNDERUNFIX(1U)
 #define S_TXIPG    13
 #define M_TXIPG    0xff
 #define V_TXIPG(x) ((x) << S_TXIPG)
@@ -2034,10 +2042,27 @@
 #define V_XAUIIMP(x) ((x) << S_XAUIIMP)
 #define A_XGM_RX_MAX_PKT_SIZE 0x8a8
-#define A_XGM_RX_MAX_PKT_SIZE_ERR_CNT 0x9a4
+#define S_RXMAXFRAMERSIZE    17
+#define M_RXMAXFRAMERSIZE    0x3fff
+#define V_RXMAXFRAMERSIZE(x) ((x) << S_RXMAXFRAMERSIZE)
+#define G_RXMAXFRAMERSIZE(x) (((x) >> S_RXMAXFRAMERSIZE) & M_RXMAXFRAMERSIZE)
+#define S_RXENFRAMER    14
+#define V_RXENFRAMER(x) ((x) << S_RXENFRAMER)
+#define F_RXENFRAMER    V_RXENFRAMER(1U)
+#define S_RXMAXPKTSIZE    0
+#define M_RXMAXPKTSIZE    0x3fff
+#define V_RXMAXPKTSIZE(x) ((x) << S_RXMAXPKTSIZE)
+#define G_RXMAXPKTSIZE(x) (((x) >> S_RXMAXPKTSIZE) & M_RXMAXPKTSIZE)
 #define A_XGM_RESET_CTRL 0x8ac
+#define S_XGMAC_STOP_EN    4
+#define V_XGMAC_STOP_EN(x) ((x) << S_XGMAC_STOP_EN)
+#define F_XGMAC_STOP_EN    V_XGMAC_STOP_EN(1U)
 #define S_XG2G_RESET_    3
 #define V_XG2G_RESET_(x) ((x) << S_XG2G_RESET_)
 #define F_XG2G_RESET_    V_XG2G_RESET_(1U)
diff --git a/drivers/net/cxgb3/t3_hw.c b/drivers/net/cxgb3/t3_hw.c
index d4ee00d32219..522834c42ae7 100644
--- a/drivers/net/cxgb3/t3_hw.c
+++ b/drivers/net/cxgb3/t3_hw.c
@@ -447,8 +447,8 @@ static const struct adapter_info t3_adap_info[] = {
         &mi1_mdio_ops, "Chelsio T302"},
        {1, 0, 0, 0,
         F_GPIO1_OEN | F_GPIO6_OEN | F_GPIO7_OEN | F_GPIO10_OEN |
-         F_GPIO1_OUT_VAL | F_GPIO6_OUT_VAL | F_GPIO10_OUT_VAL, 0,
+         F_GPIO11_OEN | F_GPIO1_OUT_VAL | F_GPIO6_OUT_VAL | F_GPIO10_OUT_VAL,
-         SUPPORTED_10000baseT_Full | SUPPORTED_AUI,
+         0, SUPPORTED_10000baseT_Full | SUPPORTED_AUI,
         &mi1_mdio_ext_ops, "Chelsio T310"},
        {2, 0, 0, 0,
         F_GPIO1_OEN | F_GPIO2_OEN | F_GPIO4_OEN | F_GPIO5_OEN | F_GPIO6_OEN |
@@ -2613,7 +2613,7 @@ static void __devinit init_mtus(unsigned short mtus[])
         * it can accomodate max size TCP/IP headers when SACK and timestamps
         * are enabled and still have at least 8 bytes of payload.
         */
-        mtus[1] = 88;
+        mtus[0] = 88;
        mtus[1] = 88;
        mtus[2] = 256;
        mtus[3] = 512;
diff --git a/drivers/net/cxgb3/xgmac.c b/drivers/net/cxgb3/xgmac.c
index eeb766aeced9..efcf09a709cf 100644
--- a/drivers/net/cxgb3/xgmac.c
+++ b/drivers/net/cxgb3/xgmac.c
@@ -106,6 +106,7 @@ int t3_mac_reset(struct cmac *mac)
        t3_set_reg_field(adap, A_XGM_RXFIFO_CFG + oft,
                         F_RXSTRFRWRD | F_DISERRFRAMES,
                         uses_xaui(adap) ? 0 : F_RXSTRFRWRD);
+        t3_set_reg_field(adap, A_XGM_TXFIFO_CFG + oft, 0, F_UNDERUNFIX);
        if (uses_xaui(adap)) {
                if (adap->params.rev == 0) {
@@ -124,7 +125,11 @@ int t3_mac_reset(struct cmac *mac)
                        xaui_serdes_reset(mac);
        }
-        val = F_MAC_RESET_;
+        t3_set_reg_field(adap, A_XGM_RX_MAX_PKT_SIZE + oft,
+                         V_RXMAXFRAMERSIZE(M_RXMAXFRAMERSIZE),
+                         V_RXMAXFRAMERSIZE(MAX_FRAME_SIZE) | F_RXENFRAMER);
+        val = F_MAC_RESET_ | F_XGMAC_STOP_EN;
        if (is_10G(adap))
                val |= F_PCS_RESET_;
        else if (uses_xaui(adap))
@@ -313,8 +318,9 @@ static int rx_fifo_hwm(int mtu)
 int t3_mac_set_mtu(struct cmac *mac, unsigned int mtu)
 {
-        int hwm, lwm;
+        int hwm, lwm, divisor;
-        unsigned int thres, v;
+        int ipg;
+        unsigned int thres, v, reg;
        struct adapter *adap = mac->adapter;
        /*
@@ -335,27 +341,32 @@ int t3_mac_set_mtu(struct cmac *mac, unsigned int mtu)
        hwm = min(hwm, MAC_RXFIFO_SIZE - 8192);
        lwm = min(3 * (int)mtu, MAC_RXFIFO_SIZE / 4);
-        if (adap->params.rev == T3_REV_B2 &&
+        if (adap->params.rev >= T3_REV_B2 &&
            (t3_read_reg(adap, A_XGM_RX_CTRL + mac->offset) & F_RXEN)) {
                disable_exact_filters(mac);
                v = t3_read_reg(adap, A_XGM_RX_CFG + mac->offset);
                t3_set_reg_field(adap, A_XGM_RX_CFG + mac->offset,
                                 F_ENHASHMCAST | F_COPYALLFRAMES, F_DISBCAST);
-                /* drain rx FIFO */
+                reg = adap->params.rev == T3_REV_B2 ?
-                if (t3_wait_op_done(adap,
+                        A_XGM_RX_MAX_PKT_SIZE_ERR_CNT : A_XGM_RXFIFO_CFG;
-                                    A_XGM_RX_MAX_PKT_SIZE_ERR_CNT +
-                                    mac->offset,
+                /* drain RX FIFO */
-                                    1 << 31, 1, 20, 5)) {
+                if (t3_wait_op_done(adap, reg + mac->offset,
+                                    F_RXFIFO_EMPTY, 1, 20, 5)) {
                        t3_write_reg(adap, A_XGM_RX_CFG + mac->offset, v);
                        enable_exact_filters(mac);
                        return -EIO;
                }
-                t3_write_reg(adap, A_XGM_RX_MAX_PKT_SIZE + mac->offset, mtu);
+                t3_set_reg_field(adap, A_XGM_RX_MAX_PKT_SIZE + mac->offset,
+                                 V_RXMAXPKTSIZE(M_RXMAXPKTSIZE),
+                                 V_RXMAXPKTSIZE(mtu));
                t3_write_reg(adap, A_XGM_RX_CFG + mac->offset, v);
                enable_exact_filters(mac);
        } else
-                t3_write_reg(adap, A_XGM_RX_MAX_PKT_SIZE + mac->offset, mtu);
+                t3_set_reg_field(adap, A_XGM_RX_MAX_PKT_SIZE + mac->offset,
+                                 V_RXMAXPKTSIZE(M_RXMAXPKTSIZE),
+                                 V_RXMAXPKTSIZE(mtu));
        /*
         * Adjust the PAUSE frame watermarks.  We always set the LWM, and the
@@ -379,13 +390,16 @@ int t3_mac_set_mtu(struct cmac *mac, unsigned int mtu)
                thres /= 10;
        thres = mtu > thres ? (mtu - thres + 7) / 8 : 0;
        thres = max(thres, 8U); /* need at least 8 */
+        ipg = (adap->params.rev == T3_REV_C) ? 0 : 1;
        t3_set_reg_field(adap, A_XGM_TXFIFO_CFG + mac->offset,
                         V_TXFIFOTHRESH(M_TXFIFOTHRESH) | V_TXIPG(M_TXIPG),
-                         V_TXFIFOTHRESH(thres) | V_TXIPG(1));
+                         V_TXFIFOTHRESH(thres) | V_TXIPG(ipg));
-        if (adap->params.rev > 0)
+        if (adap->params.rev > 0) {
+                divisor = (adap->params.rev == T3_REV_C) ? 64 : 8;
                t3_write_reg(adap, A_XGM_PAUSE_TIMER + mac->offset,
-                             (hwm - lwm) * 4 / 8);
+                             (hwm - lwm) * 4 / divisor);
+        }
        t3_write_reg(adap, A_XGM_TX_PAUSE_QUANTA + mac->offset,
                     MAC_RXFIFO_SIZE * 4 * 8 / 512);
        return 0;
@@ -522,7 +536,7 @@ int t3b2_mac_watchdog_task(struct cmac *mac)
                goto rxcheck;
        }
-        if ((tx_tcnt != mac->tx_tcnt) && (mac->tx_xcnt == 0))  {
+        if ((tx_tcnt != mac->tx_tcnt) && (mac->tx_xcnt == 0)) {
                if (mac->toggle_cnt > 4) {
                        status = 2;
                        goto out;
diff --git a/drivers/net/dl2k.c b/drivers/net/dl2k.c
index 5066beb2e7bc..e233d04a2132 100644
--- a/drivers/net/dl2k.c
+++ b/drivers/net/dl2k.c
@@ -332,7 +332,7 @@ parse_eeprom (struct net_device *dev)
 #endif
        /* Read eeprom */
        for (i = 0; i < 128; i++) {
-                ((u16 *) sromdata)[i] = le16_to_cpu (read_eeprom (ioaddr, i));
+                ((__le16 *) sromdata)[i] = cpu_to_le16(read_eeprom (ioaddr, i));
        }
 #ifdef  MEM_MAPPING
        ioaddr = dev->base_addr;
@@ -516,7 +516,7 @@ rio_timer (unsigned long data)
                                          PCI_DMA_FROMDEVICE));
                        }
                        np->rx_ring[entry].fraginfo |=
-                            cpu_to_le64 (np->rx_buf_sz) << 48;
+                            cpu_to_le64((u64)np->rx_buf_sz << 48);
                        np->rx_ring[entry].status = 0;
                } /* end for */
        } /* end if */
@@ -584,11 +584,11 @@ alloc_list (struct net_device *dev)
                    cpu_to_le64 ( pci_map_single (
                                  np->pdev, skb->data, np->rx_buf_sz,
                                  PCI_DMA_FROMDEVICE));
-                np->rx_ring[i].fraginfo |= cpu_to_le64 (np->rx_buf_sz) << 48;
+                np->rx_ring[i].fraginfo |= cpu_to_le64((u64)np->rx_buf_sz << 48);
        }
        /* Set RFDListPtr */
-        writel (cpu_to_le32 (np->rx_ring_dma), dev->base_addr + RFDListPtr0);
+        writel (np->rx_ring_dma, dev->base_addr + RFDListPtr0);
        writel (0, dev->base_addr + RFDListPtr1);
        return;
@@ -620,15 +620,14 @@ start_xmit (struct sk_buff *skb, struct net_device *dev)
        }
 #endif
        if (np->vlan) {
-                tfc_vlan_tag =
+                tfc_vlan_tag = VLANTagInsert |
-                    cpu_to_le64 (VLANTagInsert) |
+                    ((u64)np->vlan << 32) |
-                    (cpu_to_le64 (np->vlan) << 32) |
+                    ((u64)skb->priority << 45);
-                    (cpu_to_le64 (skb->priority) << 45);
        }
        txdesc->fraginfo = cpu_to_le64 (pci_map_single (np->pdev, skb->data,
                                                        skb->len,
                                                        PCI_DMA_TODEVICE));
-        txdesc->fraginfo |= cpu_to_le64 (skb->len) << 48;
+        txdesc->fraginfo |= cpu_to_le64((u64)skb->len << 48);
        /* DL2K bug: DMA fails to get next descriptor ptr in 10Mbps mode
         * Work around: Always use 1 descriptor in 10Mbps mode */
@@ -708,6 +707,11 @@ rio_interrupt (int irq, void *dev_instance)
        return IRQ_RETVAL(handled);
 }
+static inline dma_addr_t desc_to_dma(struct netdev_desc *desc)
+{
+        return le64_to_cpu(desc->fraginfo) & DMA_48BIT_MASK;
+}
 static void
 rio_free_tx (struct net_device *dev, int irq)
 {
@@ -725,11 +729,11 @@ rio_free_tx (struct net_device *dev, int irq)
        while (entry != np->cur_tx) {
                struct sk_buff *skb;
-                if (!(np->tx_ring[entry].status & TFDDone))
+                if (!(np->tx_ring[entry].status & cpu_to_le64(TFDDone)))
                        break;
                skb = np->tx_skbuff[entry];
                pci_unmap_single (np->pdev,
-                                  np->tx_ring[entry].fraginfo & DMA_48BIT_MASK,
+                                  desc_to_dma(&np->tx_ring[entry]),
                                  skb->len, PCI_DMA_TODEVICE);
                if (irq)
                        dev_kfree_skb_irq (skb);
@@ -831,13 +835,14 @@ receive_packet (struct net_device *dev)
                int pkt_len;
                u64 frame_status;
-                if (!(desc->status & RFDDone) ||
+                if (!(desc->status & cpu_to_le64(RFDDone)) ||
-                    !(desc->status & FrameStart) || !(desc->status & FrameEnd))
+                    !(desc->status & cpu_to_le64(FrameStart)) ||
+                    !(desc->status & cpu_to_le64(FrameEnd)))
                        break;
                /* Chip omits the CRC. */
-                pkt_len = le64_to_cpu (desc->status & 0xffff);
+                frame_status = le64_to_cpu(desc->status);
-                frame_status = le64_to_cpu (desc->status);
+                pkt_len = frame_status & 0xffff;
                if (--cnt < 0)
                        break;
                /* Update rx error statistics, drop packet. */
@@ -857,15 +862,14 @@ receive_packet (struct net_device *dev)
                        /* Small skbuffs for short packets */
                        if (pkt_len > copy_thresh) {
                                pci_unmap_single (np->pdev,
-                                                  desc->fraginfo & DMA_48BIT_MASK,
+                                                  desc_to_dma(desc),
                                                  np->rx_buf_sz,
                                                  PCI_DMA_FROMDEVICE);
                                skb_put (skb = np->rx_skbuff[entry], pkt_len);
                                np->rx_skbuff[entry] = NULL;
                        } else if ((skb = dev_alloc_skb (pkt_len + 2)) != NULL) {
                                pci_dma_sync_single_for_cpu(np->pdev,
-                                                            desc->fraginfo &
+                                                            desc_to_dma(desc),
-                                                                DMA_48BIT_MASK,
                                                            np->rx_buf_sz,
                                                            PCI_DMA_FROMDEVICE);
                                /* 16 byte align the IP header */
@@ -875,8 +879,7 @@ receive_packet (struct net_device *dev)
                                                  pkt_len);
                                skb_put (skb, pkt_len);
                                pci_dma_sync_single_for_device(np->pdev,
-                                                               desc->fraginfo &
+                                                               desc_to_dma(desc),
-                                                                 DMA_48BIT_MASK,
                                                               np->rx_buf_sz,
                                                               PCI_DMA_FROMDEVICE);
                        }
@@ -919,7 +922,7 @@ receive_packet (struct net_device *dev)
                                          PCI_DMA_FROMDEVICE));
                }
                np->rx_ring[entry].fraginfo |=
-                    cpu_to_le64 (np->rx_buf_sz) << 48;
+                    cpu_to_le64((u64)np->rx_buf_sz << 48);
                np->rx_ring[entry].status = 0;
                entry = (entry + 1) % RX_RING_SIZE;
        }
@@ -1121,7 +1124,7 @@ set_multicast (struct net_device *dev)
        hash_table[0] = hash_table[1] = 0;
        /* RxFlowcontrol DA: 01-80-C2-00-00-01. Hash index=0x39 */
-        hash_table[1] |= cpu_to_le32(0x02000000);
+        hash_table[1] |= 0x02000000;
        if (dev->flags & IFF_PROMISC) {
                /* Receive all frames promiscuously. */
                rx_mode = ReceiveAllFrames;
@@ -1313,9 +1316,10 @@ rio_ioctl (struct net_device *dev, struct ifreq *rq, int cmd)
                            ("%02x:cur:%08x next:%08x status:%08x frag1:%08x frag0:%08x",
                             i,
                             (u32) (np->tx_ring_dma + i * sizeof (*desc)),
-                             (u32) desc->next_desc,
+                             (u32)le64_to_cpu(desc->next_desc),
-                             (u32) desc->status, (u32) (desc->fraginfo >> 32),
+                             (u32)le64_to_cpu(desc->status),
-                             (u32) desc->fraginfo);
+                             (u32)(le64_to_cpu(desc->fraginfo) >> 32),
+                             (u32)le64_to_cpu(desc->fraginfo));
                        printk ("\n");
                }
                printk ("\n");
@@ -1432,7 +1436,7 @@ mii_write (struct net_device *dev, int phy_addr, int reg_num, u16 data)
 static int
 mii_wait_link (struct net_device *dev, int wait)
 {
-        BMSR_t bmsr;
+        __u16 bmsr;
        int phy_addr;
        struct netdev_private *np;
@@ -1440,8 +1444,8 @@ mii_wait_link (struct net_device *dev, int wait)
        phy_addr = np->phy_addr;
        do {
-                bmsr.image = mii_read (dev, phy_addr, MII_BMSR);
+                bmsr = mii_read (dev, phy_addr, MII_BMSR);
-                if (bmsr.bits.link_status)
+                if (bmsr & MII_BMSR_LINK_STATUS)
                        return 0;
                mdelay (1);
        } while (--wait > 0);
@@ -1450,70 +1454,72 @@ mii_wait_link (struct net_device *dev, int wait)
 static int
 mii_get_media (struct net_device *dev)
 {
-        ANAR_t negotiate;
+        __u16 negotiate;
-        BMSR_t bmsr;
+        __u16 bmsr;
-        BMCR_t bmcr;
+        __u16 mscr;
-        MSCR_t mscr;
+        __u16 mssr;
-        MSSR_t mssr;
        int phy_addr;
        struct netdev_private *np;
        np = netdev_priv(dev);
        phy_addr = np->phy_addr;
-        bmsr.image = mii_read (dev, phy_addr, MII_BMSR);
+        bmsr = mii_read (dev, phy_addr, MII_BMSR);
        if (np->an_enable) {
-                if (!bmsr.bits.an_complete) {
+                if (!(bmsr & MII_BMSR_AN_COMPLETE)) {
                        /* Auto-Negotiation not completed */
                        return -1;
                }
-                negotiate.image = mii_read (dev, phy_addr, MII_ANAR) &
+                negotiate = mii_read (dev, phy_addr, MII_ANAR) &
                        mii_read (dev, phy_addr, MII_ANLPAR);
-                mscr.image = mii_read (dev, phy_addr, MII_MSCR);
+                mscr = mii_read (dev, phy_addr, MII_MSCR);
-                mssr.image = mii_read (dev, phy_addr, MII_MSSR);
+                mssr = mii_read (dev, phy_addr, MII_MSSR);
-                if (mscr.bits.media_1000BT_FD & mssr.bits.lp_1000BT_FD) {
+                if (mscr & MII_MSCR_1000BT_FD && mssr & MII_MSSR_LP_1000BT_FD) {
                        np->speed = 1000;
                        np->full_duplex = 1;
                        printk (KERN_INFO "Auto 1000 Mbps, Full duplex\n");
-                } else if (mscr.bits.media_1000BT_HD & mssr.bits.lp_1000BT_HD) {
+                } else if (mscr & MII_MSCR_1000BT_HD && mssr & MII_MSSR_LP_1000BT_HD) {
                        np->speed = 1000;
                        np->full_duplex = 0;
                        printk (KERN_INFO "Auto 1000 Mbps, Half duplex\n");
-                } else if (negotiate.bits.media_100BX_FD) {
+                } else if (negotiate & MII_ANAR_100BX_FD) {
                        np->speed = 100;
                        np->full_duplex = 1;
                        printk (KERN_INFO "Auto 100 Mbps, Full duplex\n");
-                } else if (negotiate.bits.media_100BX_HD) {
+                } else if (negotiate & MII_ANAR_100BX_HD) {
                        np->speed = 100;
                        np->full_duplex = 0;
                        printk (KERN_INFO "Auto 100 Mbps, Half duplex\n");
-                } else if (negotiate.bits.media_10BT_FD) {
+                } else if (negotiate & MII_ANAR_10BT_FD) {
                        np->speed = 10;
                        np->full_duplex = 1;
                        printk (KERN_INFO "Auto 10 Mbps, Full duplex\n");
-                } else if (negotiate.bits.media_10BT_HD) {
+                } else if (negotiate & MII_ANAR_10BT_HD) {
                        np->speed = 10;
                        np->full_duplex = 0;
                        printk (KERN_INFO "Auto 10 Mbps, Half duplex\n");
                }
-                if (negotiate.bits.pause) {
+                if (negotiate & MII_ANAR_PAUSE) {
                        np->tx_flow &= 1;
                        np->rx_flow &= 1;
-                } else if (negotiate.bits.asymmetric) {
+                } else if (negotiate & MII_ANAR_ASYMMETRIC) {
                        np->tx_flow = 0;
                        np->rx_flow &= 1;
                }
                /* else tx_flow, rx_flow = user select  */
        } else {
-                bmcr.image = mii_read (dev, phy_addr, MII_BMCR);
+                __u16 bmcr = mii_read (dev, phy_addr, MII_BMCR);
-                if (bmcr.bits.speed100 == 1 && bmcr.bits.speed1000 == 0) {
+                switch (bmcr & (MII_BMCR_SPEED_100 | MII_BMCR_SPEED_1000)) {
+                case MII_BMCR_SPEED_1000:
+                        printk (KERN_INFO "Operating at 1000 Mbps, ");
+                        break;
+                case MII_BMCR_SPEED_100:
                        printk (KERN_INFO "Operating at 100 Mbps, ");
-                } else if (bmcr.bits.speed100 == 0 && bmcr.bits.speed1000 == 0) {
+                        break;
+                case 0:
                        printk (KERN_INFO "Operating at 10 Mbps, ");
-                } else if (bmcr.bits.speed100 == 0 && bmcr.bits.speed1000 == 1) {
-                        printk (KERN_INFO "Operating at 1000 Mbps, ");
                }
-                if (bmcr.bits.duplex_mode) {
+                if (bmcr & MII_BMCR_DUPLEX_MODE) {
                        printk ("Full duplex\n");
                } else {
                        printk ("Half duplex\n");
@@ -1534,10 +1540,10 @@ mii_get_media (struct net_device *dev)
 static int
 mii_set_media (struct net_device *dev)
 {
-        PHY_SCR_t pscr;
+        __u16 pscr;
-        BMCR_t bmcr;
+        __u16 bmcr;
-        BMSR_t bmsr;
+        __u16 bmsr;
-        ANAR_t anar;
+        __u16 anar;
        int phy_addr;
        struct netdev_private *np;
        np = netdev_priv(dev);
@@ -1546,76 +1552,77 @@ mii_set_media (struct net_device *dev)
        /* Does user set speed? */
        if (np->an_enable) {
                /* Advertise capabilities */
-                bmsr.image = mii_read (dev, phy_addr, MII_BMSR);
+                bmsr = mii_read (dev, phy_addr, MII_BMSR);
-                anar.image = mii_read (dev, phy_addr, MII_ANAR);
+                anar = mii_read (dev, phy_addr, MII_ANAR) &
-                anar.bits.media_100BX_FD = bmsr.bits.media_100BX_FD;
+                             ~MII_ANAR_100BX_FD &
-                anar.bits.media_100BX_HD = bmsr.bits.media_100BX_HD;
+                             ~MII_ANAR_100BX_HD &
-                anar.bits.media_100BT4 = bmsr.bits.media_100BT4;
+                             ~MII_ANAR_100BT4 &
-                anar.bits.media_10BT_FD = bmsr.bits.media_10BT_FD;
+                             ~MII_ANAR_10BT_FD &
-                anar.bits.media_10BT_HD = bmsr.bits.media_10BT_HD;
+                             ~MII_ANAR_10BT_HD;
-                anar.bits.pause = 1;
+                if (bmsr & MII_BMSR_100BX_FD)
-                anar.bits.asymmetric = 1;
+                        anar |= MII_ANAR_100BX_FD;
-                mii_write (dev, phy_addr, MII_ANAR, anar.image);
+                if (bmsr & MII_BMSR_100BX_HD)
+                        anar |= MII_ANAR_100BX_HD;
+                if (bmsr & MII_BMSR_100BT4)
+                        anar |= MII_ANAR_100BT4;
+                if (bmsr & MII_BMSR_10BT_FD)
+                        anar |= MII_ANAR_10BT_FD;
+                if (bmsr & MII_BMSR_10BT_HD)
+                        anar |= MII_ANAR_10BT_HD;
+                anar |= MII_ANAR_PAUSE | MII_ANAR_ASYMMETRIC;
+                mii_write (dev, phy_addr, MII_ANAR, anar);
                /* Enable Auto crossover */
-                pscr.image = mii_read (dev, phy_addr, MII_PHY_SCR);
+                pscr = mii_read (dev, phy_addr, MII_PHY_SCR);
-                pscr.bits.mdi_crossover_mode = 3;       /* 11'b */
+                pscr |= 3 << 5; /* 11'b */
-                mii_write (dev, phy_addr, MII_PHY_SCR, pscr.image);
+                mii_write (dev, phy_addr, MII_PHY_SCR, pscr);
                /* Soft reset PHY */
                mii_write (dev, phy_addr, MII_BMCR, MII_BMCR_RESET);
-                bmcr.image = 0;
+                bmcr = MII_BMCR_AN_ENABLE | MII_BMCR_RESTART_AN | MII_BMCR_RESET;
-                bmcr.bits.an_enable = 1;
+                mii_write (dev, phy_addr, MII_BMCR, bmcr);
-                bmcr.bits.restart_an = 1;
-                bmcr.bits.reset = 1;
-                mii_write (dev, phy_addr, MII_BMCR, bmcr.image);
                mdelay(1);
        } else {
                /* Force speed setting */
                /* 1) Disable Auto crossover */
-                pscr.image = mii_read (dev, phy_addr, MII_PHY_SCR);
+                pscr = mii_read (dev, phy_addr, MII_PHY_SCR);
-                pscr.bits.mdi_crossover_mode = 0;
+                pscr &= ~(3 << 5);
-                mii_write (dev, phy_addr, MII_PHY_SCR, pscr.image);
+                mii_write (dev, phy_addr, MII_PHY_SCR, pscr);
                /* 2) PHY Reset */
-                bmcr.image = mii_read (dev, phy_addr, MII_BMCR);
+                bmcr = mii_read (dev, phy_addr, MII_BMCR);
-                bmcr.bits.reset = 1;
+                bmcr |= MII_BMCR_RESET;
-                mii_write (dev, phy_addr, MII_BMCR, bmcr.image);
+                mii_write (dev, phy_addr, MII_BMCR, bmcr);
                /* 3) Power Down */
-                bmcr.image = 0x1940;    /* must be 0x1940 */
+                bmcr = 0x1940;  /* must be 0x1940 */
-                mii_write (dev, phy_addr, MII_BMCR, bmcr.image);
+                mii_write (dev, phy_addr, MII_BMCR, bmcr);
                mdelay (100);   /* wait a certain time */
                /* 4) Advertise nothing */
                mii_write (dev, phy_addr, MII_ANAR, 0);
                /* 5) Set media and Power Up */
-                bmcr.image = 0;
+                bmcr = MII_BMCR_POWER_DOWN;
-                bmcr.bits.power_down = 1;
                if (np->speed == 100) {
-                        bmcr.bits.speed100 = 1;
+                        bmcr |= MII_BMCR_SPEED_100;
-                        bmcr.bits.speed1000 = 0;
                        printk (KERN_INFO "Manual 100 Mbps, ");
                } else if (np->speed == 10) {
-                        bmcr.bits.speed100 = 0;
-                        bmcr.bits.speed1000 = 0;
                        printk (KERN_INFO "Manual 10 Mbps, ");
                }
                if (np->full_duplex) {
-                        bmcr.bits.duplex_mode = 1;
+                        bmcr |= MII_BMCR_DUPLEX_MODE;
                        printk ("Full duplex\n");
                } else {
-                        bmcr.bits.duplex_mode = 0;
                        printk ("Half duplex\n");
                }
 #if 0
                /* Set 1000BaseT Master/Slave setting */
-                mscr.image = mii_read (dev, phy_addr, MII_MSCR);
+                mscr = mii_read (dev, phy_addr, MII_MSCR);
-                mscr.bits.cfg_enable = 1;
+                mscr |= MII_MSCR_CFG_ENABLE;
-                mscr.bits.cfg_value = 0;
+                mscr &= ~MII_MSCR_CFG_VALUE = 0;
 #endif
-                mii_write (dev, phy_addr, MII_BMCR, bmcr.image);
+                mii_write (dev, phy_addr, MII_BMCR, bmcr);
                mdelay(10);
        }
        return 0;
@@ -1624,43 +1631,42 @@ mii_set_media (struct net_device *dev)
 static int
 mii_get_media_pcs (struct net_device *dev)
 {
-        ANAR_PCS_t negotiate;
+        __u16 negotiate;
-        BMSR_t bmsr;
+        __u16 bmsr;
-        BMCR_t bmcr;
        int phy_addr;
        struct netdev_private *np;
        np = netdev_priv(dev);
        phy_addr = np->phy_addr;
-        bmsr.image = mii_read (dev, phy_addr, PCS_BMSR);
+        bmsr = mii_read (dev, phy_addr, PCS_BMSR);
        if (np->an_enable) {
-                if (!bmsr.bits.an_complete) {
+                if (!(bmsr & MII_BMSR_AN_COMPLETE)) {
                        /* Auto-Negotiation not completed */
                        return -1;
                }
-                negotiate.image = mii_read (dev, phy_addr, PCS_ANAR) &
+                negotiate = mii_read (dev, phy_addr, PCS_ANAR) &
                        mii_read (dev, phy_addr, PCS_ANLPAR);
                np->speed = 1000;
-                if (negotiate.bits.full_duplex) {
+                if (negotiate & PCS_ANAR_FULL_DUPLEX) {
                        printk (KERN_INFO "Auto 1000 Mbps, Full duplex\n");
                        np->full_duplex = 1;
                } else {
                        printk (KERN_INFO "Auto 1000 Mbps, half duplex\n");
                        np->full_duplex = 0;
                }
-                if (negotiate.bits.pause) {
+                if (negotiate & PCS_ANAR_PAUSE) {
                        np->tx_flow &= 1;
                        np->rx_flow &= 1;
-                } else if (negotiate.bits.asymmetric) {
+                } else if (negotiate & PCS_ANAR_ASYMMETRIC) {
                        np->tx_flow = 0;
                        np->rx_flow &= 1;
                }
                /* else tx_flow, rx_flow = user select  */
        } else {
-                bmcr.image = mii_read (dev, phy_addr, PCS_BMCR);
+                __u16 bmcr = mii_read (dev, phy_addr, PCS_BMCR);
                printk (KERN_INFO "Operating at 1000 Mbps, ");
-                if (bmcr.bits.duplex_mode) {
+                if (bmcr & MII_BMCR_DUPLEX_MODE) {
                        printk ("Full duplex\n");
                } else {
                        printk ("Half duplex\n");
@@ -1681,9 +1687,9 @@ mii_get_media_pcs (struct net_device *dev)
 static int
 mii_set_media_pcs (struct net_device *dev)
 {
-        BMCR_t bmcr;
+        __u16 bmcr;
-        ESR_t esr;
+        __u16 esr;
-        ANAR_PCS_t anar;
+        __u16 anar;
        int phy_addr;
        struct netdev_private *np;
        np = netdev_priv(dev);
@@ -1692,41 +1698,37 @@ mii_set_media_pcs (struct net_device *dev)
        /* Auto-Negotiation? */
        if (np->an_enable) {
                /* Advertise capabilities */
-                esr.image = mii_read (dev, phy_addr, PCS_ESR);
+                esr = mii_read (dev, phy_addr, PCS_ESR);
-                anar.image = mii_read (dev, phy_addr, MII_ANAR);
+                anar = mii_read (dev, phy_addr, MII_ANAR) &
-                anar.bits.half_duplex =
+                        ~PCS_ANAR_HALF_DUPLEX &
-                        esr.bits.media_1000BT_HD | esr.bits.media_1000BX_HD;
+                        ~PCS_ANAR_FULL_DUPLEX;
-                anar.bits.full_duplex =
+                if (esr & (MII_ESR_1000BT_HD | MII_ESR_1000BX_HD))
-                        esr.bits.media_1000BT_FD | esr.bits.media_1000BX_FD;
+                        anar |= PCS_ANAR_HALF_DUPLEX;
-                anar.bits.pause = 1;
+                if (esr & (MII_ESR_1000BT_FD | MII_ESR_1000BX_FD))
-                anar.bits.asymmetric = 1;
+                        anar |= PCS_ANAR_FULL_DUPLEX;
-                mii_write (dev, phy_addr, MII_ANAR, anar.image);
+                anar |= PCS_ANAR_PAUSE | PCS_ANAR_ASYMMETRIC;
+                mii_write (dev, phy_addr, MII_ANAR, anar);
                /* Soft reset PHY */
                mii_write (dev, phy_addr, MII_BMCR, MII_BMCR_RESET);
-                bmcr.image = 0;
+                bmcr = MII_BMCR_AN_ENABLE | MII_BMCR_RESTART_AN |
-                bmcr.bits.an_enable = 1;
+                       MII_BMCR_RESET;
-                bmcr.bits.restart_an = 1;
+                mii_write (dev, phy_addr, MII_BMCR, bmcr);
-                bmcr.bits.reset = 1;
-                mii_write (dev, phy_addr, MII_BMCR, bmcr.image);
                mdelay(1);
        } else {
                /* Force speed setting */
                /* PHY Reset */
-                bmcr.image = 0;
+                bmcr = MII_BMCR_RESET;
-                bmcr.bits.reset = 1;
+                mii_write (dev, phy_addr, MII_BMCR, bmcr);
-                mii_write (dev, phy_addr, MII_BMCR, bmcr.image);
                mdelay(10);
-                bmcr.image = 0;
-                bmcr.bits.an_enable = 0;
                if (np->full_duplex) {
-                        bmcr.bits.duplex_mode = 1;
+                        bmcr = MII_BMCR_DUPLEX_MODE;
                        printk (KERN_INFO "Manual full duplex\n");
                } else {
-                        bmcr.bits.duplex_mode = 0;
+                        bmcr = 0;
                        printk (KERN_INFO "Manual half duplex\n");
                }
-                mii_write (dev, phy_addr, MII_BMCR, bmcr.image);
+                mii_write (dev, phy_addr, MII_BMCR, bmcr);
                mdelay(10);
                /*  Advertise nothing */
@@ -1762,7 +1764,7 @@ rio_close (struct net_device *dev)
                skb = np->rx_skbuff[i];
                if (skb) {
                        pci_unmap_single(np->pdev,
-                                         np->rx_ring[i].fraginfo & DMA_48BIT_MASK,
+                                         desc_to_dma(&np->rx_ring[i]),
                                         skb->len, PCI_DMA_FROMDEVICE);
                        dev_kfree_skb (skb);
                        np->rx_skbuff[i] = NULL;
@@ -1772,7 +1774,7 @@ rio_close (struct net_device *dev)
                skb = np->tx_skbuff[i];
                if (skb) {
                        pci_unmap_single(np->pdev,
-                                         np->tx_ring[i].fraginfo & DMA_48BIT_MASK,
+                                         desc_to_dma(&np->tx_ring[i]),
                                         skb->len, PCI_DMA_TODEVICE);
                        dev_kfree_skb (skb);
                        np->tx_skbuff[i] = NULL;
diff --git a/drivers/net/dl2k.h b/drivers/net/dl2k.h
index 5b801775f42d..d66c605b4075 100644
--- a/drivers/net/dl2k.h
+++ b/drivers/net/dl2k.h
@@ -298,23 +298,6 @@ enum _pcs_reg {
 };
 /* Basic Mode Control Register */
-typedef union t_MII_BMCR {
-        u16 image;
-        struct {
-                u16 _bit_5_0:6; // bit 5:0
-                u16 speed1000:1;        // bit 6
-                u16 col_test_enable:1;  // bit 7
-                u16 duplex_mode:1;      // bit 8
-                u16 restart_an:1;       // bit 9
-                u16 isolate:1;  // bit 10
-                u16 power_down:1;       // bit 11
-                u16 an_enable:1;        // bit 12
-                u16 speed100:1; // bit 13
-                u16 loopback:1; // bit 14
-                u16 reset:1;    // bit 15
-        } bits;
-} BMCR_t, *PBMCR_t;
 enum _mii_bmcr {
        MII_BMCR_RESET = 0x8000,
        MII_BMCR_LOOP_BACK = 0x4000,
@@ -333,28 +316,6 @@ enum _mii_bmcr {
 };
 /* Basic Mode Status Register */
-typedef union t_MII_BMSR {
-        u16 image;
-        struct {
-                u16 ext_capability:1;   // bit 0
-                u16 japper_detect:1;    // bit 1
-                u16 link_status:1;      // bit 2
-                u16 an_ability:1;       // bit 3
-                u16 remote_fault:1;     // bit 4
-                u16 an_complete:1;      // bit 5
-                u16 preamble_supp:1;    // bit 6
-                u16 _bit_7:1;   // bit 7
-                u16 ext_status:1;       // bit 8
-                u16 media_100BT2_HD:1;  // bit 9
-                u16 media_100BT2_FD:1;  // bit 10
-                u16 media_10BT_HD:1;    // bit 11
-                u16 media_10BT_FD:1;    // bit 12
-                u16 media_100BX_HD:1;   // bit 13
-                u16 media_100BX_FD:1;   // bit 14
-                u16 media_100BT4:1;     // bit 15
-        } bits;
-} BMSR_t, *PBMSR_t;
 enum _mii_bmsr {
        MII_BMSR_100BT4 = 0x8000,
        MII_BMSR_100BX_FD = 0x4000,
@@ -374,24 +335,6 @@ enum _mii_bmsr {
 };
 /* ANAR */
-typedef union t_MII_ANAR {
-        u16 image;
-        struct {
-                u16 selector:5; // bit 4:0
-                u16 media_10BT_HD:1;    // bit 5
-                u16 media_10BT_FD:1;    // bit 6
-                u16 media_100BX_HD:1;   // bit 7
-                u16 media_100BX_FD:1;   // bit 8
-                u16 media_100BT4:1;     // bit 9
-                u16 pause:1;    // bit 10
-                u16 asymmetric:1;       // bit 11
-                u16 _bit12:1;   // bit 12
-                u16 remote_fault:1;     // bit 13
-                u16 _bit14:1;   // bit 14
-                u16 next_page:1;        // bit 15
-        } bits;
-} ANAR_t, *PANAR_t;
 enum _mii_anar {
        MII_ANAR_NEXT_PAGE = 0x8000,
        MII_ANAR_REMOTE_FAULT = 0x4000,
@@ -407,24 +350,6 @@ enum _mii_anar {
 };
 /* ANLPAR */
-typedef union t_MII_ANLPAR {
-        u16 image;
-        struct {
-                u16 selector:5; // bit 4:0
-                u16 media_10BT_HD:1;    // bit 5
-                u16 media_10BT_FD:1;    // bit 6
-                u16 media_100BX_HD:1;   // bit 7
-                u16 media_100BX_FD:1;   // bit 8
-                u16 media_100BT4:1;     // bit 9
-                u16 pause:1;    // bit 10
-                u16 asymmetric:1;       // bit 11
-                u16 _bit12:1;   // bit 12
-                u16 remote_fault:1;     // bit 13
-                u16 _bit14:1;   // bit 14
-                u16 next_page:1;        // bit 15
-        } bits;
-} ANLPAR_t, *PANLPAR_t;
 enum _mii_anlpar {
        MII_ANLPAR_NEXT_PAGE = MII_ANAR_NEXT_PAGE,
        MII_ANLPAR_REMOTE_FAULT = MII_ANAR_REMOTE_FAULT,
@@ -439,18 +364,6 @@ enum _mii_anlpar {
 };
 /* Auto-Negotiation Expansion Register */
-typedef union t_MII_ANER {
-        u16 image;
-        struct {
-                u16 lp_negotiable:1;    // bit 0
-                u16 page_received:1;    // bit 1
-                u16 nextpagable:1;      // bit 2
-                u16 lp_nextpagable:1;   // bit 3
-                u16 pdetect_fault:1;    // bit 4
-                u16 _bit15_5:11;        // bit 15:5
-        } bits;
-} ANER_t, *PANER_t;
 enum _mii_aner {
        MII_ANER_PAR_DETECT_FAULT = 0x0010,
        MII_ANER_LP_NEXTPAGABLE = 0x0008,
@@ -460,19 +373,6 @@ enum _mii_aner {
 };
 /* MASTER-SLAVE Control Register */
-typedef union t_MII_MSCR {
-        u16 image;
-        struct {
-                u16 _bit_7_0:8; // bit 7:0
-                u16 media_1000BT_HD:1;  // bit 8
-                u16 media_1000BT_FD:1;  // bit 9
-                u16 port_type:1;        // bit 10
-                u16 cfg_value:1;        // bit 11
-                u16 cfg_enable:1;       // bit 12
-                u16 test_mode:3;        // bit 15:13
-        } bits;
-} MSCR_t, *PMSCR_t;
 enum _mii_mscr {
        MII_MSCR_TEST_MODE = 0xe000,
        MII_MSCR_CFG_ENABLE = 0x1000,
@@ -483,20 +383,6 @@ enum _mii_mscr {
 };
 /* MASTER-SLAVE Status Register */
-typedef union t_MII_MSSR {
-        u16 image;
-        struct {
-                u16 idle_err_count:8;   // bit 7:0
-                u16 _bit_9_8:2; // bit 9:8
-                u16 lp_1000BT_HD:1;     // bit 10
-                u16 lp_1000BT_FD:1;     // bit 11
-                u16 remote_rcv_status:1;        // bit 12
-                u16 local_rcv_status:1; // bit 13
-                u16 cfg_resolution:1;   // bit 14
-                u16 cfg_fault:1;        // bit 15
-        } bits;
-} MSSR_t, *PMSSR_t;
 enum _mii_mssr {
        MII_MSSR_CFG_FAULT = 0x8000,
        MII_MSSR_CFG_RES = 0x4000,
@@ -508,17 +394,6 @@ enum _mii_mssr {
 };
 /* IEEE Extened Status Register */
-typedef union t_MII_ESR {
-        u16 image;
-        struct {
-                u16 _bit_11_0:12;       // bit 11:0
-                u16 media_1000BT_HD:2;  // bit 12
-                u16 media_1000BT_FD:1;  // bit 13
-                u16 media_1000BX_HD:1;  // bit 14
-                u16 media_1000BX_FD:1;  // bit 15
-        } bits;
-} ESR_t, *PESR_t;
 enum _mii_esr {
        MII_ESR_1000BX_FD = 0x8000,
        MII_ESR_1000BX_HD = 0x4000,
@@ -526,6 +401,7 @@ enum _mii_esr {
        MII_ESR_1000BT_HD = 0x1000,
 };
 /* PHY Specific Control Register */
+#if 0
 typedef union t_MII_PHY_SCR {
        u16 image;
        struct {
@@ -543,6 +419,7 @@ typedef union t_MII_PHY_SCR {
                u16 xmit_fifo_depth:2;  // bit 15:14
        } bits;
 } PHY_SCR_t, *PPHY_SCR_t;
+#endif
 typedef enum t_MII_ADMIN_STATUS {
        adm_reset,
@@ -556,21 +433,6 @@ typedef enum t_MII_ADMIN_STATUS {
 /* PCS control and status registers bitmap as the same as MII */
 /* PCS Extended Status register bitmap as the same as MII */
 /* PCS ANAR */
-typedef union t_PCS_ANAR {
-        u16 image;
-        struct {
-                u16 _bit_4_0:5;         // bit 4:0
-                u16 full_duplex:1;      // bit 5
-                u16 half_duplex:1;      // bit 6
-                u16 asymmetric:1;       // bit 7
-                u16 pause:1;            // bit 8
-                u16 _bit_11_9:3;        // bit 11:9
-                u16 remote_fault:2;     // bit 13:12
-                u16 _bit_14:1;          // bit 14
-                u16 next_page:1;        // bit 15
-        } bits;
-} ANAR_PCS_t, *PANAR_PCS_t;
 enum _pcs_anar {
        PCS_ANAR_NEXT_PAGE = 0x8000,
        PCS_ANAR_REMOTE_FAULT = 0x3000,
@@ -580,21 +442,6 @@ enum _pcs_anar {
        PCS_ANAR_FULL_DUPLEX = 0x0020,
 };
 /* PCS ANLPAR */
-typedef union t_PCS_ANLPAR {
-        u16 image;
-        struct {
-                u16 _bit_4_0:5;         // bit 4:0
-                u16 full_duplex:1;      // bit 5
-                u16 half_duplex:1;      // bit 6
-                u16 asymmetric:1;       // bit 7
-                u16 pause:1;            // bit 8
-                u16 _bit_11_9:3;        // bit 11:9
-                u16 remote_fault:2;     // bit 13:12
-                u16 _bit_14:1;          // bit 14
-                u16 next_page:1;        // bit 15
-        } bits;
-} ANLPAR_PCS_t, *PANLPAR_PCS_t;
 enum _pcs_anlpar {
        PCS_ANLPAR_NEXT_PAGE = PCS_ANAR_NEXT_PAGE,
        PCS_ANLPAR_REMOTE_FAULT = PCS_ANAR_REMOTE_FAULT,
@@ -633,9 +480,9 @@ struct mii_data {
 /* The Rx and Tx buffer descriptors. */
 struct netdev_desc {
-        u64 next_desc;
+        __le64 next_desc;
-        u64 status;
+        __le64 status;
-        u64 fraginfo;
+        __le64 fraginfo;
 };
 #define PRIV_ALIGN      15      /* Required alignment mask */
diff --git a/drivers/net/e100.c b/drivers/net/e100.c
index 3dbaec680b46..b87402bc8308 100644
--- a/drivers/net/e100.c
+++ b/drivers/net/e100.c
@@ -1991,13 +1991,12 @@ static int e100_poll(struct napi_struct *napi, int budget)
        struct nic *nic = container_of(napi, struct nic, napi);
        struct net_device *netdev = nic->netdev;
        unsigned int work_done = 0;
-        int tx_cleaned;
        e100_rx_clean(nic, &work_done, budget);
-        tx_cleaned = e100_tx_clean(nic);
+        e100_tx_clean(nic);
-        /* If no Rx and Tx cleanup work was done, exit polling mode. */
+        /* If budget not fully consumed, exit the polling mode */
-        if((!tx_cleaned && (work_done == 0)) || !netif_running(netdev)) {
+        if (work_done < budget) {
                netif_rx_complete(netdev, napi);
                e100_enable_irq(nic);
        }
@@ -2214,13 +2213,11 @@ static void e100_get_drvinfo(struct net_device *netdev,
        strcpy(info->bus_info, pci_name(nic->pdev));
 }
+#define E100_PHY_REGS 0x1C
 static int e100_get_regs_len(struct net_device *netdev)
 {
        struct nic *nic = netdev_priv(netdev);
-#define E100_PHY_REGS           0x1C
+        return 1 + E100_PHY_REGS + sizeof(nic->mem->dump_buf);
-#define E100_REGS_LEN           1 + E100_PHY_REGS + \
-        sizeof(nic->mem->dump_buf) / sizeof(u32)
-        return E100_REGS_LEN * sizeof(u32);
 }
 static void e100_get_regs(struct net_device *netdev,
@@ -2739,8 +2736,9 @@ static int e100_suspend(struct pci_dev *pdev, pm_message_t state)
                pci_enable_wake(pdev, PCI_D3cold, 0);
        }
-        pci_disable_device(pdev);
        free_irq(pdev->irq, netdev);
+        pci_disable_device(pdev);
        pci_set_power_state(pdev, PCI_D3hot);
        return 0;
@@ -2782,6 +2780,8 @@ static void e100_shutdown(struct pci_dev *pdev)
                pci_enable_wake(pdev, PCI_D3cold, 0);
        }
+        free_irq(pdev->irq, netdev);
        pci_disable_device(pdev);
        pci_set_power_state(pdev, PCI_D3hot);
 }
diff --git a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/e1000/e1000_ethtool.c
index 667f18bcc172..b83ccce8a9b7 100644
--- a/drivers/net/e1000/e1000_ethtool.c
+++ b/drivers/net/e1000/e1000_ethtool.c
@@ -1923,7 +1923,7 @@ e1000_get_strings(struct net_device *netdev, uint32_t stringset, uint8_t *data)
        switch (stringset) {
        case ETH_SS_TEST:
                memcpy(data, *e1000_gstrings_test,
-                        E1000_TEST_LEN*ETH_GSTRING_LEN);
+                        sizeof(e1000_gstrings_test));
                break;
        case ETH_SS_STATS:
                for (i = 0; i < E1000_GLOBAL_STATS_LEN; i++) {
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index cf39473ef90a..76c0fa690cc6 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -632,6 +632,7 @@ e1000_down(struct e1000_adapter *adapter)
 #ifdef CONFIG_E1000_NAPI
        napi_disable(&adapter->napi);
+        atomic_set(&adapter->irq_sem, 0);
 #endif
        e1000_irq_disable(adapter);
@@ -3924,27 +3925,24 @@ e1000_clean(struct napi_struct *napi, int budget)
        /* Must NOT use netdev_priv macro here. */
        adapter = poll_dev->priv;
-        /* Keep link state information with original netdev */
-        if (!netif_carrier_ok(poll_dev))
-                goto quit_polling;
        /* e1000_clean is called per-cpu.  This lock protects
         * tx_ring[0] from being cleaned by multiple cpus
         * simultaneously.  A failure obtaining the lock means
         * tx_ring[0] is currently being cleaned anyway. */
        if (spin_trylock(&adapter->tx_queue_lock)) {
                tx_cleaned = e1000_clean_tx_irq(adapter,
-                                                &adapter->tx_ring[0]);
+                                                &adapter->tx_ring[0]);
                spin_unlock(&adapter->tx_queue_lock);
        }
        adapter->clean_rx(adapter, &adapter->rx_ring[0],
                          &work_done, budget);
-        /* If no Tx and not enough Rx work done, exit the polling mode */
+        if (tx_cleaned)
-        if ((!tx_cleaned && (work_done < budget)) ||
+                work_done = budget;
-           !netif_running(poll_dev)) {
-quit_polling:
+        /* If budget not fully consumed, exit the polling mode */
+        if (work_done < budget) {
                if (likely(adapter->itr_setting & 3))
                        e1000_set_itr(adapter);
                netif_rx_complete(poll_dev, napi);
diff --git a/drivers/net/e1000e/ethtool.c b/drivers/net/e1000e/ethtool.c
index 6a39784e7ee2..87f9da1b6b4e 100644
--- a/drivers/net/e1000e/ethtool.c
+++ b/drivers/net/e1000e/ethtool.c
@@ -1739,7 +1739,7 @@ static void e1000_get_strings(struct net_device *netdev, u32 stringset,
        switch (stringset) {
        case ETH_SS_TEST:
                memcpy(data, *e1000_gstrings_test,
-                        E1000_TEST_LEN*ETH_GSTRING_LEN);
+                        sizeof(e1000_gstrings_test));
                break;
        case ETH_SS_STATS:
                for (i = 0; i < E1000_GLOBAL_STATS_LEN; i++) {
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index 4fd2e23720b6..9cc5a6b01bc1 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -1389,10 +1389,6 @@ static int e1000_clean(struct napi_struct *napi, int budget)
        /* Must NOT use netdev_priv macro here. */
        adapter = poll_dev->priv;
-        /* Keep link state information with original netdev */
-        if (!netif_carrier_ok(poll_dev))
-                goto quit_polling;
        /* e1000_clean is called per-cpu.  This lock protects
         * tx_ring from being cleaned by multiple cpus
         * simultaneously.  A failure obtaining the lock means
@@ -1404,10 +1400,11 @@ static int e1000_clean(struct napi_struct *napi, int budget)
        adapter->clean_rx(adapter, &work_done, budget);
-        /* If no Tx and not enough Rx work done, exit the polling mode */
+        if (tx_cleaned)
-        if ((!tx_cleaned && (work_done < budget)) ||
+                work_done = budget;
-           !netif_running(poll_dev)) {
-quit_polling:
+        /* If budget not fully consumed, exit the polling mode */
+        if (work_done < budget) {
                if (adapter->itr_setting & 3)
                        e1000_set_itr(adapter);
                netif_rx_complete(poll_dev, napi);
@@ -2186,6 +2183,7 @@ void e1000e_down(struct e1000_adapter *adapter)
        msleep(10);
        napi_disable(&adapter->napi);
+        atomic_set(&adapter->irq_sem, 0);
        e1000_irq_disable(adapter);
        del_timer_sync(&adapter->watchdog_timer);
diff --git a/drivers/net/ehea/ehea.h b/drivers/net/ehea/ehea.h
index f78e5bf7cb33..5f82a4647eee 100644
--- a/drivers/net/ehea/ehea.h
+++ b/drivers/net/ehea/ehea.h
@@ -40,7 +40,7 @@
 #include <asm/io.h>
 #define DRV_NAME        "ehea"
-#define DRV_VERSION     "EHEA_0080"
+#define DRV_VERSION     "EHEA_0083"
 /* eHEA capability flags */
 #define DLPAR_PORT_ADD_REM 1
diff --git a/drivers/net/ehea/ehea_main.c b/drivers/net/ehea/ehea_main.c
index f0319f1e8e05..869e1604b16e 100644
--- a/drivers/net/ehea/ehea_main.c
+++ b/drivers/net/ehea/ehea_main.c
@@ -136,7 +136,7 @@ static struct net_device_stats *ehea_get_stats(struct net_device *dev)
        struct ehea_port *port = netdev_priv(dev);
        struct net_device_stats *stats = &port->stats;
        struct hcp_ehea_port_cb2 *cb2;
-        u64 hret, rx_packets;
+        u64 hret, rx_packets, tx_packets;
        int i;
        memset(stats, 0, sizeof(*stats));
@@ -162,7 +162,11 @@ static struct net_device_stats *ehea_get_stats(struct net_device *dev)
        for (i = 0; i < port->num_def_qps; i++)
                rx_packets += port->port_res[i].rx_packets;
-        stats->tx_packets = cb2->txucp + cb2->txmcp + cb2->txbcp;
+        tx_packets = 0;
+        for (i = 0; i < port->num_def_qps + port->num_add_tx_qps; i++)
+                tx_packets += port->port_res[i].tx_packets;
+        stats->tx_packets = tx_packets;
        stats->multicast = cb2->rxmcp;
        stats->rx_errors = cb2->rxuerr;
        stats->rx_bytes = cb2->rxo;
@@ -406,11 +410,6 @@ static int ehea_treat_poll_error(struct ehea_port_res *pr, int rq,
        if (cqe->status & EHEA_CQE_STAT_ERR_CRC)
                pr->p_stats.err_frame_crc++;
-        if (netif_msg_rx_err(pr->port)) {
-                ehea_error("CQE Error for QP %d", pr->qp->init_attr.qp_nr);
-                ehea_dump(cqe, sizeof(*cqe), "CQE");
-        }
        if (rq == 2) {
                *processed_rq2 += 1;
                skb = get_skb_by_index(pr->rq2_skba.arr, pr->rq2_skba.len, cqe);
@@ -422,7 +421,11 @@ static int ehea_treat_poll_error(struct ehea_port_res *pr, int rq,
        }
        if (cqe->status & EHEA_CQE_STAT_FAT_ERR_MASK) {
-                ehea_error("Critical receive error. Resetting port.");
+                if (netif_msg_rx_err(pr->port)) {
+                        ehea_error("Critical receive error for QP %d. "
+                                   "Resetting port.", pr->qp->init_attr.qp_nr);
+                        ehea_dump(cqe, sizeof(*cqe), "CQE");
+                }
                schedule_work(&pr->port->reset_task);
                return 1;
        }
@@ -2000,6 +2003,7 @@ static int ehea_start_xmit(struct sk_buff *skb, struct net_device *dev)
        }
        ehea_post_swqe(pr->qp, swqe);
+        pr->tx_packets++;
        if (unlikely(atomic_read(&pr->swqe_avail) <= 1)) {
                spin_lock_irqsave(&pr->netif_queue, flags);
diff --git a/drivers/net/ehea/ehea_qmr.h b/drivers/net/ehea/ehea_qmr.h
index 562de0ebdd85..bc62d389c166 100644
--- a/drivers/net/ehea/ehea_qmr.h
+++ b/drivers/net/ehea/ehea_qmr.h
@@ -145,8 +145,8 @@ struct ehea_rwqe {
 #define EHEA_CQE_VLAN_TAG_XTRACT   0x0400
 #define EHEA_CQE_TYPE_RQ           0x60
-#define EHEA_CQE_STAT_ERR_MASK     0x720F
+#define EHEA_CQE_STAT_ERR_MASK     0x700F
-#define EHEA_CQE_STAT_FAT_ERR_MASK 0x1F
+#define EHEA_CQE_STAT_FAT_ERR_MASK 0xF
 #define EHEA_CQE_STAT_ERR_TCP      0x4000
 #define EHEA_CQE_STAT_ERR_IP       0x2000
 #define EHEA_CQE_STAT_ERR_CRC      0x1000
diff --git a/drivers/net/epic100.c b/drivers/net/epic100.c
index ecdd3fc8d70c..0b365b8d947b 100644
--- a/drivers/net/epic100.c
+++ b/drivers/net/epic100.c
@@ -1273,7 +1273,7 @@ rx_action:
        epic_rx_err(dev, ep);
-        if (netif_running(dev) && (work_done < budget)) {
+        if (work_done < budget) {
                unsigned long flags;
                int more;
diff --git a/drivers/net/fec_8xx/fec_main.c b/drivers/net/fec_8xx/fec_main.c
index 8d2904fa5789..ab9637ab3a8d 100644
--- a/drivers/net/fec_8xx/fec_main.c
+++ b/drivers/net/fec_8xx/fec_main.c
@@ -476,11 +476,6 @@ static int fec_enet_rx_common(struct fec_enet_private *ep,
        __u16 pkt_len, sc;
        int curidx;
-        if (fpi->use_napi) {
-                if (!netif_running(dev))
-                        return 0;
-        }
        /*
         * First, grab all of the stats for the incoming packet.
         * These get messed up if we get called due to a busy condition.
diff --git a/drivers/net/fec_mpc52xx.c b/drivers/net/fec_mpc52xx.c
index a8a0ee220da6..f91ee700e605 100644
--- a/drivers/net/fec_mpc52xx.c
+++ b/drivers/net/fec_mpc52xx.c
@@ -422,7 +422,7 @@ static irqreturn_t mpc52xx_fec_rx_interrupt(int irq, void *dev_id)
                rskb = bcom_retrieve_buffer(priv->rx_dmatsk, &status,
                                (struct bcom_bd **)&bd);
-                dma_unmap_single(&dev->dev, bd->skb_pa, skb->len, DMA_FROM_DEVICE);
+                dma_unmap_single(&dev->dev, bd->skb_pa, rskb->len, DMA_FROM_DEVICE);
                /* Test for errors in received frame */
                if (status & BCOM_FEC_RX_BD_ERRORS) {
@@ -467,7 +467,7 @@ static irqreturn_t mpc52xx_fec_rx_interrupt(int irq, void *dev_id)
                        bcom_prepare_next_buffer(priv->rx_dmatsk);
                bd->status = FEC_RX_BUFFER_SIZE;
-                bd->skb_pa = dma_map_single(&dev->dev, rskb->data,
+                bd->skb_pa = dma_map_single(&dev->dev, skb->data,
                                FEC_RX_BUFFER_SIZE, DMA_FROM_DEVICE);
                bcom_submit_next_buffer(priv->rx_dmatsk, skb);
@@ -568,8 +568,9 @@ static void mpc52xx_fec_reset_stats(struct net_device *dev)
        struct mpc52xx_fec __iomem *fec = priv->fec;
        out_be32(&fec->mib_control, FEC_MIB_DISABLE);
-        memset_io(&fec->rmon_t_drop, 0, (__force u32)&fec->reserved10 -
+        memset_io(&fec->rmon_t_drop, 0,
-                        (__force u32)&fec->rmon_t_drop);
+                   offsetof(struct mpc52xx_fec, reserved10) -
+                   offsetof(struct mpc52xx_fec, rmon_t_drop));
        out_be32(&fec->mib_control, 0);
        memset(&dev->stats, 0, sizeof(dev->stats));
@@ -971,6 +972,8 @@ mpc52xx_fec_probe(struct of_device *op, const struct of_device_id *match)
        mpc52xx_fec_reset_stats(ndev);
+        SET_NETDEV_DEV(ndev, &op->dev);
        /* Register the new network device */
        rv = register_netdev(ndev);
        if (rv < 0)
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index 92ce2e38f0d5..f84c752997a4 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -5199,10 +5199,6 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i
                dev->dev_addr[3] = (np->orig_mac[0] >> 16) & 0xff;
                dev->dev_addr[4] = (np->orig_mac[0] >>  8) & 0xff;
                dev->dev_addr[5] = (np->orig_mac[0] >>  0) & 0xff;
-                /* set permanent address to be correct aswell */
-                np->orig_mac[0] = (dev->dev_addr[0] << 0) + (dev->dev_addr[1] << 8) +
-                        (dev->dev_addr[2] << 16) + (dev->dev_addr[3] << 24);
-                np->orig_mac[1] = (dev->dev_addr[4] << 0) + (dev->dev_addr[5] << 8);
                writel(txreg|NVREG_TRANSMITPOLL_MAC_ADDR_REV, base + NvRegTransmitPoll);
        }
        memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
@@ -5286,19 +5282,15 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i
                if (readl(base + NvRegTransmitterControl) & NVREG_XMITCTL_SYNC_PHY_INIT) {
                        np->mac_in_use = readl(base + NvRegTransmitterControl) & NVREG_XMITCTL_MGMT_ST;
                        dprintk(KERN_INFO "%s: mgmt unit is running. mac in use %x.\n", pci_name(pci_dev), np->mac_in_use);
-                        for (i = 0; i < 5000; i++) {
+                        if (nv_mgmt_acquire_sema(dev)) {
-                                msleep(1);
+                                /* management unit setup the phy already? */
-                                if (nv_mgmt_acquire_sema(dev)) {
+                                if ((readl(base + NvRegTransmitterControl) & NVREG_XMITCTL_SYNC_MASK) ==
-                                        /* management unit setup the phy already? */
+                                    NVREG_XMITCTL_SYNC_PHY_INIT) {
-                                        if ((readl(base + NvRegTransmitterControl) & NVREG_XMITCTL_SYNC_MASK) ==
+                                        /* phy is inited by mgmt unit */
-                                            NVREG_XMITCTL_SYNC_PHY_INIT) {
+                                        phyinitialized = 1;
-                                                /* phy is inited by mgmt unit */
+                                        dprintk(KERN_INFO "%s: Phy already initialized by mgmt unit.\n", pci_name(pci_dev));
-                                                phyinitialized = 1;
+                                } else {
-                                                dprintk(KERN_INFO "%s: Phy already initialized by mgmt unit.\n", pci_name(pci_dev));
+                                        /* we need to init the phy */
-                                        } else {
-                                                /* we need to init the phy */
-                                        }
-                                        break;
                                }
                        }
                }
@@ -5418,6 +5410,8 @@ static void __devexit nv_remove(struct pci_dev *pci_dev)
         */
        writel(np->orig_mac[0], base + NvRegMacAddrA);
        writel(np->orig_mac[1], base + NvRegMacAddrB);
+        writel(readl(base + NvRegTransmitPoll) & ~NVREG_TRANSMITPOLL_MAC_ADDR_REV,
+               base + NvRegTransmitPoll);
        /* free all structures */
        free_rings(dev);
@@ -5613,6 +5607,22 @@ static struct pci_device_id pci_tbl[] = {
                PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_35),
                .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT,
        },
+        {       /* MCP79 Ethernet Controller */
+                PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_36),
+                .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT,
+        },
+        {       /* MCP79 Ethernet Controller */
+                PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_37),
+                .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT,
+        },
+        {       /* MCP79 Ethernet Controller */
+                PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_38),
+                .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT,
+        },
+        {       /* MCP79 Ethernet Controller */
+                PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_39),
+                .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT,
+        },
        {0,},
 };
diff --git a/drivers/net/fs_enet/fs_enet-main.c b/drivers/net/fs_enet/fs_enet-main.c
index f2a4d399a6e5..c83bd6560088 100644
--- a/drivers/net/fs_enet/fs_enet-main.c
+++ b/drivers/net/fs_enet/fs_enet-main.c
@@ -96,9 +96,6 @@ static int fs_enet_rx_napi(struct napi_struct *napi, int budget)
        u16 pkt_len, sc;
        int curidx;
-        if (!netif_running(dev))
-                return 0;
        /*
         * First, grab all of the stats for the incoming packet.
         * These get messed up if we get called due to a busy condition.
@@ -897,14 +894,21 @@ static void fs_get_regs(struct net_device *dev, struct ethtool_regs *regs,
 static int fs_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 {
        struct fs_enet_private *fep = netdev_priv(dev);
+        if (!fep->phydev)
+                return -ENODEV;
        return phy_ethtool_gset(fep->phydev, cmd);
 }
 static int fs_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 {
        struct fs_enet_private *fep = netdev_priv(dev);
-        phy_ethtool_sset(fep->phydev, cmd);
-        return 0;
+        if (!fep->phydev)
+                return -ENODEV;
+        return phy_ethtool_sset(fep->phydev, cmd);
 }
 static int fs_nway_reset(struct net_device *dev)
diff --git a/drivers/net/fs_enet/mac-scc.c b/drivers/net/fs_enet/mac-scc.c
index 03134f47a4eb..48f2f3005935 100644
--- a/drivers/net/fs_enet/mac-scc.c
+++ b/drivers/net/fs_enet/mac-scc.c
@@ -158,7 +158,7 @@ static int setup_data(struct net_device *dev)
 {
        struct fs_enet_private *fep = netdev_priv(dev);
-#ifdef CONFIG_PPC_CPM_NEW_BINDING
+#ifndef CONFIG_PPC_CPM_NEW_BINDING
        struct fs_platform_info *fpi = fep->fpi;
        fep->scc.idx = fs_get_scc_index(fpi->fs_no);
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index 38268d7335a8..0431e9ed0fac 100644
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@ -696,7 +696,7 @@ int startup_gfar(struct net_device *dev)
 {
        struct txbd8 *txbdp;
        struct rxbd8 *rxbdp;
-        dma_addr_t addr;
+        dma_addr_t addr = 0;
        unsigned long vaddr;
        int i;
        struct gfar_private *priv = netdev_priv(dev);
diff --git a/drivers/net/hamachi.c b/drivers/net/hamachi.c
index ed407c85708f..b53f6b6491b3 100644
--- a/drivers/net/hamachi.c
+++ b/drivers/net/hamachi.c
@@ -204,8 +204,10 @@ KERN_INFO "   Further modifications by Keith Underwood <keithu@parl.clemson.edu>
 /* Condensed bus+endian portability operations. */
 #if ADDRLEN == 64
 #define cpu_to_leXX(addr)       cpu_to_le64(addr)
+#define leXX_to_cpu(addr)       le64_to_cpu(addr)
 #else
 #define cpu_to_leXX(addr)       cpu_to_le32(addr)
+#define leXX_to_cpu(addr)       le32_to_cpu(addr)
 #endif
@@ -465,12 +467,12 @@ enum intr_status_bits {
 /* The Hamachi Rx and Tx buffer descriptors. */
 struct hamachi_desc {
-        u32 status_n_length;
+        __le32 status_n_length;
 #if ADDRLEN == 64
        u32 pad;
-        u64 addr;
+        __le64 addr;
 #else
-        u32 addr;
+        __le32 addr;
 #endif
 };
@@ -874,13 +876,13 @@ static int hamachi_open(struct net_device *dev)
 #if ADDRLEN == 64
        /* writellll anyone ? */
-        writel(cpu_to_le64(hmp->rx_ring_dma), ioaddr + RxPtr);
+        writel(hmp->rx_ring_dma, ioaddr + RxPtr);
-        writel(cpu_to_le64(hmp->rx_ring_dma) >> 32, ioaddr + RxPtr + 4);
+        writel(hmp->rx_ring_dma >> 32, ioaddr + RxPtr + 4);
-        writel(cpu_to_le64(hmp->tx_ring_dma), ioaddr + TxPtr);
+        writel(hmp->tx_ring_dma, ioaddr + TxPtr);
-        writel(cpu_to_le64(hmp->tx_ring_dma) >> 32, ioaddr + TxPtr + 4);
+        writel(hmp->tx_ring_dma >> 32, ioaddr + TxPtr + 4);
 #else
-        writel(cpu_to_le32(hmp->rx_ring_dma), ioaddr + RxPtr);
+        writel(hmp->rx_ring_dma, ioaddr + RxPtr);
-        writel(cpu_to_le32(hmp->tx_ring_dma), ioaddr + TxPtr);
+        writel(hmp->tx_ring_dma, ioaddr + TxPtr);
 #endif
        /* TODO:  It would make sense to organize this as words since the card
@@ -1019,8 +1021,8 @@ static inline int hamachi_tx(struct net_device *dev)
                skb = hmp->tx_skbuff[entry];
                if (skb) {
                        pci_unmap_single(hmp->pci_dev,
-                                hmp->tx_ring[entry].addr, skb->len,
+                                leXX_to_cpu(hmp->tx_ring[entry].addr),
-                                PCI_DMA_TODEVICE);
+                                skb->len, PCI_DMA_TODEVICE);
                        dev_kfree_skb(skb);
                        hmp->tx_skbuff[entry] = NULL;
                }
@@ -1071,10 +1073,10 @@ static void hamachi_tx_timeout(struct net_device *dev)
        {
                printk(KERN_DEBUG "  Rx ring %p: ", hmp->rx_ring);
                for (i = 0; i < RX_RING_SIZE; i++)
-                        printk(" %8.8x", (unsigned int)hmp->rx_ring[i].status_n_length);
+                        printk(" %8.8x", le32_to_cpu(hmp->rx_ring[i].status_n_length));
                printk("\n"KERN_DEBUG"  Tx ring %p: ", hmp->tx_ring);
                for (i = 0; i < TX_RING_SIZE; i++)
-                        printk(" %4.4x", hmp->tx_ring[i].status_n_length);
+                        printk(" %4.4x", le32_to_cpu(hmp->tx_ring[i].status_n_length));
                printk("\n");
        }
@@ -1099,14 +1101,15 @@ static void hamachi_tx_timeout(struct net_device *dev)
                struct sk_buff *skb;
                if (i >= TX_RING_SIZE - 1)
-                        hmp->tx_ring[i].status_n_length = cpu_to_le32(
+                        hmp->tx_ring[i].status_n_length =
-                                DescEndRing |
+                                cpu_to_le32(DescEndRing) |
-                                (hmp->tx_ring[i].status_n_length & 0x0000FFFF));
+                                (hmp->tx_ring[i].status_n_length &
+                                 cpu_to_le32(0x0000ffff));
                else
-                        hmp->tx_ring[i].status_n_length &= 0x0000ffff;
+                        hmp->tx_ring[i].status_n_length &= cpu_to_le32(0x0000ffff);
                skb = hmp->tx_skbuff[i];
                if (skb){
-                        pci_unmap_single(hmp->pci_dev, hmp->tx_ring[i].addr,
+                        pci_unmap_single(hmp->pci_dev, leXX_to_cpu(hmp->tx_ring[i].addr),
                                skb->len, PCI_DMA_TODEVICE);
                        dev_kfree_skb(skb);
                        hmp->tx_skbuff[i] = NULL;
@@ -1128,7 +1131,8 @@ static void hamachi_tx_timeout(struct net_device *dev)
                struct sk_buff *skb = hmp->rx_skbuff[i];
                if (skb){
-                        pci_unmap_single(hmp->pci_dev, hmp->rx_ring[i].addr,
+                        pci_unmap_single(hmp->pci_dev,
+                                leXX_to_cpu(hmp->rx_ring[i].addr),
                                hmp->rx_buf_sz, PCI_DMA_FROMDEVICE);
                        dev_kfree_skb(skb);
                        hmp->rx_skbuff[i] = NULL;
@@ -1420,7 +1424,7 @@ static irqreturn_t hamachi_interrupt(int irq, void *dev_instance)
                                        /* Free the original skb. */
                                        if (skb){
                                                pci_unmap_single(hmp->pci_dev,
-                                                        hmp->tx_ring[entry].addr,
+                                                        leXX_to_cpu(hmp->tx_ring[entry].addr),
                                                        skb->len,
                                                        PCI_DMA_TODEVICE);
                                                dev_kfree_skb_irq(skb);
@@ -1500,11 +1504,11 @@ static int hamachi_rx(struct net_device *dev)
                if (desc_status & DescOwn)
                        break;
                pci_dma_sync_single_for_cpu(hmp->pci_dev,
-                                            desc->addr,
+                                            leXX_to_cpu(desc->addr),
                                            hmp->rx_buf_sz,
                                            PCI_DMA_FROMDEVICE);
                buf_addr = (u8 *) hmp->rx_skbuff[entry]->data;
-                frame_status = le32_to_cpu(get_unaligned((s32*)&(buf_addr[data_size - 12])));
+                frame_status = le32_to_cpu(get_unaligned((__le32*)&(buf_addr[data_size - 12])));
                if (hamachi_debug > 4)
                        printk(KERN_DEBUG "  hamachi_rx() status was %8.8x.\n",
                                frame_status);
@@ -1518,9 +1522,9 @@ static int hamachi_rx(struct net_device *dev)
                                   dev->name, desc, &hmp->rx_ring[hmp->cur_rx % RX_RING_SIZE]);
                        printk(KERN_WARNING "%s: Oversized Ethernet frame -- next status %x/%x last status %x.\n",
                                   dev->name,
-                                   hmp->rx_ring[(hmp->cur_rx+1) % RX_RING_SIZE].status_n_length & 0xffff0000,
+                                   le32_to_cpu(hmp->rx_ring[(hmp->cur_rx+1) % RX_RING_SIZE].status_n_length) & 0xffff0000,
-                                   hmp->rx_ring[(hmp->cur_rx+1) % RX_RING_SIZE].status_n_length & 0x0000ffff,
+                                   le32_to_cpu(hmp->rx_ring[(hmp->cur_rx+1) % RX_RING_SIZE].status_n_length) & 0x0000ffff,
-                                   hmp->rx_ring[(hmp->cur_rx-1) % RX_RING_SIZE].status_n_length);
+                                   le32_to_cpu(hmp->rx_ring[(hmp->cur_rx-1) % RX_RING_SIZE].status_n_length));
                        hmp->stats.rx_length_errors++;
                } /* else  Omit for prototype errata??? */
                if (frame_status & 0x00380000) {
@@ -1566,7 +1570,7 @@ static int hamachi_rx(struct net_device *dev)
 #endif
                                skb_reserve(skb, 2);    /* 16 byte align the IP header */
                                pci_dma_sync_single_for_cpu(hmp->pci_dev,
-                                                            hmp->rx_ring[entry].addr,
+                                                            leXX_to_cpu(hmp->rx_ring[entry].addr),
                                                            hmp->rx_buf_sz,
                                                            PCI_DMA_FROMDEVICE);
                                /* Call copy + cksum if available. */
@@ -1579,12 +1583,12 @@ static int hamachi_rx(struct net_device *dev)
                                        + entry*sizeof(*desc), pkt_len);
 #endif
                                pci_dma_sync_single_for_device(hmp->pci_dev,
-                                                               hmp->rx_ring[entry].addr,
+                                                               leXX_to_cpu(hmp->rx_ring[entry].addr),
                                                               hmp->rx_buf_sz,
                                                               PCI_DMA_FROMDEVICE);
                        } else {
                                pci_unmap_single(hmp->pci_dev,
-                                                 hmp->rx_ring[entry].addr,
+                                                 leXX_to_cpu(hmp->rx_ring[entry].addr),
                                                 hmp->rx_buf_sz, PCI_DMA_FROMDEVICE);
                                skb_put(skb = hmp->rx_skbuff[entry], pkt_len);
                                hmp->rx_skbuff[entry] = NULL;
@@ -1787,21 +1791,21 @@ static int hamachi_close(struct net_device *dev)
        for (i = 0; i < RX_RING_SIZE; i++) {
                skb = hmp->rx_skbuff[i];
                hmp->rx_ring[i].status_n_length = 0;
-                hmp->rx_ring[i].addr = 0xBADF00D0; /* An invalid address. */
                if (skb) {
                        pci_unmap_single(hmp->pci_dev,
-                                hmp->rx_ring[i].addr, hmp->rx_buf_sz,
+                                leXX_to_cpu(hmp->rx_ring[i].addr),
-                                PCI_DMA_FROMDEVICE);
+                                hmp->rx_buf_sz, PCI_DMA_FROMDEVICE);
                        dev_kfree_skb(skb);
                        hmp->rx_skbuff[i] = NULL;
                }
+                hmp->rx_ring[i].addr = cpu_to_leXX(0xBADF00D0); /* An invalid address. */
        }
        for (i = 0; i < TX_RING_SIZE; i++) {
                skb = hmp->tx_skbuff[i];
                if (skb) {
                        pci_unmap_single(hmp->pci_dev,
-                                hmp->tx_ring[i].addr, skb->len,
+                                leXX_to_cpu(hmp->tx_ring[i].addr),
-                                PCI_DMA_TODEVICE);
+                                skb->len, PCI_DMA_TODEVICE);
                        dev_kfree_skb(skb);
                        hmp->tx_skbuff[i] = NULL;
                }
diff --git a/drivers/net/ibm_newemac/core.c b/drivers/net/ibm_newemac/core.c
index 0de3aa2a2e44..cb06280dced5 100644
--- a/drivers/net/ibm_newemac/core.c
+++ b/drivers/net/ibm_newemac/core.c
@@ -3,6 +3,11 @@
 *
 * Driver for PowerPC 4xx on-chip ethernet controller.
 *
+ * Copyright 2007 Benjamin Herrenschmidt, IBM Corp.
+ *                <benh@kernel.crashing.org>
+ *
+ * Based on the arch/ppc version of the driver:
+ *
 * Copyright (c) 2004, 2005 Zultys Technologies.
 * Eugene Surovegin <eugene.surovegin@zultys.com> or <ebs@ebshome.net>
 *
@@ -402,7 +407,7 @@ static u32 __emac_calc_base_mr1(struct emac_instance *dev, int tx_size, int rx_s
 static u32 __emac4_calc_base_mr1(struct emac_instance *dev, int tx_size, int rx_size)
 {
        u32 ret = EMAC_MR1_VLE | EMAC_MR1_IST | EMAC4_MR1_TR |
-                EMAC4_MR1_OBCI(dev->opb_bus_freq);
+                EMAC4_MR1_OBCI(dev->opb_bus_freq / 1000000);
        DBG2(dev, "__emac4_calc_base_mr1" NL);
@@ -464,26 +469,34 @@ static int emac_configure(struct emac_instance *dev)
 {
        struct emac_regs __iomem *p = dev->emacp;
        struct net_device *ndev = dev->ndev;
-        int tx_size, rx_size;
+        int tx_size, rx_size, link = netif_carrier_ok(dev->ndev);
        u32 r, mr1 = 0;
        DBG(dev, "configure" NL);
-        if (emac_reset(dev) < 0)
+        if (!link) {
+                out_be32(&p->mr1, in_be32(&p->mr1)
+                         | EMAC_MR1_FDE | EMAC_MR1_ILE);
+                udelay(100);
+        } else if (emac_reset(dev) < 0)
                return -ETIMEDOUT;
        if (emac_has_feature(dev, EMAC_FTR_HAS_TAH))
                tah_reset(dev->tah_dev);
-        DBG(dev, " duplex = %d, pause = %d, asym_pause = %d\n",
+        DBG(dev, " link = %d duplex = %d, pause = %d, asym_pause = %d\n",
-            dev->phy.duplex, dev->phy.pause, dev->phy.asym_pause);
+            link, dev->phy.duplex, dev->phy.pause, dev->phy.asym_pause);
        /* Default fifo sizes */
        tx_size = dev->tx_fifo_size;
        rx_size = dev->rx_fifo_size;
+        /* No link, force loopback */
+        if (!link)
+                mr1 = EMAC_MR1_FDE | EMAC_MR1_ILE;
        /* Check for full duplex */
-        if (dev->phy.duplex == DUPLEX_FULL)
+        else if (dev->phy.duplex == DUPLEX_FULL)
                mr1 |= EMAC_MR1_FDE | EMAC_MR1_MWSW_001;
        /* Adjust fifo sizes, mr1 and timeouts based on link speed */
@@ -642,9 +655,11 @@ static void emac_reset_work(struct work_struct *work)
        DBG(dev, "reset_work" NL);
        mutex_lock(&dev->link_lock);
-        emac_netif_stop(dev);
+        if (dev->opened) {
-        emac_full_tx_reset(dev);
+                emac_netif_stop(dev);
-        emac_netif_start(dev);
+                emac_full_tx_reset(dev);
+                emac_netif_start(dev);
+        }
        mutex_unlock(&dev->link_lock);
 }
@@ -701,7 +716,7 @@ static int __emac_mdio_read(struct emac_instance *dev, u8 id, u8 reg)
                r = EMAC_STACR_BASE(dev->opb_bus_freq);
        if (emac_has_feature(dev, EMAC_FTR_STACR_OC_INVERT))
                r |= EMAC_STACR_OC;
-        if (emac_has_feature(dev, EMAC_FTR_HAS_AXON_STACR))
+        if (emac_has_feature(dev, EMAC_FTR_HAS_NEW_STACR))
                r |= EMACX_STACR_STAC_READ;
        else
                r |= EMAC_STACR_STAC_READ;
@@ -773,7 +788,7 @@ static void __emac_mdio_write(struct emac_instance *dev, u8 id, u8 reg,
                r = EMAC_STACR_BASE(dev->opb_bus_freq);
        if (emac_has_feature(dev, EMAC_FTR_STACR_OC_INVERT))
                r |= EMAC_STACR_OC;
-        if (emac_has_feature(dev, EMAC_FTR_HAS_AXON_STACR))
+        if (emac_has_feature(dev, EMAC_FTR_HAS_NEW_STACR))
                r |= EMACX_STACR_STAC_WRITE;
        else
                r |= EMAC_STACR_STAC_WRITE;
@@ -1063,10 +1078,9 @@ static int emac_open(struct net_device *ndev)
        dev->rx_sg_skb = NULL;
        mutex_lock(&dev->link_lock);
+        dev->opened = 1;
-        /* XXX Start PHY polling now. Shouldn't wr do like sungem instead and
+        /* Start PHY polling now.
-         * always poll the PHY even when the iface is down ? That would allow
-         * things like laptop-net to work. --BenH
         */
        if (dev->phy.address >= 0) {
                int link_poll_interval;
@@ -1145,9 +1159,11 @@ static void emac_link_timer(struct work_struct *work)
        int link_poll_interval;
        mutex_lock(&dev->link_lock);
        DBG2(dev, "link timer" NL);
+        if (!dev->opened)
+                goto bail;
        if (dev->phy.def->ops->poll_link(&dev->phy)) {
                if (!netif_carrier_ok(dev->ndev)) {
                        /* Get new link parameters */
@@ -1162,21 +1178,22 @@ static void emac_link_timer(struct work_struct *work)
                link_poll_interval = PHY_POLL_LINK_ON;
        } else {
                if (netif_carrier_ok(dev->ndev)) {
-                        emac_reinitialize(dev);
                        netif_carrier_off(dev->ndev);
                        netif_tx_disable(dev->ndev);
+                        emac_reinitialize(dev);
                        emac_print_link_status(dev);
                }
                link_poll_interval = PHY_POLL_LINK_OFF;
        }
        schedule_delayed_work(&dev->link_work, link_poll_interval);
+ bail:
        mutex_unlock(&dev->link_lock);
 }
 static void emac_force_link_update(struct emac_instance *dev)
 {
        netif_carrier_off(dev->ndev);
+        smp_rmb();
        if (dev->link_polling) {
                cancel_rearming_delayed_work(&dev->link_work);
                if (dev->link_polling)
@@ -1191,11 +1208,14 @@ static int emac_close(struct net_device *ndev)
        DBG(dev, "close" NL);
-        if (dev->phy.address >= 0)
+        if (dev->phy.address >= 0) {
+                dev->link_polling = 0;
                cancel_rearming_delayed_work(&dev->link_work);
+        }
+        mutex_lock(&dev->link_lock);
        emac_netif_stop(dev);
-        flush_scheduled_work();
+        dev->opened = 0;
+        mutex_unlock(&dev->link_lock);
        emac_rx_disable(dev);
        emac_tx_disable(dev);
@@ -2427,7 +2447,7 @@ static int __devinit emac_init_config(struct emac_instance *dev)
        if (emac_read_uint_prop(np, "tah-device", &dev->tah_ph, 0))
                dev->tah_ph = 0;
        if (emac_read_uint_prop(np, "tah-channel", &dev->tah_port, 0))
-                dev->tah_ph = 0;
+                dev->tah_port = 0;
        if (emac_read_uint_prop(np, "mdio-device", &dev->mdio_ph, 0))
                dev->mdio_ph = 0;
        if (emac_read_uint_prop(np, "zmii-device", &dev->zmii_ph, 0))
@@ -2465,16 +2485,19 @@ static int __devinit emac_init_config(struct emac_instance *dev)
        /* Check EMAC version */
        if (of_device_is_compatible(np, "ibm,emac4"))
                dev->features |= EMAC_FTR_EMAC4;
-        if (of_device_is_compatible(np, "ibm,emac-axon")
-            || of_device_is_compatible(np, "ibm,emac-440epx"))
+        /* Fixup some feature bits based on the device tree */
-                dev->features |= EMAC_FTR_HAS_AXON_STACR
+        if (of_get_property(np, "has-inverted-stacr-oc", NULL))
-                        | EMAC_FTR_STACR_OC_INVERT;
-        if (of_device_is_compatible(np, "ibm,emac-440spe"))
                dev->features |= EMAC_FTR_STACR_OC_INVERT;
+        if (of_get_property(np, "has-new-stacr-staopc", NULL))
+                dev->features |= EMAC_FTR_HAS_NEW_STACR;
-        /* Fixup some feature bits based on the device tree and verify
+        /* CAB lacks the appropriate properties */
-         * we have support for them compiled in
+        if (of_device_is_compatible(np, "ibm,emac-axon"))
-         */
+                dev->features |= EMAC_FTR_HAS_NEW_STACR |
+                        EMAC_FTR_STACR_OC_INVERT;
+        /* Enable TAH/ZMII/RGMII features as found */
        if (dev->tah_ph != 0) {
 #ifdef CONFIG_IBM_NEW_EMAC_TAH
                dev->features |= EMAC_FTR_HAS_TAH;
@@ -2532,6 +2555,10 @@ static int __devinit emac_probe(struct of_device *ofdev,
        struct device_node **blist = NULL;
        int err, i;
+        /* Skip unused/unwired EMACS */
+        if (of_get_property(np, "unused", NULL))
+                return -ENODEV;
        /* Find ourselves in the bootlist if we are there */
        for (i = 0; i < EMAC_BOOT_LIST_SIZE; i++)
                if (emac_boot_list[i] == np)
@@ -2756,6 +2783,8 @@ static int __devexit emac_remove(struct of_device *ofdev)
        unregister_netdev(dev->ndev);
+        flush_scheduled_work();
        if (emac_has_feature(dev, EMAC_FTR_HAS_TAH))
                tah_detach(dev->tah_dev, dev->tah_port);
        if (emac_has_feature(dev, EMAC_FTR_HAS_RGMII))
diff --git a/drivers/net/ibm_newemac/core.h b/drivers/net/ibm_newemac/core.h
index 4011803117ca..4e74d8287c65 100644
--- a/drivers/net/ibm_newemac/core.h
+++ b/drivers/net/ibm_newemac/core.h
@@ -3,6 +3,11 @@
 *
 * Driver for PowerPC 4xx on-chip ethernet controller.
 *
+ * Copyright 2007 Benjamin Herrenschmidt, IBM Corp.
+ *                <benh@kernel.crashing.org>
+ *
+ * Based on the arch/ppc version of the driver:
+ *
 * Copyright (c) 2004, 2005 Zultys Technologies.
 * Eugene Surovegin <eugene.surovegin@zultys.com> or <ebs@ebshome.net>
 *
@@ -258,6 +263,7 @@ struct emac_instance {
        int                             stop_timeout;   /* in us */
        int                             no_mcast;
        int                             mcast_pending;
+        int                             opened;
        struct work_struct              reset_work;
        spinlock_t                      lock;
 };
@@ -292,9 +298,9 @@ struct emac_instance {
 */
 #define EMAC_FTR_HAS_RGMII              0x00000020
 /*
- * Set if we have axon-type STACR
+ * Set if we have new type STACR with STAOPC
 */
-#define EMAC_FTR_HAS_AXON_STACR         0x00000040
+#define EMAC_FTR_HAS_NEW_STACR          0x00000040
 /* Right now, we don't quite handle the always/possible masks on the
@@ -306,7 +312,7 @@ enum {
        EMAC_FTRS_POSSIBLE      =
 #ifdef CONFIG_IBM_NEW_EMAC_EMAC4
-            EMAC_FTR_EMAC4      | EMAC_FTR_HAS_AXON_STACR       |
+            EMAC_FTR_EMAC4      | EMAC_FTR_HAS_NEW_STACR        |
            EMAC_FTR_STACR_OC_INVERT    |
 #endif
 #ifdef CONFIG_IBM_NEW_EMAC_TAH
diff --git a/drivers/net/ibm_newemac/debug.c b/drivers/net/ibm_newemac/debug.c
index 170524ee0f19..86b756a30784 100644
--- a/drivers/net/ibm_newemac/debug.c
+++ b/drivers/net/ibm_newemac/debug.c
@@ -3,6 +3,11 @@
 *
 * Driver for PowerPC 4xx on-chip ethernet controller, debug print routines.
 *
+ * Copyright 2007 Benjamin Herrenschmidt, IBM Corp.
+ *                <benh@kernel.crashing.org>
+ *
+ * Based on the arch/ppc version of the driver:
+ *
 * Copyright (c) 2004, 2005 Zultys Technologies
 * Eugene Surovegin <eugene.surovegin@zultys.com> or <ebs@ebshome.net>
 *
@@ -21,7 +26,7 @@
 #include "core.h"
-static spinlock_t emac_dbg_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(emac_dbg_lock);
 static void emac_desc_dump(struct emac_instance *p)
 {
diff --git a/drivers/net/ibm_newemac/debug.h b/drivers/net/ibm_newemac/debug.h
index 1dd2dcbc157f..b631842ec8d0 100644
--- a/drivers/net/ibm_newemac/debug.h
+++ b/drivers/net/ibm_newemac/debug.h
@@ -3,6 +3,11 @@
 *
 * Driver for PowerPC 4xx on-chip ethernet controller, debug print routines.
 *
+ * Copyright 2007 Benjamin Herrenschmidt, IBM Corp.
+ *                <benh@kernel.crashing.org>
+ *
+ * Based on the arch/ppc version of the driver:
+ *
 * Copyright (c) 2004, 2005 Zultys Technologies
 * Eugene Surovegin <eugene.surovegin@zultys.com> or <ebs@ebshome.net>
 *
diff --git a/drivers/net/ibm_newemac/emac.h b/drivers/net/ibm_newemac/emac.h
index bef92efeeadc..91cb096ab405 100644
--- a/drivers/net/ibm_newemac/emac.h
+++ b/drivers/net/ibm_newemac/emac.h
@@ -3,6 +3,11 @@
 *
 * Register definitions for PowerPC 4xx on-chip ethernet contoller
 *
+ * Copyright 2007 Benjamin Herrenschmidt, IBM Corp.
+ *                <benh@kernel.crashing.org>
+ *
+ * Based on the arch/ppc version of the driver:
+ *
 * Copyright (c) 2004, 2005 Zultys Technologies.
 * Eugene Surovegin <eugene.surovegin@zultys.com> or <ebs@ebshome.net>
 *
diff --git a/drivers/net/ibm_newemac/mal.c b/drivers/net/ibm_newemac/mal.c
index 9a88f71db004..6869f08c9dcb 100644
--- a/drivers/net/ibm_newemac/mal.c
+++ b/drivers/net/ibm_newemac/mal.c
@@ -3,6 +3,11 @@
 *
 * Memory Access Layer (MAL) support
 *
+ * Copyright 2007 Benjamin Herrenschmidt, IBM Corp.
+ *                <benh@kernel.crashing.org>
+ *
+ * Based on the arch/ppc version of the driver:
+ *
 * Copyright (c) 2004, 2005 Zultys Technologies.
 * Eugene Surovegin <eugene.surovegin@zultys.com> or <ebs@ebshome.net>
 *
diff --git a/drivers/net/ibm_newemac/mal.h b/drivers/net/ibm_newemac/mal.h
index 784edb8ea822..eaa7262dc079 100644
--- a/drivers/net/ibm_newemac/mal.h
+++ b/drivers/net/ibm_newemac/mal.h
@@ -3,6 +3,11 @@
 *
 * Memory Access Layer (MAL) support
 *
+ * Copyright 2007 Benjamin Herrenschmidt, IBM Corp.
+ *                <benh@kernel.crashing.org>
+ *
+ * Based on the arch/ppc version of the driver:
+ *
 * Copyright (c) 2004, 2005 Zultys Technologies.
 * Eugene Surovegin <eugene.surovegin@zultys.com> or <ebs@ebshome.net>
 *
diff --git a/drivers/net/ibm_newemac/phy.c b/drivers/net/ibm_newemac/phy.c
index aa1f0ddf1e3e..37bfeea8788a 100644
--- a/drivers/net/ibm_newemac/phy.c
+++ b/drivers/net/ibm_newemac/phy.c
@@ -8,6 +8,11 @@
 * This file should be shared with other drivers or eventually
 * merged as the "low level" part of miilib
 *
+ * Copyright 2007 Benjamin Herrenschmidt, IBM Corp.
+ *                <benh@kernel.crashing.org>
+ *
+ * Based on the arch/ppc version of the driver:
+ *
 * (c) 2003, Benjamin Herrenscmidt (benh@kernel.crashing.org)
 * (c) 2004-2005, Eugene Surovegin <ebs@ebshome.net>
 *
@@ -306,8 +311,84 @@ static struct mii_phy_def cis8201_phy_def = {
        .ops            = &cis8201_phy_ops
 };
+static struct mii_phy_def bcm5248_phy_def = {
+        .phy_id         = 0x0143bc00,
+        .phy_id_mask    = 0x0ffffff0,
+        .name           = "BCM5248 10/100 SMII Ethernet",
+        .ops            = &generic_phy_ops
+};
+static int m88e1111_init(struct mii_phy *phy)
+{
+        pr_debug("%s: Marvell 88E1111 Ethernet\n", __FUNCTION__);
+        phy_write(phy, 0x14, 0x0ce3);
+        phy_write(phy, 0x18, 0x4101);
+        phy_write(phy, 0x09, 0x0e00);
+        phy_write(phy, 0x04, 0x01e1);
+        phy_write(phy, 0x00, 0x9140);
+        phy_write(phy, 0x00, 0x1140);
+        return  0;
+}
+static int et1011c_init(struct mii_phy *phy)
+{
+        u16 reg_short;
+        reg_short = (u16)(phy_read(phy, 0x16));
+        reg_short &= ~(0x7);
+        reg_short |= 0x6;       /* RGMII Trace Delay*/
+        phy_write(phy, 0x16, reg_short);
+        reg_short = (u16)(phy_read(phy, 0x17));
+        reg_short &= ~(0x40);
+        phy_write(phy, 0x17, reg_short);
+        phy_write(phy, 0x1c, 0x74f0);
+        return 0;
+}
+static struct mii_phy_ops et1011c_phy_ops = {
+        .init           = et1011c_init,
+        .setup_aneg     = genmii_setup_aneg,
+        .setup_forced   = genmii_setup_forced,
+        .poll_link      = genmii_poll_link,
+        .read_link      = genmii_read_link
+};
+static struct mii_phy_def et1011c_phy_def = {
+        .phy_id         = 0x0282f000,
+        .phy_id_mask    = 0x0fffff00,
+        .name           = "ET1011C Gigabit Ethernet",
+        .ops            = &et1011c_phy_ops
+};
+static struct mii_phy_ops m88e1111_phy_ops = {
+        .init           = m88e1111_init,
+        .setup_aneg     = genmii_setup_aneg,
+        .setup_forced   = genmii_setup_forced,
+        .poll_link      = genmii_poll_link,
+        .read_link      = genmii_read_link
+};
+static struct mii_phy_def m88e1111_phy_def = {
+        .phy_id         = 0x01410CC0,
+        .phy_id_mask    = 0x0ffffff0,
+        .name           = "Marvell 88E1111 Ethernet",
+        .ops            = &m88e1111_phy_ops,
+};
 static struct mii_phy_def *mii_phy_table[] = {
+        &et1011c_phy_def,
        &cis8201_phy_def,
+        &bcm5248_phy_def,
+        &m88e1111_phy_def,
        &genmii_phy_def,
        NULL
 };
diff --git a/drivers/net/ibm_newemac/phy.h b/drivers/net/ibm_newemac/phy.h
index 6feca26afedb..1b65c81f6557 100644
--- a/drivers/net/ibm_newemac/phy.h
+++ b/drivers/net/ibm_newemac/phy.h
@@ -3,6 +3,11 @@
 *
 * Driver for PowerPC 4xx on-chip ethernet controller, PHY support
 *
+ * Copyright 2007 Benjamin Herrenschmidt, IBM Corp.
+ *                <benh@kernel.crashing.org>
+ *
+ * Based on the arch/ppc version of the driver:
+ *
 * Benjamin Herrenschmidt <benh@kernel.crashing.org>
 * February 2003
 *
diff --git a/drivers/net/ibm_newemac/rgmii.c b/drivers/net/ibm_newemac/rgmii.c
index de416951a435..9bc1132fa788 100644
--- a/drivers/net/ibm_newemac/rgmii.c
+++ b/drivers/net/ibm_newemac/rgmii.c
@@ -3,6 +3,11 @@
 *
 * Driver for PowerPC 4xx on-chip ethernet controller, RGMII bridge support.
 *
+ * Copyright 2007 Benjamin Herrenschmidt, IBM Corp.
+ *                <benh@kernel.crashing.org>
+ *
+ * Based on the arch/ppc version of the driver:
+ *
 * Copyright (c) 2004, 2005 Zultys Technologies.
 * Eugene Surovegin <eugene.surovegin@zultys.com> or <ebs@ebshome.net>
 *
@@ -140,7 +145,7 @@ void rgmii_get_mdio(struct of_device *ofdev, int input)
        RGMII_DBG2(dev, "get_mdio(%d)" NL, input);
-        if (dev->type != RGMII_AXON)
+        if (!(dev->flags & EMAC_RGMII_FLAG_HAS_MDIO))
                return;
        mutex_lock(&dev->lock);
@@ -161,7 +166,7 @@ void rgmii_put_mdio(struct of_device *ofdev, int input)
        RGMII_DBG2(dev, "put_mdio(%d)" NL, input);
-        if (dev->type != RGMII_AXON)
+        if (!(dev->flags & EMAC_RGMII_FLAG_HAS_MDIO))
                return;
        fer = in_be32(&p->fer);
@@ -250,11 +255,13 @@ static int __devinit rgmii_probe(struct of_device *ofdev,
                goto err_free;
        }
-        /* Check for RGMII type */
+        /* Check for RGMII flags */
+        if (of_get_property(ofdev->node, "has-mdio", NULL))
+                dev->flags |= EMAC_RGMII_FLAG_HAS_MDIO;
+        /* CAB lacks the right properties, fix this up */
        if (of_device_is_compatible(ofdev->node, "ibm,rgmii-axon"))
-                dev->type = RGMII_AXON;
+                dev->flags |= EMAC_RGMII_FLAG_HAS_MDIO;
-        else
-                dev->type = RGMII_STANDARD;
        DBG2(dev, " Boot FER = 0x%08x, SSR = 0x%08x\n",
             in_be32(&dev->base->fer), in_be32(&dev->base->ssr));
@@ -263,9 +270,9 @@ static int __devinit rgmii_probe(struct of_device *ofdev,
        out_be32(&dev->base->fer, 0);
        printk(KERN_INFO
-               "RGMII %s %s initialized\n",
+               "RGMII %s initialized with%s MDIO support\n",
-               dev->type == RGMII_STANDARD ? "standard" : "axon",
+               ofdev->node->full_name,
-               ofdev->node->full_name);
+               (dev->flags & EMAC_RGMII_FLAG_HAS_MDIO) ? "" : "out");
        wmb();
        dev_set_drvdata(&ofdev->dev, dev);
diff --git a/drivers/net/ibm_newemac/rgmii.h b/drivers/net/ibm_newemac/rgmii.h
index 57806833121e..c4a4b358a270 100644
--- a/drivers/net/ibm_newemac/rgmii.h
+++ b/drivers/net/ibm_newemac/rgmii.h
@@ -3,6 +3,11 @@
 *
 * Driver for PowerPC 4xx on-chip ethernet controller, RGMII bridge support.
 *
+ * Copyright 2007 Benjamin Herrenschmidt, IBM Corp.
+ *                <benh@kernel.crashing.org>
+ *
+ * Based on the arch/ppc version of the driver:
+ *
 * Based on ocp_zmii.h/ibm_emac_zmii.h
 * Armin Kuster akuster@mvista.com
 *
@@ -35,8 +40,9 @@ struct rgmii_regs {
 struct rgmii_instance {
        struct rgmii_regs __iomem       *base;
-        /* Type of RGMII bridge */
+        /* RGMII bridge flags */
-        int                             type;
+        int                             flags;
+#define EMAC_RGMII_FLAG_HAS_MDIO        0x00000001
        /* Only one EMAC whacks us at a time */
        struct mutex                    lock;
diff --git a/drivers/net/ibm_newemac/tah.c b/drivers/net/ibm_newemac/tah.c
index f161fb100e8e..96417adec326 100644
--- a/drivers/net/ibm_newemac/tah.c
+++ b/drivers/net/ibm_newemac/tah.c
@@ -3,6 +3,11 @@
 *
 * Driver for PowerPC 4xx on-chip ethernet controller, TAH support.
 *
+ * Copyright 2007 Benjamin Herrenschmidt, IBM Corp.
+ *                <benh@kernel.crashing.org>
+ *
+ * Based on the arch/ppc version of the driver:
+ *
 * Copyright 2004 MontaVista Software, Inc.
 * Matt Porter <mporter@kernel.crashing.org>
 *
@@ -116,13 +121,14 @@ static int __devinit tah_probe(struct of_device *ofdev,
                goto err_free;
        }
+        dev_set_drvdata(&ofdev->dev, dev);
        /* Initialize TAH and enable IPv4 checksum verification, no TSO yet */
        tah_reset(ofdev);
        printk(KERN_INFO
               "TAH %s initialized\n", ofdev->node->full_name);
        wmb();
-        dev_set_drvdata(&ofdev->dev, dev);
        return 0;
diff --git a/drivers/net/ibm_newemac/tah.h b/drivers/net/ibm_newemac/tah.h
index bc41853b6e26..a068b5658dad 100644
--- a/drivers/net/ibm_newemac/tah.h
+++ b/drivers/net/ibm_newemac/tah.h
@@ -3,6 +3,11 @@
 *
 * Driver for PowerPC 4xx on-chip ethernet controller, TAH support.
 *
+ * Copyright 2007 Benjamin Herrenschmidt, IBM Corp.
+ *                <benh@kernel.crashing.org>
+ *
+ * Based on the arch/ppc version of the driver:
+ *
 * Copyright 2004 MontaVista Software, Inc.
 * Matt Porter <mporter@kernel.crashing.org>
 *
diff --git a/drivers/net/ibm_newemac/zmii.c b/drivers/net/ibm_newemac/zmii.c
index 2219ec2740e0..2ea472aeab06 100644
--- a/drivers/net/ibm_newemac/zmii.c
+++ b/drivers/net/ibm_newemac/zmii.c
@@ -3,6 +3,11 @@
 *
 * Driver for PowerPC 4xx on-chip ethernet controller, ZMII bridge support.
 *
+ * Copyright 2007 Benjamin Herrenschmidt, IBM Corp.
+ *                <benh@kernel.crashing.org>
+ *
+ * Based on the arch/ppc version of the driver:
+ *
 * Copyright (c) 2004, 2005 Zultys Technologies.
 * Eugene Surovegin <eugene.surovegin@zultys.com> or <ebs@ebshome.net>
 *
@@ -83,12 +88,14 @@ int __devinit zmii_attach(struct of_device *ofdev, int input, int *mode)
        ZMII_DBG(dev, "init(%d, %d)" NL, input, *mode);
-        if (!zmii_valid_mode(*mode))
+        if (!zmii_valid_mode(*mode)) {
                /* Probably an EMAC connected to RGMII,
                 * but it still may need ZMII for MDIO so
                 * we don't fail here.
                 */
+                dev->users++;
                return 0;
+        }
        mutex_lock(&dev->lock);
diff --git a/drivers/net/ibm_newemac/zmii.h b/drivers/net/ibm_newemac/zmii.h
index 82a9968b1f74..6c9beba0c4b6 100644
--- a/drivers/net/ibm_newemac/zmii.h
+++ b/drivers/net/ibm_newemac/zmii.h
@@ -3,6 +3,11 @@
 *
 * Driver for PowerPC 4xx on-chip ethernet controller, ZMII bridge support.
 *
+ * Copyright 2007 Benjamin Herrenschmidt, IBM Corp.
+ *                <benh@kernel.crashing.org>
+ *
+ * Based on the arch/ppc version of the driver:
+ *
 * Copyright (c) 2004, 2005 Zultys Technologies.
 * Eugene Surovegin <eugene.surovegin@zultys.com> or <ebs@ebshome.net>
 *
diff --git a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c
index 7d7758f3ad8c..57772bebff56 100644
--- a/drivers/net/ibmveth.c
+++ b/drivers/net/ibmveth.c
@@ -1179,13 +1179,15 @@ static int __devinit ibmveth_probe(struct vio_dev *dev, const struct vio_device_
        for(i = 0; i<IbmVethNumBufferPools; i++) {
                struct kobject *kobj = &adapter->rx_buff_pool[i].kobj;
+                int error;
                ibmveth_init_buffer_pool(&adapter->rx_buff_pool[i], i,
                                         pool_count[i], pool_size[i],
                                         pool_active[i]);
-                kobj->parent = &dev->dev.kobj;
+                error = kobject_init_and_add(kobj, &ktype_veth_pool,
-                kobject_set_name(kobj, "pool%d", i);
+                                             &dev->dev.kobj, "pool%d", i);
-                kobj->ktype = &ktype_veth_pool;
+                if (!error)
-                kobject_register(kobj);
+                        kobject_uevent(kobj, KOBJ_ADD);
        }
        ibmveth_debug_printk("adapter @ 0x%p\n", adapter);
@@ -1234,7 +1236,7 @@ static int __devexit ibmveth_remove(struct vio_dev *dev)
        int i;
        for(i = 0; i<IbmVethNumBufferPools; i++)
-                kobject_unregister(&adapter->rx_buff_pool[i].kobj);
+                kobject_put(&adapter->rx_buff_pool[i].kobj);
        unregister_netdev(netdev);
diff --git a/drivers/net/ipg.c b/drivers/net/ipg.c
index dbd23bb65d1e..50f0c17451b1 100644
--- a/drivers/net/ipg.c
+++ b/drivers/net/ipg.c
@@ -857,21 +857,14 @@ static void init_tfdlist(struct net_device *dev)
 static void ipg_nic_txfree(struct net_device *dev)
 {
        struct ipg_nic_private *sp = netdev_priv(dev);
-        void __iomem *ioaddr = sp->ioaddr;
+        unsigned int released, pending, dirty;
-        unsigned int curr;
-        u64 txd_map;
-        unsigned int released, pending;
-        txd_map = (u64)sp->txd_map;
-        curr = ipg_r32(TFD_LIST_PTR_0) -
-                do_div(txd_map, sizeof(struct ipg_tx)) - 1;
        IPG_DEBUG_MSG("_nic_txfree\n");
        pending = sp->tx_current - sp->tx_dirty;
+        dirty = sp->tx_dirty % IPG_TFDLIST_LENGTH;
        for (released = 0; released < pending; released++) {
-                unsigned int dirty = sp->tx_dirty % IPG_TFDLIST_LENGTH;
                struct sk_buff *skb = sp->TxBuff[dirty];
                struct ipg_tx *txfd = sp->txd + dirty;
@@ -882,11 +875,8 @@ static void ipg_nic_txfree(struct net_device *dev)
                 * If the TFDDone bit is set, free the associated
                 * buffer.
                 */
-                if (dirty == curr)
+                if (!(txfd->tfc & cpu_to_le64(IPG_TFC_TFDDONE)))
-                        break;
+                        break;
-                /* Setup TFDDONE for compatible issue. */
-                txfd->tfc |= cpu_to_le64(IPG_TFC_TFDDONE);
                /* Free the transmit buffer. */
                if (skb) {
@@ -898,6 +888,7 @@ static void ipg_nic_txfree(struct net_device *dev)
                        sp->TxBuff[dirty] = NULL;
                }
+                dirty = (dirty + 1) % IPG_TFDLIST_LENGTH;
        }
        sp->tx_dirty += released;
@@ -1630,6 +1621,8 @@ static irqreturn_t ipg_interrupt_handler(int irq, void *dev_inst)
 #ifdef JUMBO_FRAME
        ipg_nic_rxrestore(dev);
 #endif
+        spin_lock(&sp->lock);
        /* Get interrupt source information, and acknowledge
         * some (i.e. TxDMAComplete, RxDMAComplete, RxEarly,
         * IntRequested, MacControlFrame, LinkEvent) interrupts
@@ -1647,9 +1640,7 @@ static irqreturn_t ipg_interrupt_handler(int irq, void *dev_inst)
        handled = 1;
        if (unlikely(!netif_running(dev)))
-                goto out;
+                goto out_unlock;
-        spin_lock(&sp->lock);
        /* If RFDListEnd interrupt, restore all used RFDs. */
        if (status & IPG_IS_RFD_LIST_END) {
@@ -1733,9 +1724,9 @@ out_enable:
        ipg_w16(IPG_IE_TX_DMA_COMPLETE | IPG_IE_RX_DMA_COMPLETE |
                IPG_IE_HOST_ERROR | IPG_IE_INT_REQUESTED | IPG_IE_TX_COMPLETE |
                IPG_IE_LINK_EVENT | IPG_IE_UPDATE_STATS, INT_ENABLE);
+out_unlock:
        spin_unlock(&sp->lock);
-out:
        return IRQ_RETVAL(handled);
 }
@@ -1943,10 +1934,7 @@ static int ipg_nic_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
         */
        if (sp->tenmbpsmode)
                txfd->tfc |= cpu_to_le64(IPG_TFC_TXINDICATE);
-        else if (!((sp->tx_current - sp->tx_dirty + 1) >
+        txfd->tfc |= cpu_to_le64(IPG_TFC_TXDMAINDICATE);
-            IPG_FRAMESBETWEENTXDMACOMPLETES)) {
-                txfd->tfc |= cpu_to_le64(IPG_TFC_TXDMAINDICATE);
-        }
        /* Based on compilation option, determine if FCS is to be
         * appended to transmit frame by IPG.
         */
@@ -2003,7 +1991,7 @@ static int ipg_nic_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
        ipg_w32(IPG_DC_TX_DMA_POLL_NOW, DMA_CTRL);
        if (sp->tx_current == (sp->tx_dirty + IPG_TFDLIST_LENGTH))
-                netif_wake_queue(dev);
+                netif_stop_queue(dev);
        spin_unlock_irqrestore(&sp->lock, flags);
diff --git a/drivers/net/irda/irda-usb.c b/drivers/net/irda/irda-usb.c
index c6355c00fd7a..9081234ab458 100644
--- a/drivers/net/irda/irda-usb.c
+++ b/drivers/net/irda/irda-usb.c
@@ -1168,6 +1168,7 @@ static int stir421x_patch_device(struct irda_usb_cb *self)
 static int irda_usb_net_open(struct net_device *netdev)
 {
        struct irda_usb_cb *self;
+        unsigned long flags;
        char    hwname[16];
        int i;
        
@@ -1177,13 +1178,16 @@ static int irda_usb_net_open(struct net_device *netdev)
        self = (struct irda_usb_cb *) netdev->priv;
        IRDA_ASSERT(self != NULL, return -1;);
+        spin_lock_irqsave(&self->lock, flags);
        /* Can only open the device if it's there */
        if(!self->present) {
+                spin_unlock_irqrestore(&self->lock, flags);
                IRDA_WARNING("%s(), device not present!\n", __FUNCTION__);
                return -1;
        }
        if(self->needspatch) {
+                spin_unlock_irqrestore(&self->lock, flags);
                IRDA_WARNING("%s(), device needs patch\n", __FUNCTION__) ;
                return -EIO ;
        }
@@ -1198,6 +1202,7 @@ static int irda_usb_net_open(struct net_device *netdev)
        /* To do *before* submitting Rx urbs and starting net Tx queue
         * Jean II */
        self->netopen = 1;
+        spin_unlock_irqrestore(&self->lock, flags);
        /* 
         * Now that everything should be initialized properly,
diff --git a/drivers/net/irda/mcs7780.c b/drivers/net/irda/mcs7780.c
index 0b769192d4ce..93916cf33f29 100644
--- a/drivers/net/irda/mcs7780.c
+++ b/drivers/net/irda/mcs7780.c
@@ -677,6 +677,8 @@ static int mcs_net_close(struct net_device *netdev)
        /* Stop transmit processing */
        netif_stop_queue(netdev);
+        kfree_skb(mcs->rx_buff.skb);
        /* kill and free the receive and transmit URBs */
        usb_kill_urb(mcs->rx_urb);
        usb_free_urb(mcs->rx_urb);
diff --git a/drivers/net/irda/stir4200.c b/drivers/net/irda/stir4200.c
index 042bc2f0417d..e59c485bc497 100644
--- a/drivers/net/irda/stir4200.c
+++ b/drivers/net/irda/stir4200.c
@@ -142,9 +142,6 @@ enum StirCtrl2Mask {
 };
 enum StirFifoCtlMask {
-        FIFOCTL_EOF = 0x80,
-        FIFOCTL_UNDER = 0x40,
-        FIFOCTL_OVER = 0x20,
        FIFOCTL_DIR = 0x10,
        FIFOCTL_CLR = 0x08,
        FIFOCTL_EMPTY = 0x04,
@@ -594,9 +591,10 @@ static int fifo_txwait(struct stir_cb *stir, int space)
 {
        int err;
        unsigned long count, status;
+        unsigned long prev_count = 0x1fff;
        /* Read FIFO status and count */
-        for(;;) {
+        for (;; prev_count = count) {
                err = read_reg(stir, REG_FIFOCTL, stir->fifo_status, 
                                   FIFO_REGS_SIZE);
                if (unlikely(err != FIFO_REGS_SIZE)) {
@@ -629,6 +627,10 @@ static int fifo_txwait(struct stir_cb *stir, int space)
                if (space >= 0 && STIR_FIFO_SIZE - 4 > space + count)
                        return 0;
+                /* queue confused */
+                if (prev_count < count)
+                        break;
                /* estimate transfer time for remaining chars */
                msleep((count * 8000) / stir->speed);
        }
diff --git a/drivers/net/iseries_veth.c b/drivers/net/iseries_veth.c
index 97bd9dc2e52e..419861cbc65e 100644
--- a/drivers/net/iseries_veth.c
+++ b/drivers/net/iseries_veth.c
@@ -815,7 +815,7 @@ static int veth_init_connection(u8 rlp)
 {
        struct veth_lpar_connection *cnx;
        struct veth_msg *msgs;
-        int i, rc;
+        int i;
        if ( (rlp == this_lp)
             || ! HvLpConfig_doLpsCommunicateOnVirtualLan(this_lp, rlp) )
@@ -844,11 +844,7 @@ static int veth_init_connection(u8 rlp)
        /* This gets us 1 reference, which is held on behalf of the driver
         * infrastructure. It's released at module unload. */
-        kobject_init(&cnx->kobject);
+        kobject_init(&cnx->kobject, &veth_lpar_connection_ktype);
-        cnx->kobject.ktype = &veth_lpar_connection_ktype;
-        rc = kobject_set_name(&cnx->kobject, "cnx%.2d", rlp);
-        if (rc != 0)
-                return rc;
        msgs = kcalloc(VETH_NUMBUFFERS, sizeof(struct veth_msg), GFP_KERNEL);
        if (! msgs) {
@@ -1087,11 +1083,8 @@ static struct net_device * __init veth_probe_one(int vlan,
                return NULL;
        }
-        kobject_init(&port->kobject);
+        kobject_init(&port->kobject, &veth_port_ktype);
-        port->kobject.parent = &dev->dev.kobj;
+        if (0 != kobject_add(&port->kobject, &dev->dev.kobj, "veth_port"))
-        port->kobject.ktype  = &veth_port_ktype;
-        kobject_set_name(&port->kobject, "veth_port");
-        if (0 != kobject_add(&port->kobject))
                veth_error("Failed adding port for %s to sysfs.\n", dev->name);
        veth_info("%s attached to iSeries vlan %d (LPAR map = 0x%.4X)\n",
@@ -1711,9 +1704,9 @@ static int __init veth_module_init(void)
                        continue;
                kobj = &veth_cnx[i]->kobject;
-                kobj->parent = &veth_driver.driver.kobj;
                /* If the add failes, complain but otherwise continue */
-                if (0 != kobject_add(kobj))
+                if (0 != driver_add_kobj(&veth_driver.driver, kobj,
+                                        "cnx%.2d", veth_cnx[i]->remote_lp))
                        veth_error("cnx %d: Failed adding to sysfs.\n", i);
        }
diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c
index 3021234b1e17..4f63839051b0 100644
--- a/drivers/net/ixgb/ixgb_main.c
+++ b/drivers/net/ixgb/ixgb_main.c
@@ -296,6 +296,11 @@ ixgb_down(struct ixgb_adapter *adapter, boolean_t kill_watchdog)
 {
        struct net_device *netdev = adapter->netdev;
+#ifdef CONFIG_IXGB_NAPI
+        napi_disable(&adapter->napi);
+        atomic_set(&adapter->irq_sem, 0);
+#endif
        ixgb_irq_disable(adapter);
        free_irq(adapter->pdev->irq, netdev);
@@ -304,9 +309,7 @@ ixgb_down(struct ixgb_adapter *adapter, boolean_t kill_watchdog)
        if(kill_watchdog)
                del_timer_sync(&adapter->watchdog_timer);
-#ifdef CONFIG_IXGB_NAPI
-        napi_disable(&adapter->napi);
-#endif
        adapter->link_speed = 0;
        adapter->link_duplex = 0;
        netif_carrier_off(netdev);
@@ -320,10 +323,22 @@ ixgb_down(struct ixgb_adapter *adapter, boolean_t kill_watchdog)
 void
 ixgb_reset(struct ixgb_adapter *adapter)
 {
+        struct ixgb_hw *hw = &adapter->hw;
-        ixgb_adapter_stop(&adapter->hw);
+        ixgb_adapter_stop(hw);
-        if(!ixgb_init_hw(&adapter->hw))
+        if (!ixgb_init_hw(hw))
                DPRINTK(PROBE, ERR, "ixgb_init_hw failed.\n");
+        /* restore frame size information */
+        IXGB_WRITE_REG(hw, MFS, hw->max_frame_size << IXGB_MFS_SHIFT);
+        if (hw->max_frame_size >
+            IXGB_MAX_ENET_FRAME_SIZE_WITHOUT_FCS + ENET_FCS_LENGTH) {
+                u32 ctrl0 = IXGB_READ_REG(hw, CTRL0);
+                if (!(ctrl0 & IXGB_CTRL0_JFE)) {
+                        ctrl0 |= IXGB_CTRL0_JFE;
+                        IXGB_WRITE_REG(hw, CTRL0, ctrl0);
+                }
+        }
 }
 /**
@@ -1775,14 +1790,13 @@ ixgb_clean(struct napi_struct *napi, int budget)
 {
        struct ixgb_adapter *adapter = container_of(napi, struct ixgb_adapter, napi);
        struct net_device *netdev = adapter->netdev;
-        int tx_cleaned;
        int work_done = 0;
-        tx_cleaned = ixgb_clean_tx_irq(adapter);
+        ixgb_clean_tx_irq(adapter);
        ixgb_clean_rx_irq(adapter, &work_done, budget);
-        /* if no Tx and not enough Rx work done, exit the polling mode */
+        /* If budget not fully consumed, exit the polling mode */
-        if((!tx_cleaned && (work_done == 0)) || !netif_running(netdev)) {
+        if (work_done < budget) {
                netif_rx_complete(netdev, napi);
                ixgb_irq_enable(adapter);
        }
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index 00bc525c6560..a4265bc1cebb 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -1409,9 +1409,11 @@ void ixgbe_down(struct ixgbe_adapter *adapter)
        IXGBE_WRITE_FLUSH(&adapter->hw);
        msleep(10);
+        napi_disable(&adapter->napi);
+        atomic_set(&adapter->irq_sem, 0);
        ixgbe_irq_disable(adapter);
-        napi_disable(&adapter->napi);
        del_timer_sync(&adapter->watchdog_timer);
        netif_carrier_off(netdev);
@@ -1470,19 +1472,16 @@ static int ixgbe_clean(struct napi_struct *napi, int budget)
        struct net_device *netdev = adapter->netdev;
        int tx_cleaned = 0, work_done = 0;
-        /* Keep link state information with original netdev */
-        if (!netif_carrier_ok(adapter->netdev))
-                goto quit_polling;
        /* In non-MSIX case, there is no multi-Tx/Rx queue */
        tx_cleaned = ixgbe_clean_tx_irq(adapter, adapter->tx_ring);
        ixgbe_clean_rx_irq(adapter, &adapter->rx_ring[0], &work_done,
                           budget);
-        /* If no Tx and not enough Rx work done, exit the polling mode */
+        if (tx_cleaned)
-        if ((!tx_cleaned && (work_done < budget)) ||
+                work_done = budget;
-            !netif_running(adapter->netdev)) {
-quit_polling:
+        /* If budget not fully consumed, exit the polling mode */
+        if (work_done < budget) {
                netif_rx_complete(netdev, napi);
                ixgbe_irq_enable(adapter);
        }
diff --git a/drivers/net/ixp2000/ixpdev.c b/drivers/net/ixp2000/ixpdev.c
index 6c0dd49149d0..484cb2ba717f 100644
--- a/drivers/net/ixp2000/ixpdev.c
+++ b/drivers/net/ixp2000/ixpdev.c
@@ -135,8 +135,6 @@ static int ixpdev_poll(struct napi_struct *napi, int budget)
        struct net_device *dev = ip->dev;
        int rx;
-        /* @@@ Have to stop polling when nds[0] is administratively
-         * downed while we are polling.  */
        rx = 0;
        do {
                ixp2000_reg_write(IXP2000_IRQ_THD_RAW_STATUS_A_0, 0x00ff);
diff --git a/drivers/net/lib82596.c b/drivers/net/lib82596.c
index 9a855e512147..b59f442bbf36 100644
--- a/drivers/net/lib82596.c
+++ b/drivers/net/lib82596.c
@@ -176,8 +176,8 @@ struct i596_reg {
 struct i596_tbd {
        unsigned short size;
        unsigned short pad;
-        dma_addr_t     next;
+        u32            next;
-        dma_addr_t     data;
+        u32            data;
        u32 cache_pad[5];               /* Total 32 bytes... */
 };
@@ -195,12 +195,12 @@ struct i596_cmd {
        struct i596_cmd *v_next;        /* Address from CPUs viewpoint */
        unsigned short status;
        unsigned short command;
-        dma_addr_t     b_next;  /* Address from i596 viewpoint */
+        u32            b_next;  /* Address from i596 viewpoint */
 };
 struct tx_cmd {
        struct i596_cmd cmd;
-        dma_addr_t     tbd;
+        u32            tbd;
        unsigned short size;
        unsigned short pad;
        struct sk_buff *skb;            /* So we can free it after tx */
@@ -237,8 +237,8 @@ struct cf_cmd {
 struct i596_rfd {
        unsigned short stat;
        unsigned short cmd;
-        dma_addr_t     b_next;  /* Address from i596 viewpoint */
+        u32            b_next;  /* Address from i596 viewpoint */
-        dma_addr_t     rbd;
+        u32            rbd;
        unsigned short count;
        unsigned short size;
        struct i596_rfd *v_next;        /* Address from CPUs viewpoint */
@@ -249,18 +249,18 @@ struct i596_rfd {
 };
 struct i596_rbd {
-    /* hardware data */
+        /* hardware data */
-    unsigned short count;
+        unsigned short count;
-    unsigned short zero1;
+        unsigned short zero1;
-    dma_addr_t     b_next;
+        u32            b_next;
-    dma_addr_t     b_data;              /* Address from i596 viewpoint */
+        u32            b_data;          /* Address from i596 viewpoint */
-    unsigned short size;
+        unsigned short size;
-    unsigned short zero2;
+        unsigned short zero2;
-    /* driver data */
+        /* driver data */
-    struct sk_buff *skb;
+        struct sk_buff *skb;
-    struct i596_rbd *v_next;
+        struct i596_rbd *v_next;
-    dma_addr_t     b_addr;              /* This rbd addr from i596 view */
+        u32            b_addr;          /* This rbd addr from i596 view */
-    unsigned char *v_data;              /* Address from CPUs viewpoint */
+        unsigned char *v_data;          /* Address from CPUs viewpoint */
                                        /* Total 32 bytes... */
 #ifdef __LP64__
    u32 cache_pad[4];
@@ -275,8 +275,8 @@ struct i596_rbd {
 struct i596_scb {
        unsigned short status;
        unsigned short command;
-        dma_addr_t    cmd;
+        u32           cmd;
-        dma_addr_t    rfd;
+        u32           rfd;
        u32           crc_err;
        u32           align_err;
        u32           resource_err;
@@ -288,14 +288,14 @@ struct i596_scb {
 };
 struct i596_iscp {
-        u32           stat;
+        u32 stat;
-        dma_addr_t    scb;
+        u32 scb;
 };
 struct i596_scp {
-        u32           sysbus;
+        u32 sysbus;
-        u32           pad;
+        u32 pad;
-        dma_addr_t    iscp;
+        u32 iscp;
 };
 struct i596_dma {
diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c
index 662b8d16803c..fa147cd5d68c 100644
--- a/drivers/net/loopback.c
+++ b/drivers/net/loopback.c
@@ -242,7 +242,7 @@ static void loopback_setup(struct net_device *dev)
                | NETIF_F_NO_CSUM
                | NETIF_F_HIGHDMA
                | NETIF_F_LLTX
-                | NETIF_F_NETNS_LOCAL,
+                | NETIF_F_NETNS_LOCAL;
        dev->ethtool_ops        = &loopback_ethtool_ops;
        dev->header_ops         = &eth_header_ops;
        dev->init = loopback_dev_init;
diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index 047ea7be4850..e10528ed9081 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -307,8 +307,31 @@ static void macb_tx(struct macb *bp)
                (unsigned long)status);
        if (status & MACB_BIT(UND)) {
+                int i;
                printk(KERN_ERR "%s: TX underrun, resetting buffers\n",
-                       bp->dev->name);
+                        bp->dev->name);
+                head = bp->tx_head;
+                /*Mark all the buffer as used to avoid sending a lost buffer*/
+                for (i = 0; i < TX_RING_SIZE; i++)
+                        bp->tx_ring[i].ctrl = MACB_BIT(TX_USED);
+                /* free transmit buffer in upper layer*/
+                for (tail = bp->tx_tail; tail != head; tail = NEXT_TX(tail)) {
+                        struct ring_info *rp = &bp->tx_skb[tail];
+                        struct sk_buff *skb = rp->skb;
+                        BUG_ON(skb == NULL);
+                        rmb();
+                        dma_unmap_single(&bp->pdev->dev, rp->mapping, skb->len,
+                                                         DMA_TO_DEVICE);
+                        rp->skb = NULL;
+                        dev_kfree_skb_irq(skb);
+                }
                bp->tx_head = bp->tx_tail = 0;
        }
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index 2e4bcd5654c4..e8dc2f44fec9 100644
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -384,6 +384,13 @@ static int macvlan_newlink(struct net_device *dev,
        if (lowerdev == NULL)
                return -ENODEV;
+        /* Don't allow macvlans on top of other macvlans - its not really
+         * wrong, but lockdep can't handle it and its not useful for anything
+         * you couldn't do directly on top of the real device.
+         */
+        if (lowerdev->rtnl_link_ops == dev->rtnl_link_ops)
+                return -ENODEV;
        if (!tb[IFLA_MTU])
                dev->mtu = lowerdev->mtu;
        else if (dev->mtu > lowerdev->mtu)
diff --git a/drivers/net/meth.c b/drivers/net/meth.c
index 0c89b028a80c..cdaa8fc21809 100644
--- a/drivers/net/meth.c
+++ b/drivers/net/meth.c
@@ -95,11 +95,14 @@ static inline void load_eaddr(struct net_device *dev)
 {
        int i;
        DECLARE_MAC_BUF(mac);
+        u64 macaddr;
-        for (i = 0; i < 6; i++)
-                dev->dev_addr[i] = o2meth_eaddr[i];
        DPRINTK("Loading MAC Address: %s\n", print_mac(mac, dev->dev_addr));
-        mace->eth.mac_addr = (*(unsigned long*)o2meth_eaddr) >> 16;
+        macaddr = 0;
+        for (i = 0; i < 6; i++)
+                macaddr |= dev->dev_addr[i] << ((5 - i) * 8);
+        mace->eth.mac_addr = macaddr;
 }
 /*
@@ -794,6 +797,7 @@ static int __init meth_probe(struct platform_device *pdev)
 #endif
        dev->irq             = MACE_ETHERNET_IRQ;
        dev->base_addr       = (unsigned long)&mace->eth;
+        memcpy(dev->dev_addr, o2meth_eaddr, 6);
        priv = netdev_priv(dev);
        spin_lock_init(&priv->meth_lock);
diff --git a/drivers/net/mlx4/qp.c b/drivers/net/mlx4/qp.c
index 42b47639c81c..fa24e6597591 100644
--- a/drivers/net/mlx4/qp.c
+++ b/drivers/net/mlx4/qp.c
@@ -113,7 +113,7 @@ int mlx4_qp_modify(struct mlx4_dev *dev, struct mlx4_mtt *mtt,
        struct mlx4_cmd_mailbox *mailbox;
        int ret = 0;
-        if (cur_state >= MLX4_QP_NUM_STATE || cur_state >= MLX4_QP_NUM_STATE ||
+        if (cur_state >= MLX4_QP_NUM_STATE || new_state >= MLX4_QP_NUM_STATE ||
            !op[cur_state][new_state])
                return -EINVAL;
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c
index 0f306ddb5630..c90958f6d3fe 100644
--- a/drivers/net/myri10ge/myri10ge.c
+++ b/drivers/net/myri10ge/myri10ge.c
@@ -1239,7 +1239,7 @@ static int myri10ge_poll(struct napi_struct *napi, int budget)
        /* process as many rx events as NAPI will allow */
        work_done = myri10ge_clean_rx_done(mgp, budget);
-        if (work_done < budget || !netif_running(netdev)) {
+        if (work_done < budget) {
                netif_rx_complete(netdev, napi);
                put_be32(htonl(3), mgp->irq_claim);
        }
@@ -1979,6 +1979,7 @@ static int myri10ge_open(struct net_device *dev)
        lro_mgr->lro_arr = mgp->rx_done.lro_desc;
        lro_mgr->get_frag_header = myri10ge_get_frag_header;
        lro_mgr->max_aggr = myri10ge_lro_max_pkts;
+        lro_mgr->frag_align_pad = 2;
        if (lro_mgr->max_aggr > MAX_SKB_FRAGS)
                lro_mgr->max_aggr = MAX_SKB_FRAGS;
diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c
index 87cde062fd63..c329a4f5840c 100644
--- a/drivers/net/natsemi.c
+++ b/drivers/net/natsemi.c
@@ -2266,7 +2266,7 @@ static int natsemi_poll(struct napi_struct *napi, int budget)
        /* Reenable interrupts providing nothing is trying to shut
         * the chip down. */
        spin_lock(&np->lock);
-        if (!np->hands_off && netif_running(dev))
+        if (!np->hands_off)
                natsemi_irq_enable(dev);
        spin_unlock(&np->lock);
diff --git a/drivers/net/netx-eth.c b/drivers/net/netx-eth.c
index 5267e031daa0..78d34af13a1c 100644
--- a/drivers/net/netx-eth.c
+++ b/drivers/net/netx-eth.c
@@ -169,8 +169,8 @@ static void netx_eth_receive(struct net_device *ndev)
        ndev->last_rx = jiffies;
        skb->protocol = eth_type_trans(skb, ndev);
        netif_rx(skb);
-        dev->stats.rx_packets++;
+        ndev->stats.rx_packets++;
-        dev->stats.rx_bytes += len;
+        ndev->stats.rx_bytes += len;
 }
 static irqreturn_t
diff --git a/drivers/net/netxen/netxen_nic.h b/drivers/net/netxen/netxen_nic.h
index fbc2553275dc..a8f63c47b3cd 100644
--- a/drivers/net/netxen/netxen_nic.h
+++ b/drivers/net/netxen/netxen_nic.h
@@ -65,8 +65,8 @@
 #define _NETXEN_NIC_LINUX_MAJOR 3
 #define _NETXEN_NIC_LINUX_MINOR 4
-#define _NETXEN_NIC_LINUX_SUBVERSION 2
+#define _NETXEN_NIC_LINUX_SUBVERSION 18
-#define NETXEN_NIC_LINUX_VERSIONID  "3.4.2"
+#define NETXEN_NIC_LINUX_VERSIONID  "3.4.18"
 #define NETXEN_NUM_FLASH_SECTORS (64)
 #define NETXEN_FLASH_SECTOR_SIZE (64 * 1024)
@@ -309,23 +309,26 @@ struct netxen_ring_ctx {
        ((cmd_desc)->port_ctxid |= ((var) & 0xF0))
 #define netxen_set_cmd_desc_flags(cmd_desc, val)        \
-        ((cmd_desc)->flags_opcode &= ~cpu_to_le16(0x7f), \
+        (cmd_desc)->flags_opcode = ((cmd_desc)->flags_opcode & \
-        (cmd_desc)->flags_opcode |= cpu_to_le16((val) & 0x7f))
+                ~cpu_to_le16(0x7f)) | cpu_to_le16((val) & 0x7f)
 #define netxen_set_cmd_desc_opcode(cmd_desc, val)       \
-        ((cmd_desc)->flags_opcode &= ~cpu_to_le16(0x3f<<7), \
+        (cmd_desc)->flags_opcode = ((cmd_desc)->flags_opcode & \
-        (cmd_desc)->flags_opcode |= cpu_to_le16(((val & 0x3f)<<7)))
+                ~cpu_to_le16((u16)0x3f << 7)) | cpu_to_le16(((val) & 0x3f) << 7)
 #define netxen_set_cmd_desc_num_of_buff(cmd_desc, val)  \
-        ((cmd_desc)->num_of_buffers_total_length &= ~cpu_to_le32(0xff), \
+        (cmd_desc)->num_of_buffers_total_length = \
-        (cmd_desc)->num_of_buffers_total_length |= cpu_to_le32((val) & 0xff))
+                ((cmd_desc)->num_of_buffers_total_length & \
+                ~cpu_to_le32(0xff)) | cpu_to_le32((val) & 0xff)
 #define netxen_set_cmd_desc_totallength(cmd_desc, val)  \
-        ((cmd_desc)->num_of_buffers_total_length &= ~cpu_to_le32(0xffffff00), \
+        (cmd_desc)->num_of_buffers_total_length = \
-        (cmd_desc)->num_of_buffers_total_length |= cpu_to_le32(val << 8))
+                ((cmd_desc)->num_of_buffers_total_length & \
+                ~cpu_to_le32((u32)0xffffff << 8)) | \
+                cpu_to_le32(((val) & 0xffffff) << 8)
 #define netxen_get_cmd_desc_opcode(cmd_desc)    \
-        ((le16_to_cpu((cmd_desc)->flags_opcode) >> 7) & 0x003F)
+        ((le16_to_cpu((cmd_desc)->flags_opcode) >> 7) & 0x003f)
 #define netxen_get_cmd_desc_totallength(cmd_desc)       \
-        (le32_to_cpu((cmd_desc)->num_of_buffers_total_length) >> 8)
+        ((le32_to_cpu((cmd_desc)->num_of_buffers_total_length) >> 8) & 0xffffff)
 struct cmd_desc_type0 {
        u8 tcp_hdr_offset;      /* For LSO only */
@@ -412,29 +415,29 @@ struct rcv_desc {
 #define netxen_get_sts_desc_lro_last_frag(status_desc)  \
        (((status_desc)->lro & 0x80) >> 7)
-#define netxen_get_sts_port(status_desc)        \
+#define netxen_get_sts_port(sts_data)   \
-        (le64_to_cpu((status_desc)->status_desc_data) & 0x0F)
+        ((sts_data) & 0x0F)
-#define netxen_get_sts_status(status_desc)      \
+#define netxen_get_sts_status(sts_data) \
-        ((le64_to_cpu((status_desc)->status_desc_data) >> 4) & 0x0F)
+        (((sts_data) >> 4) & 0x0F)
-#define netxen_get_sts_type(status_desc)        \
+#define netxen_get_sts_type(sts_data)   \
-        ((le64_to_cpu((status_desc)->status_desc_data) >> 8) & 0x0F)
+        (((sts_data) >> 8) & 0x0F)
-#define netxen_get_sts_totallength(status_desc) \
+#define netxen_get_sts_totallength(sts_data)    \
-        ((le64_to_cpu((status_desc)->status_desc_data) >> 12) & 0xFFFF)
+        (((sts_data) >> 12) & 0xFFFF)
-#define netxen_get_sts_refhandle(status_desc)   \
+#define netxen_get_sts_refhandle(sts_data)      \
-        ((le64_to_cpu((status_desc)->status_desc_data) >> 28) & 0xFFFF)
+        (((sts_data) >> 28) & 0xFFFF)
-#define netxen_get_sts_prot(status_desc)        \
+#define netxen_get_sts_prot(sts_data)   \
-        ((le64_to_cpu((status_desc)->status_desc_data) >> 44) & 0x0F)
+        (((sts_data) >> 44) & 0x0F)
+#define netxen_get_sts_opcode(sts_data) \
+        (((sts_data) >> 58) & 0x03F)
 #define netxen_get_sts_owner(status_desc)       \
        ((le64_to_cpu((status_desc)->status_desc_data) >> 56) & 0x03)
-#define netxen_get_sts_opcode(status_desc)      \
+#define netxen_set_sts_owner(status_desc, val)  { \
-        ((le64_to_cpu((status_desc)->status_desc_data) >> 58) & 0x03F)
+        (status_desc)->status_desc_data = \
+                ((status_desc)->status_desc_data & \
-#define netxen_clear_sts_owner(status_desc)     \
+                ~cpu_to_le64(0x3ULL << 56)) | \
-        ((status_desc)->status_desc_data &=     \
+                cpu_to_le64((u64)((val) & 0x3) << 56); \
-        ~cpu_to_le64(((unsigned long long)3) << 56 ))
+}
-#define netxen_set_sts_owner(status_desc, val)  \
-        ((status_desc)->status_desc_data |=     \
-        cpu_to_le64(((unsigned long long)((val) & 0x3)) << 56 ))
 struct status_desc {
        /* Bit pattern: 0-3 port, 4-7 status, 8-11 type, 12-27 total_length
diff --git a/drivers/net/netxen/netxen_nic_init.c b/drivers/net/netxen/netxen_nic_init.c
index 37589265297e..485ff9398910 100644
--- a/drivers/net/netxen/netxen_nic_init.c
+++ b/drivers/net/netxen/netxen_nic_init.c
@@ -1070,16 +1070,17 @@ netxen_process_rcv(struct netxen_adapter *adapter, int ctxid,
 {
        struct pci_dev *pdev = adapter->pdev;
        struct net_device *netdev = adapter->netdev;
-        int index = netxen_get_sts_refhandle(desc);
+        u64 sts_data = le64_to_cpu(desc->status_desc_data);
+        int index = netxen_get_sts_refhandle(sts_data);
        struct netxen_recv_context *recv_ctx = &(adapter->recv_ctx[ctxid]);
        struct netxen_rx_buffer *buffer;
        struct sk_buff *skb;
-        u32 length = netxen_get_sts_totallength(desc);
+        u32 length = netxen_get_sts_totallength(sts_data);
        u32 desc_ctx;
        struct netxen_rcv_desc_ctx *rcv_desc;
        int ret;
-        desc_ctx = netxen_get_sts_type(desc);
+        desc_ctx = netxen_get_sts_type(sts_data);
        if (unlikely(desc_ctx >= NUM_RCV_DESC_RINGS)) {
                printk("%s: %s Bad Rcv descriptor ring\n",
                       netxen_nic_driver_name, netdev->name);
@@ -1119,7 +1120,7 @@ netxen_process_rcv(struct netxen_adapter *adapter, int ctxid,
        skb = (struct sk_buff *)buffer->skb;
        if (likely(adapter->rx_csum &&
-                                netxen_get_sts_status(desc) == STATUS_CKSUM_OK)) {
+                                netxen_get_sts_status(sts_data) == STATUS_CKSUM_OK)) {
                adapter->stats.csummed++;
                skb->ip_summed = CHECKSUM_UNNECESSARY;
        } else
@@ -1209,7 +1210,6 @@ u32 netxen_process_rcv_ring(struct netxen_adapter *adapter, int ctxid, int max)
                        break;
                }
                netxen_process_rcv(adapter, ctxid, desc);
-                netxen_clear_sts_owner(desc);
                netxen_set_sts_owner(desc, STATUS_OWNER_PHANTOM);
                consumer = (consumer + 1) & (adapter->max_rx_desc_count - 1);
                count++;
@@ -1248,7 +1248,6 @@ int netxen_process_cmd_ring(unsigned long data)
        struct pci_dev *pdev;
        struct netxen_skb_frag *frag;
        u32 i;
-        struct sk_buff *skb = NULL;
        int done;
        spin_lock(&adapter->tx_lock);
@@ -1278,9 +1277,8 @@ int netxen_process_cmd_ring(unsigned long data)
        while ((last_consumer != consumer) && (count1 < MAX_STATUS_HANDLE)) {
                buffer = &adapter->cmd_buf_arr[last_consumer];
                pdev = adapter->pdev;
-                frag = &buffer->frag_array[0];
+                if (buffer->skb) {
-                skb = buffer->skb;
+                        frag = &buffer->frag_array[0];
-                if (skb && (cmpxchg(&buffer->skb, skb, 0) == skb)) {
                        pci_unmap_single(pdev, frag->dma, frag->length,
                                         PCI_DMA_TODEVICE);
                        frag->dma = 0ULL;
@@ -1293,8 +1291,8 @@ int netxen_process_cmd_ring(unsigned long data)
                        }
                        adapter->stats.skbfreed++;
-                        dev_kfree_skb_any(skb);
+                        dev_kfree_skb_any(buffer->skb);
-                        skb = NULL;
+                        buffer->skb = NULL;
                } else if (adapter->proc_cmd_buf_counter == 1) {
                        adapter->stats.txnullskb++;
                }
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index a80f0cd6b528..263b55e36c7a 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -732,11 +732,6 @@ static void __devexit netxen_nic_remove(struct pci_dev *pdev)
        unregister_netdev(netdev);
-        if (adapter->stop_port)
-                adapter->stop_port(adapter);
-        netxen_nic_disable_int(adapter);
        if (adapter->is_up == NETXEN_ADAPTER_UP_MAGIC) {
                init_firmware_done++;
                netxen_free_hw_resources(adapter);
@@ -919,6 +914,9 @@ static int netxen_nic_close(struct net_device *netdev)
        netif_stop_queue(netdev);
        napi_disable(&adapter->napi);
+        if (adapter->stop_port)
+                adapter->stop_port(adapter);
        netxen_nic_disable_int(adapter);
        cmd_buff = adapter->cmd_buf_arr;
@@ -996,28 +994,6 @@ static int netxen_nic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
                return NETDEV_TX_OK;
        }
-        /*
-         * Everything is set up. Now, we just need to transmit it out.
-         * Note that we have to copy the contents of buffer over to
-         * right place. Later on, this can be optimized out by de-coupling the
-         * producer index from the buffer index.
-         */
-      retry_getting_window:
-        spin_lock_bh(&adapter->tx_lock);
-        if (adapter->total_threads >= MAX_XMIT_PRODUCERS) {
-                spin_unlock_bh(&adapter->tx_lock);
-                /*
-                 * Yield CPU
-                 */
-                if (!in_atomic())
-                        schedule();
-                else {
-                        for (i = 0; i < 20; i++)
-                                cpu_relax();    /*This a nop instr on i386 */
-                }
-                goto retry_getting_window;
-        }
-        local_producer = adapter->cmd_producer;
        /* There 4 fragments per descriptor */
        no_of_desc = (frag_count + 3) >> 2;
        if (netdev->features & NETIF_F_TSO) {
@@ -1031,16 +1007,19 @@ static int netxen_nic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
                        }
                }
        }
+        spin_lock_bh(&adapter->tx_lock);
+        if (adapter->total_threads >= MAX_XMIT_PRODUCERS) {
+                goto out_requeue;
+        }
+        local_producer = adapter->cmd_producer;
        k = adapter->cmd_producer;
        max_tx_desc_count = adapter->max_tx_desc_count;
        last_cmd_consumer = adapter->last_cmd_consumer;
        if ((k + no_of_desc) >=
            ((last_cmd_consumer <= k) ? last_cmd_consumer + max_tx_desc_count :
             last_cmd_consumer)) {
-                netif_stop_queue(netdev);
+                goto out_requeue;
-                adapter->flags |= NETXEN_NETDEV_STATUS;
-                spin_unlock_bh(&adapter->tx_lock);
-                return NETDEV_TX_BUSY;
        }
        k = get_index_range(k, max_tx_desc_count, no_of_desc);
        adapter->cmd_producer = k;
@@ -1093,6 +1072,8 @@ static int netxen_nic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
                                                  adapter->max_tx_desc_count);
                        hwdesc = &hw->cmd_desc_head[producer];
                        memset(hwdesc, 0, sizeof(struct cmd_desc_type0));
+                        pbuf = &adapter->cmd_buf_arr[producer];
+                        pbuf->skb = NULL;
                }
                frag = &skb_shinfo(skb)->frags[i - 1];
                len = frag->size;
@@ -1148,6 +1129,8 @@ static int netxen_nic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
                }
                /* copy the MAC/IP/TCP headers to the cmd descriptor list */
                hwdesc = &hw->cmd_desc_head[producer];
+                pbuf = &adapter->cmd_buf_arr[producer];
+                pbuf->skb = NULL;
                /* copy the first 64 bytes */
                memcpy(((void *)hwdesc) + 2,
@@ -1156,6 +1139,8 @@ static int netxen_nic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
                if (more_hdr) {
                        hwdesc = &hw->cmd_desc_head[producer];
+                        pbuf = &adapter->cmd_buf_arr[producer];
+                        pbuf->skb = NULL;
                        /* copy the next 64 bytes - should be enough except
                         * for pathological case
                         */
@@ -1167,16 +1152,8 @@ static int netxen_nic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
                }
        }
-        i = netxen_get_cmd_desc_totallength(&hw->cmd_desc_head[saved_producer]);
-        hw->cmd_desc_head[saved_producer].flags_opcode =
-                cpu_to_le16(hw->cmd_desc_head[saved_producer].flags_opcode);
-        hw->cmd_desc_head[saved_producer].num_of_buffers_total_length =
-          cpu_to_le32(hw->cmd_desc_head[saved_producer].
-                          num_of_buffers_total_length);
        spin_lock_bh(&adapter->tx_lock);
-        adapter->stats.txbytes += i;
+        adapter->stats.txbytes += skb->len;
        /* Code to update the adapter considering how many producer threads
           are currently working */
@@ -1189,14 +1166,17 @@ static int netxen_nic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
        }
        adapter->stats.xmitfinished++;
-        spin_unlock_bh(&adapter->tx_lock);
        netdev->trans_start = jiffies;
-        DPRINTK(INFO, "wrote CMD producer %x to phantom\n", producer);
+        spin_unlock_bh(&adapter->tx_lock);
-        DPRINTK(INFO, "Done. Send\n");
        return NETDEV_TX_OK;
+out_requeue:
+        netif_stop_queue(netdev);
+        adapter->flags |= NETXEN_NETDEV_STATUS;
+        spin_unlock_bh(&adapter->tx_lock);
+        return NETDEV_TX_BUSY;
 }
 static void netxen_watchdog(unsigned long v)
@@ -1321,7 +1301,7 @@ static int netxen_nic_poll(struct napi_struct *napi, int budget)
                                                     budget / MAX_RCV_CTX);
        }
-        if (work_done >= budget && netxen_nic_rx_has_work(adapter) != 0)
+        if (work_done >= budget)
                done = 0;
        if (netxen_process_cmd_ring((unsigned long)adapter) == 0)
diff --git a/drivers/net/netxen/netxen_nic_niu.c b/drivers/net/netxen/netxen_nic_niu.c
index 5b9e1b300fab..d04ecb77d08c 100644
--- a/drivers/net/netxen/netxen_nic_niu.c
+++ b/drivers/net/netxen/netxen_nic_niu.c
@@ -736,12 +736,12 @@ int netxen_niu_disable_xg_port(struct netxen_adapter *adapter)
        __u32 mac_cfg;
        u32 port = physical_port[adapter->portnum];
-        if (port != 0)
+        if (port > NETXEN_NIU_MAX_XG_PORTS)
                return -EINVAL;
        mac_cfg = 0;
-        netxen_xg_soft_reset(mac_cfg);
+        if (netxen_nic_hw_write_wx(adapter,
-        if (netxen_nic_hw_write_wx(adapter, NETXEN_NIU_XGE_CONFIG_0,
+                NETXEN_NIU_XGE_CONFIG_0 + (0x10000 * port), &mac_cfg, 4))
-                                   &mac_cfg, 4))
                return -EIO;
        return 0;
 }
diff --git a/drivers/net/niu.c b/drivers/net/niu.c
index 112ab079ce7d..5f6beabf2d17 100644
--- a/drivers/net/niu.c
+++ b/drivers/net/niu.c
@@ -33,8 +33,8 @@
 #define DRV_MODULE_NAME         "niu"
 #define PFX DRV_MODULE_NAME     ": "
-#define DRV_MODULE_VERSION      "0.5"
+#define DRV_MODULE_VERSION      "0.6"
-#define DRV_MODULE_RELDATE      "October 5, 2007"
+#define DRV_MODULE_RELDATE      "January 5, 2008"
 static char version[] __devinitdata =
        DRV_MODULE_NAME ".c:v" DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n";
@@ -801,22 +801,90 @@ static int bcm8704_init_user_dev3(struct niu *np)
        return 0;
 }
-static int xcvr_init_10g(struct niu *np)
+static int mrvl88x2011_act_led(struct niu *np, int val)
+{
+        int     err;
+        err  = mdio_read(np, np->phy_addr, MRVL88X2011_USER_DEV2_ADDR,
+                MRVL88X2011_LED_8_TO_11_CTL);
+        if (err < 0)
+                return err;
+        err &= ~MRVL88X2011_LED(MRVL88X2011_LED_ACT,MRVL88X2011_LED_CTL_MASK);
+        err |=  MRVL88X2011_LED(MRVL88X2011_LED_ACT,val);
+        return mdio_write(np, np->phy_addr, MRVL88X2011_USER_DEV2_ADDR,
+                          MRVL88X2011_LED_8_TO_11_CTL, err);
+}
+static int mrvl88x2011_led_blink_rate(struct niu *np, int rate)
+{
+        int     err;
+        err = mdio_read(np, np->phy_addr, MRVL88X2011_USER_DEV2_ADDR,
+                        MRVL88X2011_LED_BLINK_CTL);
+        if (err >= 0) {
+                err &= ~MRVL88X2011_LED_BLKRATE_MASK;
+                err |= (rate << 4);
+                err = mdio_write(np, np->phy_addr, MRVL88X2011_USER_DEV2_ADDR,
+                                 MRVL88X2011_LED_BLINK_CTL, err);
+        }
+        return err;
+}
+static int xcvr_init_10g_mrvl88x2011(struct niu *np)
+{
+        int     err;
+        /* Set LED functions */
+        err = mrvl88x2011_led_blink_rate(np, MRVL88X2011_LED_BLKRATE_134MS);
+        if (err)
+                return err;
+        /* led activity */
+        err = mrvl88x2011_act_led(np, MRVL88X2011_LED_CTL_OFF);
+        if (err)
+                return err;
+        err = mdio_read(np, np->phy_addr, MRVL88X2011_USER_DEV3_ADDR,
+                        MRVL88X2011_GENERAL_CTL);
+        if (err < 0)
+                return err;
+        err |= MRVL88X2011_ENA_XFPREFCLK;
+        err = mdio_write(np, np->phy_addr, MRVL88X2011_USER_DEV3_ADDR,
+                         MRVL88X2011_GENERAL_CTL, err);
+        if (err < 0)
+                return err;
+        err = mdio_read(np, np->phy_addr, MRVL88X2011_USER_DEV1_ADDR,
+                        MRVL88X2011_PMA_PMD_CTL_1);
+        if (err < 0)
+                return err;
+        if (np->link_config.loopback_mode == LOOPBACK_MAC)
+                err |= MRVL88X2011_LOOPBACK;
+        else
+                err &= ~MRVL88X2011_LOOPBACK;
+        err = mdio_write(np, np->phy_addr, MRVL88X2011_USER_DEV1_ADDR,
+                         MRVL88X2011_PMA_PMD_CTL_1, err);
+        if (err < 0)
+                return err;
+        /* Enable PMD  */
+        return mdio_write(np, np->phy_addr, MRVL88X2011_USER_DEV1_ADDR,
+                          MRVL88X2011_10G_PMD_TX_DIS, MRVL88X2011_ENA_PMDTX);
+}
+static int xcvr_init_10g_bcm8704(struct niu *np)
 {
        struct niu_link_config *lp = &np->link_config;
        u16 analog_stat0, tx_alarm_status;
        int err;
-        u64 val;
-        val = nr64_mac(XMAC_CONFIG);
-        val &= ~XMAC_CONFIG_LED_POLARITY;
-        val |= XMAC_CONFIG_FORCE_LED_ON;
-        nw64_mac(XMAC_CONFIG, val);
-        /* XXX shared resource, lock parent XXX */
-        val = nr64(MIF_CONFIG);
-        val |= MIF_CONFIG_INDIRECT_MODE;
-        nw64(MIF_CONFIG, val);
        err = bcm8704_reset(np);
        if (err)
@@ -896,6 +964,38 @@ static int xcvr_init_10g(struct niu *np)
        return 0;
 }
+static int xcvr_init_10g(struct niu *np)
+{
+        int phy_id, err;
+        u64 val;
+        val = nr64_mac(XMAC_CONFIG);
+        val &= ~XMAC_CONFIG_LED_POLARITY;
+        val |= XMAC_CONFIG_FORCE_LED_ON;
+        nw64_mac(XMAC_CONFIG, val);
+        /* XXX shared resource, lock parent XXX */
+        val = nr64(MIF_CONFIG);
+        val |= MIF_CONFIG_INDIRECT_MODE;
+        nw64(MIF_CONFIG, val);
+        phy_id = phy_decode(np->parent->port_phy, np->port);
+        phy_id = np->parent->phy_probe_info.phy_id[phy_id][np->port];
+        /* handle different phy types */
+        switch (phy_id & NIU_PHY_ID_MASK) {
+        case NIU_PHY_ID_MRVL88X2011:
+                err = xcvr_init_10g_mrvl88x2011(np);
+                break;
+        default: /* bcom 8704 */
+                err = xcvr_init_10g_bcm8704(np);
+                break;
+        }
+        return 0;
+}
 static int mii_reset(struct niu *np)
 {
        int limit, err;
@@ -1045,6 +1145,7 @@ static int niu_serdes_init(struct niu *np)
 }
 static void niu_init_xif(struct niu *);
+static void niu_handle_led(struct niu *, int status);
 static int niu_link_status_common(struct niu *np, int link_up)
 {
@@ -1066,30 +1167,83 @@ static int niu_link_status_common(struct niu *np, int link_up)
                spin_lock_irqsave(&np->lock, flags);
                niu_init_xif(np);
+                niu_handle_led(np, 1);
                spin_unlock_irqrestore(&np->lock, flags);
                netif_carrier_on(dev);
        } else if (netif_carrier_ok(dev) && !link_up) {
                niuwarn(LINK, "%s: Link is down\n", dev->name);
+                spin_lock_irqsave(&np->lock, flags);
+                niu_handle_led(np, 0);
+                spin_unlock_irqrestore(&np->lock, flags);
                netif_carrier_off(dev);
        }
        return 0;
 }
-static int link_status_10g(struct niu *np, int *link_up_p)
+static int link_status_10g_mrvl(struct niu *np, int *link_up_p)
 {
-        unsigned long flags;
+        int err, link_up, pma_status, pcs_status;
-        int err, link_up;
        link_up = 0;
-        spin_lock_irqsave(&np->lock, flags);
+        err = mdio_read(np, np->phy_addr, MRVL88X2011_USER_DEV1_ADDR,
+                        MRVL88X2011_10G_PMD_STATUS_2);
+        if (err < 0)
+                goto out;
-        err = -EINVAL;
+        /* Check PMA/PMD Register: 1.0001.2 == 1 */
-        if (np->link_config.loopback_mode != LOOPBACK_DISABLED)
+        err = mdio_read(np, np->phy_addr, MRVL88X2011_USER_DEV1_ADDR,
+                        MRVL88X2011_PMA_PMD_STATUS_1);
+        if (err < 0)
+                goto out;
+        pma_status = ((err & MRVL88X2011_LNK_STATUS_OK) ? 1 : 0);
+        /* Check PMC Register : 3.0001.2 == 1: read twice */
+        err = mdio_read(np, np->phy_addr, MRVL88X2011_USER_DEV3_ADDR,
+                        MRVL88X2011_PMA_PMD_STATUS_1);
+        if (err < 0)
                goto out;
+        err = mdio_read(np, np->phy_addr, MRVL88X2011_USER_DEV3_ADDR,
+                        MRVL88X2011_PMA_PMD_STATUS_1);
+        if (err < 0)
+                goto out;
+        pcs_status = ((err & MRVL88X2011_LNK_STATUS_OK) ? 1 : 0);
+        /* Check XGXS Register : 4.0018.[0-3,12] */
+        err = mdio_read(np, np->phy_addr, MRVL88X2011_USER_DEV4_ADDR,
+                        MRVL88X2011_10G_XGXS_LANE_STAT);
+        if (err < 0)
+                goto out;
+        if (err == (PHYXS_XGXS_LANE_STAT_ALINGED | PHYXS_XGXS_LANE_STAT_LANE3 |
+                    PHYXS_XGXS_LANE_STAT_LANE2 | PHYXS_XGXS_LANE_STAT_LANE1 |
+                    PHYXS_XGXS_LANE_STAT_LANE0 | PHYXS_XGXS_LANE_STAT_MAGIC |
+                    0x800))
+                link_up = (pma_status && pcs_status) ? 1 : 0;
+        np->link_config.active_speed = SPEED_10000;
+        np->link_config.active_duplex = DUPLEX_FULL;
+        err = 0;
+out:
+        mrvl88x2011_act_led(np, (link_up ?
+                                 MRVL88X2011_LED_CTL_PCS_ACT :
+                                 MRVL88X2011_LED_CTL_OFF));
+        *link_up_p = link_up;
+        return err;
+}
+static int link_status_10g_bcom(struct niu *np, int *link_up_p)
+{
+        int err, link_up;
+        link_up = 0;
        err = mdio_read(np, np->phy_addr, BCM8704_PMA_PMD_DEV_ADDR,
                        BCM8704_PMD_RCV_SIGDET);
        if (err < 0)
@@ -1129,14 +1283,43 @@ static int link_status_10g(struct niu *np, int *link_up_p)
        err = 0;
 out:
+        *link_up_p = link_up;
+        return err;
+}
+static int link_status_10g(struct niu *np, int *link_up_p)
+{
+        unsigned long flags;
+        int err = -EINVAL;
+        spin_lock_irqsave(&np->lock, flags);
+        if (np->link_config.loopback_mode == LOOPBACK_DISABLED) {
+                int phy_id;
+                phy_id = phy_decode(np->parent->port_phy, np->port);
+                phy_id = np->parent->phy_probe_info.phy_id[phy_id][np->port];
+                /* handle different phy types */
+                switch (phy_id & NIU_PHY_ID_MASK) {
+                case NIU_PHY_ID_MRVL88X2011:
+                        err = link_status_10g_mrvl(np, link_up_p);
+                        break;
+                default: /* bcom 8704 */
+                        err = link_status_10g_bcom(np, link_up_p);
+                        break;
+                }
+        }
        spin_unlock_irqrestore(&np->lock, flags);
-        *link_up_p = link_up;
        return err;
 }
 static int link_status_1g(struct niu *np, int *link_up_p)
 {
+        struct niu_link_config *lp = &np->link_config;
        u16 current_speed, bmsr;
        unsigned long flags;
        u8 current_duplex;
@@ -1204,6 +1387,8 @@ static int link_status_1g(struct niu *np, int *link_up_p)
                                link_up = 0;
                }
        }
+        lp->active_speed = current_speed;
+        lp->active_duplex = current_duplex;
        err = 0;
 out:
@@ -2236,6 +2421,8 @@ static int niu_process_rx_pkt(struct niu *np, struct rx_ring_info *rp)
        skb->protocol = eth_type_trans(skb, np->dev);
        netif_receive_skb(skb);
+        np->dev->last_rx = jiffies;
        return num_rcr;
 }
@@ -2503,15 +2690,19 @@ static int niu_rx_error(struct niu *np, struct rx_ring_info *rp)
        u64 stat = nr64(RX_DMA_CTL_STAT(rp->rx_channel));
        int err = 0;
-        dev_err(np->device, PFX "%s: RX channel %u error, stat[%llx]\n",
-                np->dev->name, rp->rx_channel, (unsigned long long) stat);
-        niu_log_rxchan_errors(np, rp, stat);
        if (stat & (RX_DMA_CTL_STAT_CHAN_FATAL |
                    RX_DMA_CTL_STAT_PORT_FATAL))
                err = -EINVAL;
+        if (err) {
+                dev_err(np->device, PFX "%s: RX channel %u error, stat[%llx]\n",
+                        np->dev->name, rp->rx_channel,
+                        (unsigned long long) stat);
+                niu_log_rxchan_errors(np, rp, stat);
+        }
        nw64(RX_DMA_CTL_STAT(rp->rx_channel),
             stat & RX_DMA_CTL_WRITE_CLEAR_ERRS);
@@ -2744,13 +2935,16 @@ static int niu_device_error(struct niu *np)
        return -ENODEV;
 }
-static int niu_slowpath_interrupt(struct niu *np, struct niu_ldg *lp)
+static int niu_slowpath_interrupt(struct niu *np, struct niu_ldg *lp,
+                              u64 v0, u64 v1, u64 v2)
 {
-        u64 v0 = lp->v0;
-        u64 v1 = lp->v1;
-        u64 v2 = lp->v2;
        int i, err = 0;
+        lp->v0 = v0;
+        lp->v1 = v1;
+        lp->v2 = v2;
        if (v1 & 0x00000000ffffffffULL) {
                u32 rx_vec = (v1 & 0xffffffff);
@@ -2759,8 +2953,13 @@ static int niu_slowpath_interrupt(struct niu *np, struct niu_ldg *lp)
                        if (rx_vec & (1 << rp->rx_channel)) {
                                int r = niu_rx_error(np, rp);
-                                if (r)
+                                if (r) {
                                        err = r;
+                                } else {
+                                        if (!v0)
+                                                nw64(RX_DMA_CTL_STAT(rp->rx_channel),
+                                                     RX_DMA_CTL_STAT_MEX);
+                                }
                        }
                }
        }
@@ -2798,7 +2997,7 @@ static int niu_slowpath_interrupt(struct niu *np, struct niu_ldg *lp)
        if (err)
                niu_enable_interrupts(np, 0);
-        return -EINVAL;
+        return err;
 }
 static void niu_rxchan_intr(struct niu *np, struct rx_ring_info *rp,
@@ -2900,7 +3099,7 @@ static irqreturn_t niu_interrupt(int irq, void *dev_id)
        }
        if (unlikely((v0 & ((u64)1 << LDN_MIF)) || v1 || v2)) {
-                int err = niu_slowpath_interrupt(np, lp);
+                int err = niu_slowpath_interrupt(np, lp, v0, v1, v2);
                if (err)
                        goto out;
        }
@@ -3915,16 +4114,14 @@ static int niu_init_ipp(struct niu *np)
        return 0;
 }
-static void niu_init_xif_xmac(struct niu *np)
+static void niu_handle_led(struct niu *np, int status)
 {
-        struct niu_link_config *lp = &np->link_config;
        u64 val;
        val = nr64_mac(XMAC_CONFIG);
        if ((np->flags & NIU_FLAGS_10G) != 0 &&
            (np->flags & NIU_FLAGS_FIBER) != 0) {
-                if (netif_carrier_ok(np->dev)) {
+                if (status) {
                        val |= XMAC_CONFIG_LED_POLARITY;
                        val &= ~XMAC_CONFIG_FORCE_LED_ON;
                } else {
@@ -3933,6 +4130,15 @@ static void niu_init_xif_xmac(struct niu *np)
                }
        }
+        nw64_mac(XMAC_CONFIG, val);
+}
+static void niu_init_xif_xmac(struct niu *np)
+{
+        struct niu_link_config *lp = &np->link_config;
+        u64 val;
+        val = nr64_mac(XMAC_CONFIG);
        val &= ~XMAC_CONFIG_SEL_POR_CLK_SRC;
        val |= XMAC_CONFIG_TX_OUTPUT_EN;
@@ -4776,6 +4982,8 @@ static int niu_close(struct net_device *dev)
        niu_free_channels(np);
+        niu_handle_led(np, 0);
        return 0;
 }
@@ -5180,7 +5388,8 @@ static int niu_start_xmit(struct sk_buff *skb, struct net_device *dev)
                }
                kfree_skb(skb);
                skb = skb_new;
-        }
+        } else
+                skb_orphan(skb);
        align = ((unsigned long) skb->data & (16 - 1));
        headroom = align + sizeof(struct tx_pkt_hdr);
@@ -6268,7 +6477,8 @@ static int __devinit phy_record(struct niu_parent *parent,
        if (dev_id_1 < 0 || dev_id_2 < 0)
                return 0;
        if (type == PHY_TYPE_PMA_PMD || type == PHY_TYPE_PCS) {
-                if ((id & NIU_PHY_ID_MASK) != NIU_PHY_ID_BCM8704)
+                if (((id & NIU_PHY_ID_MASK) != NIU_PHY_ID_BCM8704) &&
+                    ((id & NIU_PHY_ID_MASK) != NIU_PHY_ID_MRVL88X2011))
                        return 0;
        } else {
                if ((id & NIU_PHY_ID_MASK) != NIU_PHY_ID_BCM5464R)
diff --git a/drivers/net/niu.h b/drivers/net/niu.h
index 10e3f111b6d5..0e8626adc573 100644
--- a/drivers/net/niu.h
+++ b/drivers/net/niu.h
@@ -2538,6 +2538,39 @@ struct fcram_hash_ipv6 {
 #define NIU_PHY_ID_MASK                 0xfffff0f0
 #define NIU_PHY_ID_BCM8704              0x00206030
 #define NIU_PHY_ID_BCM5464R             0x002060b0
+#define NIU_PHY_ID_MRVL88X2011          0x01410020
+/* MRVL88X2011 register addresses */
+#define MRVL88X2011_USER_DEV1_ADDR      1
+#define MRVL88X2011_USER_DEV2_ADDR      2
+#define MRVL88X2011_USER_DEV3_ADDR      3
+#define MRVL88X2011_USER_DEV4_ADDR      4
+#define MRVL88X2011_PMA_PMD_CTL_1       0x0000
+#define MRVL88X2011_PMA_PMD_STATUS_1    0x0001
+#define MRVL88X2011_10G_PMD_STATUS_2    0x0008
+#define MRVL88X2011_10G_PMD_TX_DIS      0x0009
+#define MRVL88X2011_10G_XGXS_LANE_STAT  0x0018
+#define MRVL88X2011_GENERAL_CTL         0x8300
+#define MRVL88X2011_LED_BLINK_CTL       0x8303
+#define MRVL88X2011_LED_8_TO_11_CTL     0x8306
+/* MRVL88X2011 register control */
+#define MRVL88X2011_ENA_XFPREFCLK       0x0001
+#define MRVL88X2011_ENA_PMDTX           0x0000
+#define MRVL88X2011_LOOPBACK            0x1
+#define MRVL88X2011_LED_ACT             0x1
+#define MRVL88X2011_LNK_STATUS_OK       0x4
+#define MRVL88X2011_LED_BLKRATE_MASK    0x70
+#define MRVL88X2011_LED_BLKRATE_034MS   0x0
+#define MRVL88X2011_LED_BLKRATE_067MS   0x1
+#define MRVL88X2011_LED_BLKRATE_134MS   0x2
+#define MRVL88X2011_LED_BLKRATE_269MS   0x3
+#define MRVL88X2011_LED_BLKRATE_538MS   0x4
+#define MRVL88X2011_LED_CTL_OFF         0x0
+#define MRVL88X2011_LED_CTL_PCS_ACT     0x5
+#define MRVL88X2011_LED_CTL_MASK        0x7
+#define MRVL88X2011_LED(n,v)            ((v)<<((n)*4))
+#define MRVL88X2011_LED_STAT(n,v)       ((v)>>((n)*4))
 #define BCM8704_PMA_PMD_DEV_ADDR        1
 #define BCM8704_PCS_DEV_ADDR            2
diff --git a/drivers/net/pasemi_mac.c b/drivers/net/pasemi_mac.c
index 09b4fde8d924..816a59e801b2 100644
--- a/drivers/net/pasemi_mac.c
+++ b/drivers/net/pasemi_mac.c
@@ -586,7 +586,7 @@ static int pasemi_mac_clean_rx(struct pasemi_mac *mac, int limit)
                        /* CRC error flagged */
                        mac->netdev->stats.rx_errors++;
                        mac->netdev->stats.rx_crc_errors++;
-                        dev_kfree_skb_irq(skb);
+                        /* No need to free skb, it'll be reused */
                        goto next;
                }
@@ -1362,7 +1362,7 @@ pasemi_mac_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        netif_napi_add(dev, &mac->napi, pasemi_mac_poll, 64);
-        dev->features = NETIF_F_HW_CSUM | NETIF_F_LLTX | NETIF_F_SG;
+        dev->features = NETIF_F_IP_CSUM | NETIF_F_LLTX | NETIF_F_SG;
        /* These should come out of the device tree eventually */
        mac->dma_txch = index;
diff --git a/drivers/net/pcmcia/3c574_cs.c b/drivers/net/pcmcia/3c574_cs.c
index ad134a61302a..36a7ba3134ce 100644
--- a/drivers/net/pcmcia/3c574_cs.c
+++ b/drivers/net/pcmcia/3c574_cs.c
@@ -187,14 +187,16 @@ enum Window1 {
 enum Window3 {                  /* Window 3: MAC/config bits. */
        Wn3_Config=0, Wn3_MAC_Ctrl=6, Wn3_Options=8,
 };
-union wn3_config {
+enum wn3_config {
-        int i;
+        Ram_size = 7,
-        struct w3_config_fields {
+        Ram_width = 8,
-                unsigned int ram_size:3, ram_width:1, ram_speed:2, rom_size:2;
+        Ram_speed = 0x30,
-                int pad8:8;
+        Rom_size = 0xc0,
-                unsigned int ram_split:2, pad18:2, xcvr:3, pad21:1, autoselect:1;
+        Ram_split_shift = 16,
-                int pad24:7;
+        Ram_split = 3 << Ram_split_shift,
-        } u;
+        Xcvr_shift = 20,
+        Xcvr = 7 << Xcvr_shift,
+        Autoselect = 0x1000000,
 };
 enum Window4 {          /* Window 4: Xcvr/media bits. */
@@ -337,15 +339,15 @@ static int tc574_config(struct pcmcia_device *link)
        struct net_device *dev = link->priv;
        struct el3_private *lp = netdev_priv(dev);
        tuple_t tuple;
-        unsigned short buf[32];
+        __le16 buf[32];
        int last_fn, last_ret, i, j;
        kio_addr_t ioaddr;
-        u16 *phys_addr;
+        __be16 *phys_addr;
        char *cardname;
-        union wn3_config config;
+        __u32 config;
        DECLARE_MAC_BUF(mac);
-        phys_addr = (u16 *)dev->dev_addr;
+        phys_addr = (__be16 *)dev->dev_addr;
        DEBUG(0, "3c574_config(0x%p)\n", link);
@@ -378,12 +380,12 @@ static int tc574_config(struct pcmcia_device *link)
        if (pcmcia_get_first_tuple(link, &tuple) == CS_SUCCESS) {
                pcmcia_get_tuple_data(link, &tuple);
                for (i = 0; i < 3; i++)
-                        phys_addr[i] = htons(buf[i]);
+                        phys_addr[i] = htons(le16_to_cpu(buf[i]));
        } else {
                EL3WINDOW(0);
                for (i = 0; i < 3; i++)
                        phys_addr[i] = htons(read_eeprom(ioaddr, i + 10));
-                if (phys_addr[0] == 0x6060) {
+                if (phys_addr[0] == htons(0x6060)) {
                        printk(KERN_NOTICE "3c574_cs: IO port conflict at 0x%03lx"
                                   "-0x%03lx\n", dev->base_addr, dev->base_addr+15);
                        goto failed;
@@ -401,9 +403,9 @@ static int tc574_config(struct pcmcia_device *link)
                outw(0<<11, ioaddr + RunnerRdCtrl);
                printk(KERN_INFO "  ASIC rev %d,", mcr>>3);
                EL3WINDOW(3);
-                config.i = inl(ioaddr + Wn3_Config);
+                config = inl(ioaddr + Wn3_Config);
-                lp->default_media = config.u.xcvr;
+                lp->default_media = (config & Xcvr) >> Xcvr_shift;
-                lp->autoselect = config.u.autoselect;
+                lp->autoselect = config & Autoselect ? 1 : 0;
        }
        init_timer(&lp->media);
@@ -464,8 +466,9 @@ static int tc574_config(struct pcmcia_device *link)
               dev->name, cardname, dev->base_addr, dev->irq,
               print_mac(mac, dev->dev_addr));
        printk(" %dK FIFO split %s Rx:Tx, %sMII interface.\n",
-                   8 << config.u.ram_size, ram_split[config.u.ram_split],
+                   8 << config & Ram_size,
-                   config.u.autoselect ? "autoselect " : "");
+                   ram_split[(config & Ram_split) >> Ram_split_shift],
+                   config & Autoselect ? "autoselect " : "");
        return 0;
diff --git a/drivers/net/pcmcia/3c589_cs.c b/drivers/net/pcmcia/3c589_cs.c
index a98fe07cce70..e862d14ece79 100644
--- a/drivers/net/pcmcia/3c589_cs.c
+++ b/drivers/net/pcmcia/3c589_cs.c
@@ -251,7 +251,8 @@ static int tc589_config(struct pcmcia_device *link)
    struct net_device *dev = link->priv;
    struct el3_private *lp = netdev_priv(dev);
    tuple_t tuple;
-    u16 buf[32], *phys_addr;
+    __le16 buf[32];
+    __be16 *phys_addr;
    int last_fn, last_ret, i, j, multi = 0, fifo;
    kio_addr_t ioaddr;
    char *ram_split[] = {"5:3", "3:1", "1:1", "3:5"};
@@ -259,7 +260,7 @@ static int tc589_config(struct pcmcia_device *link)
    
    DEBUG(0, "3c589_config(0x%p)\n", link);
-    phys_addr = (u16 *)dev->dev_addr;
+    phys_addr = (__be16 *)dev->dev_addr;
    tuple.Attributes = 0;
    tuple.TupleData = (cisdata_t *)buf;
    tuple.TupleDataMax = sizeof(buf);
@@ -298,11 +299,11 @@ static int tc589_config(struct pcmcia_device *link)
    if (pcmcia_get_first_tuple(link, &tuple) == CS_SUCCESS) {
        pcmcia_get_tuple_data(link, &tuple);
        for (i = 0; i < 3; i++)
-            phys_addr[i] = htons(buf[i]);
+            phys_addr[i] = htons(le16_to_cpu(buf[i]));
    } else {
        for (i = 0; i < 3; i++)
            phys_addr[i] = htons(read_eeprom(ioaddr, i));
-        if (phys_addr[0] == 0x6060) {
+        if (phys_addr[0] == htons(0x6060)) {
            printk(KERN_ERR "3c589_cs: IO port conflict at 0x%03lx"
                   "-0x%03lx\n", dev->base_addr, dev->base_addr+15);
            goto failed;
diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/pcmcia/pcnet_cs.c
index db6a97d1d7b1..51bbd582f16c 100644
--- a/drivers/net/pcmcia/pcnet_cs.c
+++ b/drivers/net/pcmcia/pcnet_cs.c
@@ -1746,6 +1746,7 @@ static struct pcmcia_device_id pcnet_ids[] = {
        PCMCIA_DEVICE_CIS_PROD_ID12("NDC", "Ethernet", 0x01c43ae1, 0x00b2e941, "NE2K.cis"),
        PCMCIA_DEVICE_CIS_PROD_ID12("PMX   ", "PE-200", 0x34f3f1c8, 0x10b59f8c, "PE-200.cis"),
        PCMCIA_DEVICE_CIS_PROD_ID12("TAMARACK", "Ethernet", 0xcf434fba, 0x00b2e941, "tamarack.cis"),
+        PCMCIA_DEVICE_PROD_ID12("Ethernet", "CF Size PC Card", 0x00b2e941, 0x43ac239b),
        PCMCIA_DEVICE_PROD_ID123("Fast Ethernet", "CF Size PC Card", "1.0",
                0xb4be14e3, 0x43ac239b, 0x0877b627),
        PCMCIA_DEVICE_NULL
diff --git a/drivers/net/pcnet32.c b/drivers/net/pcnet32.c
index ff92aca0a7b3..90498ffe26f2 100644
--- a/drivers/net/pcnet32.c
+++ b/drivers/net/pcnet32.c
@@ -455,9 +455,14 @@ static void pcnet32_netif_start(struct net_device *dev)
 {
 #ifdef CONFIG_PCNET32_NAPI
        struct pcnet32_private *lp = netdev_priv(dev);
+        ulong ioaddr = dev->base_addr;
+        u16 val;
 #endif
        netif_wake_queue(dev);
 #ifdef CONFIG_PCNET32_NAPI
+        val = lp->a.read_csr(ioaddr, CSR3);
+        val &= 0x00ff;
+        lp->a.write_csr(ioaddr, CSR3, val);
        napi_enable(&lp->napi);
 #endif
 }
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index 035fd41fb61f..f0574073a2a3 100644
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -143,21 +143,29 @@ static int m88e1111_config_init(struct phy_device *phydev)
        int err;
        if ((phydev->interface == PHY_INTERFACE_MODE_RGMII) ||
-            (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID)) {
+            (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID) ||
+            (phydev->interface == PHY_INTERFACE_MODE_RGMII_RXID) ||
+            (phydev->interface == PHY_INTERFACE_MODE_RGMII_TXID)) {
                int temp;
-                if (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID) {
+                temp = phy_read(phydev, MII_M1111_PHY_EXT_CR);
-                        temp = phy_read(phydev, MII_M1111_PHY_EXT_CR);
+                if (temp < 0)
-                        if (temp < 0)
+                        return temp;
-                                return temp;
+                if (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID) {
                        temp |= (MII_M1111_RX_DELAY | MII_M1111_TX_DELAY);
+                } else if (phydev->interface == PHY_INTERFACE_MODE_RGMII_RXID) {
-                        err = phy_write(phydev, MII_M1111_PHY_EXT_CR, temp);
+                        temp &= ~MII_M1111_TX_DELAY;
-                        if (err < 0)
+                        temp |= MII_M1111_RX_DELAY;
-                                return err;
+                } else if (phydev->interface == PHY_INTERFACE_MODE_RGMII_TXID) {
+                        temp &= ~MII_M1111_RX_DELAY;
+                        temp |= MII_M1111_TX_DELAY;
                }
+                err = phy_write(phydev, MII_M1111_PHY_EXT_CR, temp);
+                if (err < 0)
+                        return err;
                temp = phy_read(phydev, MII_M1111_PHY_EXT_SR);
                if (temp < 0)
                        return temp;
diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c
index fc2f0e695a13..c30196d0ad16 100644
--- a/drivers/net/phy/mdio_bus.c
+++ b/drivers/net/phy/mdio_bus.c
@@ -91,9 +91,12 @@ int mdiobus_register(struct mii_bus *bus)
                        err = device_register(&phydev->dev);
-                        if (err)
+                        if (err) {
                                printk(KERN_ERR "phy %d failed to register\n",
                                                i);
+                                phy_device_free(phydev);
+                                phydev = NULL;
+                        }
                }
                bus->phy_map[i] = phydev;
@@ -110,10 +113,8 @@ void mdiobus_unregister(struct mii_bus *bus)
        int i;
        for (i = 0; i < PHY_MAX_ADDR; i++) {
-                if (bus->phy_map[i]) {
+                if (bus->phy_map[i])
                        device_unregister(&bus->phy_map[i]->dev);
-                        kfree(bus->phy_map[i]);
-                }
        }
 }
 EXPORT_SYMBOL(mdiobus_unregister);
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 9bc11773705b..7c9e6e349503 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -406,6 +406,9 @@ int phy_mii_ioctl(struct phy_device *phydev,
                                && phydev->drv->config_init)
                        phydev->drv->config_init(phydev);
                break;
+        default:
+                return -ENOTTY;
        }
        return 0;
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index f6e484812a98..5b9e1751e1b4 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -44,6 +44,16 @@ static struct phy_driver genphy_driver;
 extern int mdio_bus_init(void);
 extern void mdio_bus_exit(void);
+void phy_device_free(struct phy_device *phydev)
+{
+        kfree(phydev);
+}
+static void phy_device_release(struct device *dev)
+{
+        phy_device_free(to_phy_device(dev));
+}
 struct phy_device* phy_device_create(struct mii_bus *bus, int addr, int phy_id)
 {
        struct phy_device *dev;
@@ -54,6 +64,8 @@ struct phy_device* phy_device_create(struct mii_bus *bus, int addr, int phy_id)
        if (NULL == dev)
                return (struct phy_device*) PTR_ERR((void*)-ENOMEM);
+        dev->dev.release = phy_device_release;
        dev->speed = 0;
        dev->duplex = -1;
        dev->pause = dev->asym_pause = 0;
diff --git a/drivers/net/plip.c b/drivers/net/plip.c
index 5071fcd8a0bd..57c98669984d 100644
--- a/drivers/net/plip.c
+++ b/drivers/net/plip.c
@@ -663,7 +663,7 @@ plip_receive_packet(struct net_device *dev, struct net_local *nl,
        case PLIP_PK_DONE:
                /* Inform the upper layer for the arrival of a packet. */
                rcv->skb->protocol=plip_type_trans(rcv->skb, dev);
-                netif_rx(rcv->skb);
+                netif_rx_ni(rcv->skb);
                dev->last_rx = jiffies;
                dev->stats.rx_bytes += rcv->length.h;
                dev->stats.rx_packets++;
@@ -1269,7 +1269,7 @@ static void plip_attach (struct parport *port)
                nl = netdev_priv(dev);
                nl->dev = dev;
-                nl->pardev = parport_register_device(port, name, plip_preempt,
+                nl->pardev = parport_register_device(port, dev->name, plip_preempt,
                                                 plip_wakeup, plip_interrupt,
                                                 0, dev);
diff --git a/drivers/net/qla3xxx.c b/drivers/net/qla3xxx.c
index a5791114b7bd..cf0774de6c41 100644
--- a/drivers/net/qla3xxx.c
+++ b/drivers/net/qla3xxx.c
@@ -2320,14 +2320,9 @@ static int ql_poll(struct napi_struct *napi, int budget)
        unsigned long hw_flags;
        struct ql3xxx_port_registers __iomem *port_regs = qdev->mem_map_registers;
-        if (!netif_carrier_ok(ndev))
-                goto quit_polling;
        ql_tx_rx_clean(qdev, &tx_cleaned, &rx_cleaned, budget);
-        if (tx_cleaned + rx_cleaned != budget ||
+        if (tx_cleaned + rx_cleaned != budget) {
-            !netif_running(ndev)) {
-quit_polling:
                spin_lock_irqsave(&qdev->hw_lock, hw_flags);
                __netif_rx_complete(ndev, napi);
                ql_update_small_bufq_prod_index(qdev);
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index 1f647b9ce352..3acfeeabdee1 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -2002,7 +2002,7 @@ static void rtl8169_set_magic_reg(void __iomem *ioaddr, unsigned mac_version)
        u32 clk;
        clk = RTL_R8(Config2) & PCI_Clock_66MHz;
-        for (i = 0; i < ARRAY_SIZE(cfg2_info); i++) {
+        for (i = 0; i < ARRAY_SIZE(cfg2_info); i++, p++) {
                if ((p->mac_version == mac_version) && (p->clk == clk)) {
                        RTL_W32(0x7c, p->val);
                        break;
@@ -2211,7 +2211,7 @@ out:
 static inline void rtl8169_make_unusable_by_asic(struct RxDesc *desc)
 {
-        desc->addr = 0x0badbadbadbadbadull;
+        desc->addr = cpu_to_le64(0x0badbadbadbadbadull);
        desc->opts1 &= ~cpu_to_le32(DescOwn | RsvdMask);
 }
@@ -2398,6 +2398,8 @@ static void rtl8169_wait_for_quiescence(struct net_device *dev)
        rtl8169_irq_mask_and_ack(ioaddr);
 #ifdef CONFIG_R8169_NAPI
+        tp->intr_mask = 0xffff;
+        RTL_W16(IntrMask, tp->intr_event);
        napi_enable(&tp->napi);
 #endif
 }
@@ -2835,7 +2837,7 @@ static int rtl8169_rx_interrupt(struct net_device *dev,
                }
                /* Work around for AMD plateform. */
-                if ((desc->opts2 & 0xfffe000) &&
+                if ((desc->opts2 & cpu_to_le32(0xfffe000)) &&
                    (tp->mac_version == RTL_GIGA_MAC_VER_05)) {
                        desc->opts2 = 0;
                        cur_rx++;
diff --git a/drivers/net/rrunner.c b/drivers/net/rrunner.c
index 73a7e6529ee0..55a590ab1e17 100644
--- a/drivers/net/rrunner.c
+++ b/drivers/net/rrunner.c
@@ -294,7 +294,6 @@ static int rr_reset(struct net_device *dev)
 {
        struct rr_private *rrpriv;
        struct rr_regs __iomem *regs;
-        struct eeprom *hw = NULL;
        u32 start_pc;
        int i;
@@ -381,7 +380,8 @@ static int rr_reset(struct net_device *dev)
        writel(RBURST_64|WBURST_64, &regs->PciState);
        wmb();
-        start_pc = rr_read_eeprom_word(rrpriv, &hw->rncd_info.FwStart);
+        start_pc = rr_read_eeprom_word(rrpriv,
+                        offsetof(struct eeprom, rncd_info.FwStart));
 #if (DEBUG > 1)
        printk("%s: Executing firmware at address 0x%06x\n",
@@ -438,12 +438,12 @@ static unsigned int rr_read_eeprom(struct rr_private *rrpriv,
 * it to our CPU byte-order.
 */
 static u32 rr_read_eeprom_word(struct rr_private *rrpriv,
-                            void * offset)
+                            size_t offset)
 {
-        u32 word;
+        __be32 word;
-        if ((rr_read_eeprom(rrpriv, (unsigned long)offset,
+        if ((rr_read_eeprom(rrpriv, offset,
-                            (char *)&word, 4) == 4))
+                            (unsigned char *)&word, 4) == 4))
                return be32_to_cpu(word);
        return 0;
 }
@@ -510,7 +510,6 @@ static int __devinit rr_init(struct net_device *dev)
 {
        struct rr_private *rrpriv;
        struct rr_regs __iomem *regs;
-        struct eeprom *hw = NULL;
        u32 sram_size, rev;
        DECLARE_MAC_BUF(mac);
@@ -545,14 +544,14 @@ static int __devinit rr_init(struct net_device *dev)
         * other method I've seen.  -VAL
         */
-        *(u16 *)(dev->dev_addr) =
+        *(__be16 *)(dev->dev_addr) =
-          htons(rr_read_eeprom_word(rrpriv, &hw->manf.BoardULA));
+          htons(rr_read_eeprom_word(rrpriv, offsetof(struct eeprom, manf.BoardULA)));
-        *(u32 *)(dev->dev_addr+2) =
+        *(__be32 *)(dev->dev_addr+2) =
-          htonl(rr_read_eeprom_word(rrpriv, &hw->manf.BoardULA[4]));
+          htonl(rr_read_eeprom_word(rrpriv, offsetof(struct eeprom, manf.BoardULA[4])));
        printk("  MAC: %s\n", print_mac(mac, dev->dev_addr));
-        sram_size = rr_read_eeprom_word(rrpriv, (void *)8);
+        sram_size = rr_read_eeprom_word(rrpriv, 8);
        printk("  SRAM size 0x%06x\n", sram_size);
        return 0;
@@ -1477,11 +1476,10 @@ static int rr_load_firmware(struct net_device *dev)
 {
        struct rr_private *rrpriv;
        struct rr_regs __iomem *regs;
-        unsigned long eptr, segptr;
+        size_t eptr, segptr;
        int i, j;
        u32 localctrl, sptr, len, tmp;
        u32 p2len, p2size, nr_seg, revision, io, sram_size;
-        struct eeprom *hw = NULL;
        rrpriv = netdev_priv(dev);
        regs = rrpriv->regs;
@@ -1509,7 +1507,7 @@ static int rr_load_firmware(struct net_device *dev)
         */
        io = readl(&regs->ExtIo);
        writel(0, &regs->ExtIo);
-        sram_size = rr_read_eeprom_word(rrpriv, (void *)8);
+        sram_size = rr_read_eeprom_word(rrpriv, 8);
        for (i = 200; i < sram_size / 4; i++){
                writel(i * 4, &regs->WinBase);
@@ -1520,13 +1518,13 @@ static int rr_load_firmware(struct net_device *dev)
        writel(io, &regs->ExtIo);
        mb();
-        eptr = (unsigned long)rr_read_eeprom_word(rrpriv,
+        eptr = rr_read_eeprom_word(rrpriv,
-                                               &hw->rncd_info.AddrRunCodeSegs);
+                       offsetof(struct eeprom, rncd_info.AddrRunCodeSegs));
        eptr = ((eptr & 0x1fffff) >> 3);
-        p2len = rr_read_eeprom_word(rrpriv, (void *)(0x83*4));
+        p2len = rr_read_eeprom_word(rrpriv, 0x83*4);
        p2len = (p2len << 2);
-        p2size = rr_read_eeprom_word(rrpriv, (void *)(0x84*4));
+        p2size = rr_read_eeprom_word(rrpriv, 0x84*4);
        p2size = ((p2size & 0x1fffff) >> 3);
        if ((eptr < p2size) || (eptr > (p2size + p2len))){
@@ -1534,7 +1532,8 @@ static int rr_load_firmware(struct net_device *dev)
                goto out;
        }
-        revision = rr_read_eeprom_word(rrpriv, &hw->manf.HeaderFmt);
+        revision = rr_read_eeprom_word(rrpriv,
+                        offsetof(struct eeprom, manf.HeaderFmt));
        if (revision != 1){
                printk("%s: invalid firmware format (%i)\n",
@@ -1542,18 +1541,18 @@ static int rr_load_firmware(struct net_device *dev)
                goto out;
        }
-        nr_seg = rr_read_eeprom_word(rrpriv, (void *)eptr);
+        nr_seg = rr_read_eeprom_word(rrpriv, eptr);
        eptr +=4;
 #if (DEBUG > 1)
        printk("%s: nr_seg %i\n", dev->name, nr_seg);
 #endif
        for (i = 0; i < nr_seg; i++){
-                sptr = rr_read_eeprom_word(rrpriv, (void *)eptr);
+                sptr = rr_read_eeprom_word(rrpriv, eptr);
                eptr += 4;
-                len = rr_read_eeprom_word(rrpriv, (void *)eptr);
+                len = rr_read_eeprom_word(rrpriv, eptr);
                eptr += 4;
-                segptr = (unsigned long)rr_read_eeprom_word(rrpriv, (void *)eptr);
+                segptr = rr_read_eeprom_word(rrpriv, eptr);
                segptr = ((segptr & 0x1fffff) >> 3);
                eptr += 4;
 #if (DEBUG > 1)
@@ -1561,7 +1560,7 @@ static int rr_load_firmware(struct net_device *dev)
                       dev->name, i, sptr, len, segptr);
 #endif
                for (j = 0; j < len; j++){
-                        tmp = rr_read_eeprom_word(rrpriv, (void *)segptr);
+                        tmp = rr_read_eeprom_word(rrpriv, segptr);
                        writel(sptr, &regs->WinBase);
                        mb();
                        writel(tmp, &regs->WinData);
diff --git a/drivers/net/rrunner.h b/drivers/net/rrunner.h
index 6a79825bc8cf..6173f11218df 100644
--- a/drivers/net/rrunner.h
+++ b/drivers/net/rrunner.h
@@ -838,7 +838,7 @@ static unsigned int rr_read_eeprom(struct rr_private *rrpriv,
                                   unsigned long offset,
                                   unsigned char *buf,
                                   unsigned long length);
-static u32 rr_read_eeprom_word(struct rr_private *rrpriv, void * offset);
+static u32 rr_read_eeprom_word(struct rr_private *rrpriv, size_t offset);
 static int rr_load_firmware(struct net_device *dev);
 static inline void rr_raz_tx(struct rr_private *, struct net_device *);
 static inline void rr_raz_rx(struct rr_private *, struct net_device *);
diff --git a/drivers/net/s2io-regs.h b/drivers/net/s2io-regs.h
index 01f08d726ace..f25264f2638e 100644
--- a/drivers/net/s2io-regs.h
+++ b/drivers/net/s2io-regs.h
@@ -66,6 +66,7 @@ struct XENA_dev_config {
 #define ADAPTER_STATUS_RC_PRC_QUIESCENT    vBIT(0xFF,16,8)
 #define ADAPTER_STATUS_MC_DRAM_READY       s2BIT(24)
 #define ADAPTER_STATUS_MC_QUEUES_READY     s2BIT(25)
+#define ADAPTER_STATUS_RIC_RUNNING         s2BIT(26)
 #define ADAPTER_STATUS_M_PLL_LOCK          s2BIT(30)
 #define ADAPTER_STATUS_P_PLL_LOCK          s2BIT(31)
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index 632666706247..f2ba944e035e 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -84,7 +84,7 @@
 #include "s2io.h"
 #include "s2io-regs.h"
-#define DRV_VERSION "2.0.26.6"
+#define DRV_VERSION "2.0.26.17"
 /* S2io Driver name & version. */
 static char s2io_driver_name[] = "Neterion";
@@ -1081,7 +1081,7 @@ static int init_nic(struct s2io_nic *nic)
        /* to set the swapper controle on the card */
        if(s2io_set_swapper(nic)) {
                DBG_PRINT(ERR_DBG,"ERROR: Setting Swapper failed\n");
-                return -1;
+                return -EIO;
        }
        /*
@@ -1100,6 +1100,20 @@ static int init_nic(struct s2io_nic *nic)
        msleep(500);
        val64 = readq(&bar0->sw_reset);
+        /* Ensure that it's safe to access registers by checking
+         * RIC_RUNNING bit is reset. Check is valid only for XframeII.
+         */
+        if (nic->device_type == XFRAME_II_DEVICE) {
+                for (i = 0; i < 50; i++) {
+                        val64 = readq(&bar0->adapter_status);
+                        if (!(val64 & ADAPTER_STATUS_RIC_RUNNING))
+                                break;
+                        msleep(10);
+                }
+                if (i == 50)
+                        return -ENODEV;
+        }
        /*  Enable Receiving broadcasts */
        add = &bar0->mac_cfg;
        val64 = readq(&bar0->mac_cfg);
@@ -1503,7 +1517,7 @@ static int init_nic(struct s2io_nic *nic)
                        DBG_PRINT(ERR_DBG, "%s: failed rts ds steering",
                                dev->name);
                        DBG_PRINT(ERR_DBG, "set on codepoint %d\n", i);
-                        return FAILURE;
+                        return -ENODEV;
                }
        }
@@ -1570,7 +1584,7 @@ static int init_nic(struct s2io_nic *nic)
                if (time > 10) {
                        DBG_PRINT(ERR_DBG, "%s: TTI init Failed\n",
                                  dev->name);
-                        return -1;
+                        return -ENODEV;
                }
                msleep(50);
                time++;
@@ -1623,7 +1637,7 @@ static int init_nic(struct s2io_nic *nic)
                        if (time > 10) {
                                DBG_PRINT(ERR_DBG, "%s: RTI init Failed\n",
                                          dev->name);
-                                return -1;
+                                return -ENODEV;
                        }
                        time++;
                        msleep(50);
@@ -2690,9 +2704,6 @@ static int s2io_poll(struct napi_struct *napi, int budget)
        struct XENA_dev_config __iomem *bar0 = nic->bar0;
        int i;
-        if (!is_s2io_card_up(nic))
-                return 0;
        mac_control = &nic->mac_control;
        config = &nic->config;
@@ -3723,7 +3734,7 @@ static int s2io_enable_msi_x(struct s2io_nic *nic)
 }
 /* Handle software interrupt used during MSI(X) test */
-static irqreturn_t __devinit s2io_test_intr(int irq, void *dev_id)
+static irqreturn_t s2io_test_intr(int irq, void *dev_id)
 {
        struct s2io_nic *sp = dev_id;
@@ -3734,7 +3745,7 @@ static irqreturn_t __devinit s2io_test_intr(int irq, void *dev_id)
 }
 /* Test interrupt path by forcing a a software IRQ */
-static int __devinit s2io_test_msi(struct s2io_nic *sp)
+static int s2io_test_msi(struct s2io_nic *sp)
 {
        struct pci_dev *pdev = sp->pdev;
        struct XENA_dev_config __iomem *bar0 = sp->bar0;
@@ -3837,8 +3848,6 @@ static int s2io_open(struct net_device *dev)
        netif_carrier_off(dev);
        sp->last_link_state = 0;
-        napi_enable(&sp->napi);
        if (sp->config.intr_type == MSI_X) {
                int ret = s2io_enable_msi_x(sp);
@@ -3881,7 +3890,6 @@ static int s2io_open(struct net_device *dev)
        return 0;
 hw_init_failed:
-        napi_disable(&sp->napi);
        if (sp->config.intr_type == MSI_X) {
                if (sp->entries) {
                        kfree(sp->entries);
@@ -3914,8 +3922,13 @@ static int s2io_close(struct net_device *dev)
 {
        struct s2io_nic *sp = dev->priv;
+        /* Return if the device is already closed               *
+        *  Can happen when s2io_card_up failed in change_mtu    *
+        */
+        if (!is_s2io_card_up(sp))
+                return 0;
        netif_stop_queue(dev);
-        napi_disable(&sp->napi);
        /* Reset card, kill tasklet and free Tx and Rx buffers. */
        s2io_card_down(sp);
@@ -6355,6 +6368,7 @@ static int s2io_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 static int s2io_change_mtu(struct net_device *dev, int new_mtu)
 {
        struct s2io_nic *sp = dev->priv;
+        int ret = 0;
        if ((new_mtu < MIN_MTU) || (new_mtu > S2IO_JUMBO_SIZE)) {
                DBG_PRINT(ERR_DBG, "%s: MTU size is invalid.\n",
@@ -6366,9 +6380,11 @@ static int s2io_change_mtu(struct net_device *dev, int new_mtu)
        if (netif_running(dev)) {
                s2io_card_down(sp);
                netif_stop_queue(dev);
-                if (s2io_card_up(sp)) {
+                ret = s2io_card_up(sp);
+                if (ret) {
                        DBG_PRINT(ERR_DBG, "%s: Device bring up failed\n",
                                  __FUNCTION__);
+                        return ret;
                }
                if (netif_queue_stopped(dev))
                        netif_wake_queue(dev);
@@ -6379,7 +6395,7 @@ static int s2io_change_mtu(struct net_device *dev, int new_mtu)
                writeq(vBIT(val64, 2, 14), &bar0->rmac_max_pyld_len);
        }
-        return 0;
+        return ret;
 }
 /**
@@ -6776,6 +6792,11 @@ static void do_s2io_card_down(struct s2io_nic * sp, int do_io)
        struct XENA_dev_config __iomem *bar0 = sp->bar0;
        unsigned long flags;
        register u64 val64 = 0;
+        struct config_param *config;
+        config = &sp->config;
+        if (!is_s2io_card_up(sp))
+                return;
        del_timer_sync(&sp->alarm_timer);
        /* If s2io_set_link task is executing, wait till it completes. */
@@ -6784,6 +6805,10 @@ static void do_s2io_card_down(struct s2io_nic * sp, int do_io)
        }
        clear_bit(__S2IO_STATE_CARD_UP, &sp->state);
+        /* Disable napi */
+        if (config->napi)
+                napi_disable(&sp->napi);
        /* disable Tx and Rx traffic on the NIC */
        if (do_io)
                stop_nic(sp);
@@ -6850,11 +6875,13 @@ static int s2io_card_up(struct s2io_nic * sp)
        u16 interruptible;
        /* Initialize the H/W I/O registers */
-        if (init_nic(sp) != 0) {
+        ret = init_nic(sp);
+        if (ret != 0) {
                DBG_PRINT(ERR_DBG, "%s: H/W initialization failed\n",
                          dev->name);
-                s2io_reset(sp);
+                if (ret != -EIO)
-                return -ENODEV;
+                        s2io_reset(sp);
+                return ret;
        }
        /*
@@ -6875,6 +6902,11 @@ static int s2io_card_up(struct s2io_nic * sp)
                DBG_PRINT(INFO_DBG, "Buf in ring:%d is %d:\n", i,
                          atomic_read(&sp->rx_bufs_left[i]));
        }
+        /* Initialise napi */
+        if (config->napi)
+                napi_enable(&sp->napi);
        /* Maintain the state prior to the open */
        if (sp->promisc_flg)
                sp->promisc_flg = 0;
diff --git a/drivers/net/sis190.c b/drivers/net/sis190.c
index 720088396bb9..b570402f7fed 100644
--- a/drivers/net/sis190.c
+++ b/drivers/net/sis190.c
@@ -372,7 +372,7 @@ static void __mdio_cmd(void __iomem *ioaddr, u32 ctl)
                msleep(1);
        }
-        if (i > 999)
+        if (i > 99)
                printk(KERN_ERR PFX "PHY command failed !\n");
 }
@@ -474,7 +474,7 @@ static inline void sis190_map_to_asic(struct RxDesc *desc, dma_addr_t mapping,
 static inline void sis190_make_unusable_by_asic(struct RxDesc *desc)
 {
        desc->PSize = 0x0;
-        desc->addr = 0xdeadbeef;
+        desc->addr = cpu_to_le32(0xdeadbeef);
        desc->size &= cpu_to_le32(RingEnd);
        wmb();
        desc->status = 0x0;
@@ -580,7 +580,7 @@ static int sis190_rx_interrupt(struct net_device *dev,
                struct RxDesc *desc = tp->RxDescRing + entry;
                u32 status;
-                if (desc->status & OWNbit)
+                if (le32_to_cpu(desc->status) & OWNbit)
                        break;
                status = le32_to_cpu(desc->PSize);
@@ -847,10 +847,8 @@ static void sis190_soft_reset(void __iomem *ioaddr)
 {
        SIS_W32(IntrControl, 0x8000);
        SIS_PCI_COMMIT();
-        msleep(1);
        SIS_W32(IntrControl, 0x0);
        sis190_asic_down(ioaddr);
-        msleep(1);
 }
 static void sis190_hw_start(struct net_device *dev)
@@ -1041,8 +1039,6 @@ static int sis190_open(struct net_device *dev)
        if (rc < 0)
                goto err_free_rx_1;
-        INIT_WORK(&tp->phy_task, sis190_phy_task);
        sis190_request_timer(dev);
        rc = request_irq(dev->irq, sis190_interrupt, IRQF_SHARED, dev->name, dev);
@@ -1381,7 +1377,7 @@ out:
        return rc;
 }
-static void __devexit sis190_mii_remove(struct net_device *dev)
+static void sis190_mii_remove(struct net_device *dev)
 {
        struct sis190_private *tp = netdev_priv(dev);
@@ -1538,9 +1534,9 @@ static int __devinit sis190_get_mac_addr_from_eeprom(struct pci_dev *pdev,
        /* Get MAC address from EEPROM */
        for (i = 0; i < MAC_ADDR_LEN / 2; i++) {
-                __le16 w = sis190_read_eeprom(ioaddr, EEPROMMACAddr + i);
+                u16 w = sis190_read_eeprom(ioaddr, EEPROMMACAddr + i);
-                ((u16 *)dev->dev_addr)[i] = le16_to_cpu(w);
+                ((__le16 *)dev->dev_addr)[i] = cpu_to_le16(w);
        }
        sis190_set_rgmii(tp, sis190_read_eeprom(ioaddr, EEPROMInfo));
@@ -1549,28 +1545,31 @@ static int __devinit sis190_get_mac_addr_from_eeprom(struct pci_dev *pdev,
 }
 /**
- *      sis190_get_mac_addr_from_apc - Get MAC address for SiS965 model
+ *      sis190_get_mac_addr_from_apc - Get MAC address for SiS96x model
 *      @pdev: PCI device
 *      @dev:  network device to get address for
 *
- *      SiS965 model, use APC CMOS RAM to store MAC address.
+ *      SiS96x model, use APC CMOS RAM to store MAC address.
 *      APC CMOS RAM is accessed through ISA bridge.
 *      MAC address is read into @net_dev->dev_addr.
 */
 static int __devinit sis190_get_mac_addr_from_apc(struct pci_dev *pdev,
                                                  struct net_device *dev)
 {
+        static const u16 __devinitdata ids[] = { 0x0965, 0x0966, 0x0968 };
        struct sis190_private *tp = netdev_priv(dev);
        struct pci_dev *isa_bridge;
        u8 reg, tmp8;
-        int i;
+        unsigned int i;
        net_probe(tp, KERN_INFO "%s: Read MAC address from APC.\n",
                  pci_name(pdev));
-        isa_bridge = pci_get_device(PCI_VENDOR_ID_SI, 0x0965, NULL);
+        for (i = 0; i < ARRAY_SIZE(ids); i++) {
-        if (!isa_bridge)
+                isa_bridge = pci_get_device(PCI_VENDOR_ID_SI, ids[i], NULL);
-                isa_bridge = pci_get_device(PCI_VENDOR_ID_SI, 0x0966, NULL);
+                if (isa_bridge)
+                        break;
+        }
        if (!isa_bridge) {
                net_probe(tp, KERN_INFO "%s: Can not find ISA bridge.\n",
diff --git a/drivers/net/skge.c b/drivers/net/skge.c
index 6d62250fba07..186eb8ebfda6 100644
--- a/drivers/net/skge.c
+++ b/drivers/net/skge.c
@@ -44,7 +44,7 @@
 #include "skge.h"
 #define DRV_NAME                "skge"
-#define DRV_VERSION             "1.12"
+#define DRV_VERSION             "1.13"
 #define PFX                     DRV_NAME " "
 #define DEFAULT_TX_RING_SIZE    128
@@ -1095,16 +1095,9 @@ static void xm_link_down(struct skge_hw *hw, int port)
 {
        struct net_device *dev = hw->dev[port];
        struct skge_port *skge = netdev_priv(dev);
-        u16 cmd = xm_read16(hw, port, XM_MMU_CMD);
        xm_write16(hw, port, XM_IMSK, XM_IMSK_DISABLE);
-        cmd &= ~(XM_MMU_ENA_RX | XM_MMU_ENA_TX);
-        xm_write16(hw, port, XM_MMU_CMD, cmd);
-        /* dummy read to ensure writing */
-        xm_read16(hw, port, XM_MMU_CMD);
        if (netif_carrier_ok(dev))
                skge_link_down(skge);
 }
@@ -1194,6 +1187,7 @@ static void genesis_init(struct skge_hw *hw)
 static void genesis_reset(struct skge_hw *hw, int port)
 {
        const u8 zero[8]  = { 0 };
+        u32 reg;
        skge_write8(hw, SK_REG(port, GMAC_IRQ_MSK), 0);
@@ -1209,6 +1203,11 @@ static void genesis_reset(struct skge_hw *hw, int port)
                xm_write16(hw, port, PHY_BCOM_INT_MASK, 0xffff);
        xm_outhash(hw, port, XM_HSM, zero);
+        /* Flush TX and RX fifo */
+        reg = xm_read32(hw, port, XM_MODE);
+        xm_write32(hw, port, XM_MODE, reg | XM_MD_FTF);
+        xm_write32(hw, port, XM_MODE, reg | XM_MD_FRF);
 }
@@ -1634,15 +1633,14 @@ static void genesis_mac_init(struct skge_hw *hw, int port)
        }
        xm_write16(hw, port, XM_RX_CMD, r);
        /* We want short frames padded to 60 bytes. */
        xm_write16(hw, port, XM_TX_CMD, XM_TX_AUTO_PAD);
-        /*
+        /* Increase threshold for jumbo frames on dual port */
-         * Bump up the transmit threshold. This helps hold off transmit
+        if (hw->ports > 1 && jumbo)
-         * underruns when we're blasting traffic from both ports at once.
+                xm_write16(hw, port, XM_TX_THR, 1020);
-         */
+        else
-        xm_write16(hw, port, XM_TX_THR, 512);
+                xm_write16(hw, port, XM_TX_THR, 512);
        /*
         * Enable the reception of all error frames. This is is
@@ -1713,7 +1711,13 @@ static void genesis_stop(struct skge_port *skge)
 {
        struct skge_hw *hw = skge->hw;
        int port = skge->port;
-        u32 reg;
+        unsigned retries = 1000;
+        u16 cmd;
+        /* Disable Tx and Rx */
+        cmd = xm_read16(hw, port, XM_MMU_CMD);
+        cmd &= ~(XM_MMU_ENA_RX | XM_MMU_ENA_TX);
+        xm_write16(hw, port, XM_MMU_CMD, cmd);
        genesis_reset(hw, port);
@@ -1721,20 +1725,17 @@ static void genesis_stop(struct skge_port *skge)
        skge_write16(hw, B3_PA_CTRL,
                     port == 0 ? PA_CLR_TO_TX1 : PA_CLR_TO_TX2);
-        /*
-         * If the transfer sticks at the MAC the STOP command will not
-         * terminate if we don't flush the XMAC's transmit FIFO !
-         */
-        xm_write32(hw, port, XM_MODE,
-                        xm_read32(hw, port, XM_MODE)|XM_MD_FTF);
        /* Reset the MAC */
-        skge_write16(hw, SK_REG(port, TX_MFF_CTRL1), MFF_SET_MAC_RST);
+        skge_write16(hw, SK_REG(port, TX_MFF_CTRL1), MFF_CLR_MAC_RST);
+        do {
+                skge_write16(hw, SK_REG(port, TX_MFF_CTRL1), MFF_SET_MAC_RST);
+                if (!(skge_read16(hw, SK_REG(port, TX_MFF_CTRL1)) & MFF_SET_MAC_RST))
+                        break;
+        } while (--retries > 0);
        /* For external PHYs there must be special handling */
        if (hw->phy_type != SK_PHY_XMAC) {
-                reg = skge_read32(hw, B2_GP_IO);
+                u32 reg = skge_read32(hw, B2_GP_IO);
                if (port == 0) {
                        reg |= GP_DIR_0;
                        reg &= ~GP_IO_0;
@@ -1801,11 +1802,6 @@ static void genesis_mac_intr(struct skge_hw *hw, int port)
                xm_write32(hw, port, XM_MODE, XM_MD_FTF);
                ++dev->stats.tx_fifo_errors;
        }
-        if (status & XM_IS_RXF_OV) {
-                xm_write32(hw, port, XM_MODE, XM_MD_FRF);
-                ++dev->stats.rx_fifo_errors;
-        }
 }
 static void genesis_link_up(struct skge_port *skge)
@@ -1862,9 +1858,9 @@ static void genesis_link_up(struct skge_port *skge)
        xm_write32(hw, port, XM_MODE, mode);
-        /* Turn on detection of Tx underrun, Rx overrun */
+        /* Turn on detection of Tx underrun */
        msk = xm_read16(hw, port, XM_IMSK);
-        msk &= ~(XM_IS_RXF_OV | XM_IS_TXF_UR);
+        msk &= ~XM_IS_TXF_UR;
        xm_write16(hw, port, XM_IMSK, msk);
        xm_read16(hw, port, XM_ISRC);
@@ -2194,9 +2190,12 @@ static void yukon_mac_init(struct skge_hw *hw, int port)
                         TX_JAM_IPG_VAL(TX_JAM_IPG_DEF) |
                         TX_IPG_JAM_DATA(TX_IPG_JAM_DEF));
-        /* serial mode register */
+        /* configure the Serial Mode Register */
-        reg = GM_SMOD_VLAN_ENA | IPG_DATA_VAL(IPG_DATA_DEF);
+        reg = DATA_BLIND_VAL(DATA_BLIND_DEF)
-        if (hw->dev[port]->mtu > 1500)
+                | GM_SMOD_VLAN_ENA
+                | IPG_DATA_VAL(IPG_DATA_DEF);
+        if (hw->dev[port]->mtu > ETH_DATA_LEN)
                reg |= GM_SMOD_JUMBO_ENA;
        gma_write16(hw, port, GM_SERIAL_MODE, reg);
@@ -2619,8 +2618,8 @@ static int skge_up(struct net_device *dev)
                yukon_mac_init(hw, port);
        spin_unlock_bh(&hw->phy_lock);
-        /* Configure RAMbuffers */
+        /* Configure RAMbuffers - equally between ports and tx/rx */
-        chunk = hw->ram_size / ((hw->ports + 1)*2);
+        chunk = (hw->ram_size  - hw->ram_offset) / (hw->ports * 2);
        ram_addr = hw->ram_offset + 2 * chunk * port;
        skge_ramset(hw, rxqaddr[port], ram_addr, chunk);
@@ -2897,11 +2896,7 @@ static void skge_tx_timeout(struct net_device *dev)
 static int skge_change_mtu(struct net_device *dev, int new_mtu)
 {
-        struct skge_port *skge = netdev_priv(dev);
-        struct skge_hw *hw = skge->hw;
-        int port = skge->port;
        int err;
-        u16 ctl, reg;
        if (new_mtu < ETH_ZLEN || new_mtu > ETH_JUMBO_MTU)
                return -EINVAL;
@@ -2911,40 +2906,13 @@ static int skge_change_mtu(struct net_device *dev, int new_mtu)
                return 0;
        }
-        skge_write32(hw, B0_IMSK, 0);
+        skge_down(dev);
-        dev->trans_start = jiffies;     /* prevent tx timeout */
-        netif_stop_queue(dev);
-        napi_disable(&skge->napi);
-        ctl = gma_read16(hw, port, GM_GP_CTRL);
-        gma_write16(hw, port, GM_GP_CTRL, ctl & ~GM_GPCR_RX_ENA);
-        skge_rx_clean(skge);
-        skge_rx_stop(hw, port);
        dev->mtu = new_mtu;
-        reg = GM_SMOD_VLAN_ENA | IPG_DATA_VAL(IPG_DATA_DEF);
+        err = skge_up(dev);
-        if (new_mtu > 1500)
-                reg |= GM_SMOD_JUMBO_ENA;
-        gma_write16(hw, port, GM_SERIAL_MODE, reg);
-        skge_write8(hw, RB_ADDR(rxqaddr[port], RB_CTRL), RB_ENA_OP_MD);
-        err = skge_rx_fill(dev);
-        wmb();
-        if (!err)
-                skge_write8(hw, Q_ADDR(rxqaddr[port], Q_CSR), CSR_START | CSR_IRQ_CL_F);
-        skge_write32(hw, B0_IMSK, hw->intr_mask);
        if (err)
                dev_close(dev);
-        else {
-                gma_write16(hw, port, GM_GP_CTRL, ctl);
-                napi_enable(&skge->napi);
-                netif_wake_queue(dev);
-        }
        return err;
 }
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index a2070db725c9..bc15940ce1bc 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -31,7 +31,6 @@
 #include <linux/etherdevice.h>
 #include <linux/ethtool.h>
 #include <linux/pci.h>
-#include <linux/aer.h>
 #include <linux/ip.h>
 #include <net/ip.h>
 #include <linux/tcp.h>
@@ -240,22 +239,21 @@ static void sky2_power_on(struct sky2_hw *hw)
                sky2_write8(hw, B2_Y2_CLK_GATE, 0);
        if (hw->flags & SKY2_HW_ADV_POWER_CTL) {
-                struct pci_dev *pdev = hw->pdev;
                u32 reg;
-                pci_write_config_dword(pdev, PCI_DEV_REG3, 0);
+                sky2_pci_write32(hw, PCI_DEV_REG3, 0);
-                pci_read_config_dword(pdev, PCI_DEV_REG4, &reg);
+                reg = sky2_pci_read32(hw, PCI_DEV_REG4);
                /* set all bits to 0 except bits 15..12 and 8 */
                reg &= P_ASPM_CONTROL_MSK;
-                pci_write_config_dword(pdev, PCI_DEV_REG4, reg);
+                sky2_pci_write32(hw, PCI_DEV_REG4, reg);
-                pci_read_config_dword(pdev, PCI_DEV_REG5, &reg);
+                reg = sky2_pci_read32(hw, PCI_DEV_REG5);
                /* set all bits to 0 except bits 28 & 27 */
                reg &= P_CTL_TIM_VMAIN_AV_MSK;
-                pci_write_config_dword(pdev, PCI_DEV_REG5, reg);
+                sky2_pci_write32(hw, PCI_DEV_REG5, reg);
-                pci_write_config_dword(pdev, PCI_CFG_REG_1, 0);
+                sky2_pci_write32(hw, PCI_CFG_REG_1, 0);
                /* Enable workaround for dev 4.107 on Yukon-Ultra & Extreme */
                reg = sky2_read32(hw, B2_GP_IO);
@@ -619,12 +617,11 @@ static void sky2_phy_init(struct sky2_hw *hw, unsigned port)
 static void sky2_phy_power(struct sky2_hw *hw, unsigned port, int onoff)
 {
-        struct pci_dev *pdev = hw->pdev;
        u32 reg1;
        static const u32 phy_power[] = { PCI_Y2_PHY1_POWD, PCI_Y2_PHY2_POWD };
        static const u32 coma_mode[] = { PCI_Y2_PHY1_COMA, PCI_Y2_PHY2_COMA };
-        pci_read_config_dword(pdev, PCI_DEV_REG1, &reg1);
+        reg1 = sky2_pci_read32(hw, PCI_DEV_REG1);
        /* Turn on/off phy power saving */
        if (onoff)
                reg1 &= ~phy_power[port];
@@ -634,8 +631,8 @@ static void sky2_phy_power(struct sky2_hw *hw, unsigned port, int onoff)
        if (onoff && hw->chip_id == CHIP_ID_YUKON_XL && hw->chip_rev > 1)
                reg1 |= coma_mode[port];
-        pci_write_config_dword(pdev, PCI_DEV_REG1, reg1);
+        sky2_pci_write32(hw, PCI_DEV_REG1, reg1);
-        pci_read_config_dword(pdev, PCI_DEV_REG1, &reg1);
+        reg1 = sky2_pci_read32(hw, PCI_DEV_REG1);
        udelay(100);
 }
@@ -704,9 +701,9 @@ static void sky2_wol_init(struct sky2_port *sky2)
        sky2_write16(hw, WOL_REGS(port, WOL_CTRL_STAT), ctrl);
        /* Turn on legacy PCI-Express PME mode */
-        pci_read_config_dword(hw->pdev, PCI_DEV_REG1, &reg1);
+        reg1 = sky2_pci_read32(hw, PCI_DEV_REG1);
        reg1 |= PCI_Y2_PME_LEGACY;
-        pci_write_config_dword(hw->pdev, PCI_DEV_REG1, reg1);
+        sky2_pci_write32(hw, PCI_DEV_REG1, reg1);
        /* block receiver */
        sky2_write8(hw, SK_REG(port, RX_GMF_CTRL_T), GMF_RST_SET);
@@ -825,8 +822,13 @@ static void sky2_mac_init(struct sky2_hw *hw, unsigned port)
        sky2_write32(hw, SK_REG(port, RX_GMF_CTRL_T), rx_reg);
-        /* Flush Rx MAC FIFO on any flow control or error */
+        if (hw->chip_id == CHIP_ID_YUKON_XL) {
-        sky2_write16(hw, SK_REG(port, RX_GMF_FL_MSK), GMR_FS_ANY_ERR);
+                /* Hardware errata - clear flush mask */
+                sky2_write16(hw, SK_REG(port, RX_GMF_FL_MSK), 0);
+        } else {
+                /* Flush Rx MAC FIFO on any flow control or error */
+                sky2_write16(hw, SK_REG(port, RX_GMF_FL_MSK), GMR_FS_ANY_ERR);
+        }
        /* Set threshold to 0xa (64 bytes) + 1 to workaround pause bug  */
        reg = RX_GMF_FL_THR_DEF + 1;
@@ -848,6 +850,13 @@ static void sky2_mac_init(struct sky2_hw *hw, unsigned port)
                sky2_set_tx_stfwd(hw, port);
        }
+        if (hw->chip_id == CHIP_ID_YUKON_FE_P &&
+            hw->chip_rev == CHIP_REV_YU_FE2_A0) {
+                /* disable dynamic watermark */
+                reg = sky2_read16(hw, SK_REG(port, TX_GMF_EA));
+                reg &= ~TX_DYN_WM_ENA;
+                sky2_write16(hw, SK_REG(port, TX_GMF_EA), reg);
+        }
 }
 /* Assign Ram Buffer allocation to queue */
@@ -935,7 +944,6 @@ static void tx_init(struct sky2_port *sky2)
        le = get_tx_le(sky2);
        le->addr = 0;
        le->opcode = OP_ADDR64 | HW_OWNER;
-        sky2->tx_addr64 = 0;
 }
 static inline struct tx_ring_info *tx_le_re(struct sky2_port *sky2,
@@ -969,13 +977,11 @@ static void sky2_rx_add(struct sky2_port *sky2,  u8 op,
                        dma_addr_t map, unsigned len)
 {
        struct sky2_rx_le *le;
-        u32 hi = upper_32_bits(map);
-        if (sky2->rx_addr64 != hi) {
+        if (sizeof(dma_addr_t) > sizeof(u32)) {
                le = sky2_next_rx(sky2);
-                le->addr = cpu_to_le32(hi);
+                le->addr = cpu_to_le32(upper_32_bits(map));
                le->opcode = OP_ADDR64 | HW_OWNER;
-                sky2->rx_addr64 = upper_32_bits(map + len);
        }
        le = sky2_next_rx(sky2);
@@ -1159,6 +1165,7 @@ static void sky2_vlan_rx_register(struct net_device *dev, struct vlan_group *grp
                             TX_VLAN_TAG_OFF);
        }
+        sky2_read32(hw, B0_Y2_SP_LISR);
        napi_enable(&hw->napi);
        netif_tx_unlock_bh(dev);
 }
@@ -1320,15 +1327,12 @@ static int sky2_up(struct net_device *dev)
         */
        if (otherdev && netif_running(otherdev) &&
            (cap = pci_find_capability(hw->pdev, PCI_CAP_ID_PCIX))) {
-                struct sky2_port *osky2 = netdev_priv(otherdev);
                u16 cmd;
-                pci_read_config_word(hw->pdev, cap + PCI_X_CMD, &cmd);
+                cmd = sky2_pci_read16(hw, cap + PCI_X_CMD);
                cmd &= ~PCI_X_CMD_MAX_SPLIT;
-                pci_write_config_word(hw->pdev, cap + PCI_X_CMD, cmd);
+                sky2_pci_write16(hw, cap + PCI_X_CMD, cmd);
-                sky2->rx_csum = 0;
-                osky2->rx_csum = 0;
        }
        if (netif_msg_ifup(sky2))
@@ -1473,7 +1477,6 @@ static int sky2_xmit_frame(struct sk_buff *skb, struct net_device *dev)
        struct tx_ring_info *re;
        unsigned i, len;
        dma_addr_t mapping;
-        u32 addr64;
        u16 mss;
        u8 ctrl;
@@ -1486,15 +1489,12 @@ static int sky2_xmit_frame(struct sk_buff *skb, struct net_device *dev)
        len = skb_headlen(skb);
        mapping = pci_map_single(hw->pdev, skb->data, len, PCI_DMA_TODEVICE);
-        addr64 = upper_32_bits(mapping);
-        /* Send high bits if changed or crosses boundary */
+        /* Send high bits if needed */
-        if (addr64 != sky2->tx_addr64 ||
+        if (sizeof(dma_addr_t) > sizeof(u32)) {
-            upper_32_bits(mapping + len) != sky2->tx_addr64) {
                le = get_tx_le(sky2);
-                le->addr = cpu_to_le32(addr64);
+                le->addr = cpu_to_le32(upper_32_bits(mapping));
                le->opcode = OP_ADDR64 | HW_OWNER;
-                sky2->tx_addr64 = upper_32_bits(mapping + len);
        }
        /* Check for TCP Segmentation Offload */
@@ -1575,13 +1575,12 @@ static int sky2_xmit_frame(struct sk_buff *skb, struct net_device *dev)
                mapping = pci_map_page(hw->pdev, frag->page, frag->page_offset,
                                       frag->size, PCI_DMA_TODEVICE);
-                addr64 = upper_32_bits(mapping);
-                if (addr64 != sky2->tx_addr64) {
+                if (sizeof(dma_addr_t) > sizeof(u32)) {
                        le = get_tx_le(sky2);
-                        le->addr = cpu_to_le32(addr64);
+                        le->addr = cpu_to_le32(upper_32_bits(mapping));
                        le->ctrl = 0;
                        le->opcode = OP_ADDR64 | HW_OWNER;
-                        sky2->tx_addr64 = addr64;
                }
                le = get_tx_le(sky2);
@@ -2037,6 +2036,7 @@ static int sky2_change_mtu(struct net_device *dev, int new_mtu)
        err = sky2_rx_start(sky2);
        sky2_write32(hw, B0_IMSK, imask);
+        sky2_read32(hw, B0_Y2_SP_LISR);
        napi_enable(&hw->napi);
        if (err)
@@ -2426,37 +2426,26 @@ static void sky2_hw_intr(struct sky2_hw *hw)
        if (status & (Y2_IS_MST_ERR | Y2_IS_IRQ_STAT)) {
                u16 pci_err;
-                pci_read_config_word(pdev, PCI_STATUS, &pci_err);
+                pci_err = sky2_pci_read16(hw, PCI_STATUS);
                if (net_ratelimit())
                        dev_err(&pdev->dev, "PCI hardware error (0x%x)\n",
                                pci_err);
-                pci_write_config_word(pdev, PCI_STATUS,
+                sky2_pci_write16(hw, PCI_STATUS,
                                      pci_err | PCI_STATUS_ERROR_BITS);
        }
        if (status & Y2_IS_PCI_EXP) {
                /* PCI-Express uncorrectable Error occurred */
-                int aer = pci_find_aer_capability(hw->pdev);
                u32 err;
-                if (aer) {
+                err = sky2_read32(hw, Y2_CFG_AER + PCI_ERR_UNCOR_STATUS);
-                        pci_read_config_dword(pdev, aer + PCI_ERR_UNCOR_STATUS,
+                sky2_write32(hw, Y2_CFG_AER + PCI_ERR_UNCOR_STATUS,
-                                              &err);
+                             0xfffffffful);
-                        pci_cleanup_aer_uncorrect_error_status(pdev);
-                } else {
-                        /* Either AER not configured, or not working
-                         * because of bad MMCONFIG, so just do recover
-                         * manually.
-                         */
-                        err = sky2_read32(hw, Y2_CFG_AER + PCI_ERR_UNCOR_STATUS);
-                        sky2_write32(hw, Y2_CFG_AER + PCI_ERR_UNCOR_STATUS,
-                                     0xfffffffful);
-                }
                if (net_ratelimit())
                        dev_err(&pdev->dev, "PCI Express error (0x%x)\n", err);
+                sky2_read32(hw, Y2_CFG_AER + PCI_ERR_UNCOR_STATUS);
        }
        if (status & Y2_HWE_L1_MASK)
@@ -2703,13 +2692,10 @@ static inline u32 sky2_clk2us(const struct sky2_hw *hw, u32 clk)
 static int __devinit sky2_init(struct sky2_hw *hw)
 {
-        int rc;
        u8 t8;
        /* Enable all clocks and check for bad PCI access */
-        rc = pci_write_config_dword(hw->pdev, PCI_DEV_REG3, 0);
+        sky2_pci_write32(hw, PCI_DEV_REG3, 0);
-        if (rc)
-                return rc;
        sky2_write8(hw, B0_CTST, CS_RST_CLR);
@@ -2806,32 +2792,21 @@ static void sky2_reset(struct sky2_hw *hw)
        sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_ON);
        /* clear PCI errors, if any */
-        pci_read_config_word(pdev, PCI_STATUS, &status);
+        status = sky2_pci_read16(hw, PCI_STATUS);
        status |= PCI_STATUS_ERROR_BITS;
-        pci_write_config_word(pdev, PCI_STATUS, status);
+        sky2_pci_write16(hw, PCI_STATUS, status);
        sky2_write8(hw, B0_CTST, CS_MRST_CLR);
        cap = pci_find_capability(pdev, PCI_CAP_ID_EXP);
        if (cap) {
-                if (pci_find_aer_capability(pdev)) {
+                sky2_write32(hw, Y2_CFG_AER + PCI_ERR_UNCOR_STATUS,
-                        /* Check for advanced error reporting */
+                             0xfffffffful);
-                        pci_cleanup_aer_uncorrect_error_status(pdev);
-                        pci_cleanup_aer_correct_error_status(pdev);
-                } else {
-                        dev_warn(&pdev->dev,
-                                "PCI Express Advanced Error Reporting"
-                                " not configured or MMCONFIG problem?\n");
-                        sky2_write32(hw, Y2_CFG_AER + PCI_ERR_UNCOR_STATUS,
-                                     0xfffffffful);
-                }
                /* If error bit is stuck on ignore it */
                if (sky2_read32(hw, B0_HWE_ISRC) & Y2_IS_PCI_EXP)
                        dev_info(&pdev->dev, "ignoring stuck error report bit\n");
+                else
-                else if (pci_enable_pcie_error_reporting(pdev))
                        hwe_mask |= Y2_IS_PCI_EXP;
        }
@@ -2930,16 +2905,14 @@ static void sky2_restart(struct work_struct *work)
        int i, err;
        rtnl_lock();
-        sky2_write32(hw, B0_IMSK, 0);
-        sky2_read32(hw, B0_IMSK);
-        napi_disable(&hw->napi);
        for (i = 0; i < hw->ports; i++) {
                dev = hw->dev[i];
                if (netif_running(dev))
                        sky2_down(dev);
        }
+        napi_disable(&hw->napi);
+        sky2_write32(hw, B0_IMSK, 0);
        sky2_reset(hw);
        sky2_write32(hw, B0_IMSK, Y2_IS_BASE);
        napi_enable(&hw->napi);
@@ -3672,32 +3645,33 @@ static int sky2_set_tso(struct net_device *dev, u32 data)
 static int sky2_get_eeprom_len(struct net_device *dev)
 {
        struct sky2_port *sky2 = netdev_priv(dev);
+        struct sky2_hw *hw = sky2->hw;
        u16 reg2;
-        pci_read_config_word(sky2->hw->pdev, PCI_DEV_REG2, &reg2);
+        reg2 = sky2_pci_read16(hw, PCI_DEV_REG2);
        return 1 << ( ((reg2 & PCI_VPD_ROM_SZ) >> 14) + 8);
 }
-static u32 sky2_vpd_read(struct pci_dev *pdev, int cap, u16 offset)
+static u32 sky2_vpd_read(struct sky2_hw *hw, int cap, u16 offset)
 {
        u32 val;
-        pci_write_config_word(pdev, cap + PCI_VPD_ADDR, offset);
+        sky2_pci_write16(hw, cap + PCI_VPD_ADDR, offset);
        do {
-                pci_read_config_word(pdev, cap + PCI_VPD_ADDR, &offset);
+                offset = sky2_pci_read16(hw, cap + PCI_VPD_ADDR);
        } while (!(offset & PCI_VPD_ADDR_F));
-        pci_read_config_dword(pdev, cap + PCI_VPD_DATA, &val);
+        val = sky2_pci_read32(hw, cap + PCI_VPD_DATA);
        return val;
 }
-static void sky2_vpd_write(struct pci_dev *pdev, int cap, u16 offset, u32 val)
+static void sky2_vpd_write(struct sky2_hw *hw, int cap, u16 offset, u32 val)
 {
-        pci_write_config_word(pdev, cap + PCI_VPD_DATA, val);
+        sky2_pci_write16(hw, cap + PCI_VPD_DATA, val);
-        pci_write_config_dword(pdev, cap + PCI_VPD_ADDR, offset | PCI_VPD_ADDR_F);
+        sky2_pci_write32(hw, cap + PCI_VPD_ADDR, offset | PCI_VPD_ADDR_F);
        do {
-                pci_read_config_word(pdev, cap + PCI_VPD_ADDR, &offset);
+                offset = sky2_pci_read16(hw, cap + PCI_VPD_ADDR);
        } while (offset & PCI_VPD_ADDR_F);
 }
@@ -3715,7 +3689,7 @@ static int sky2_get_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom
        eeprom->magic = SKY2_EEPROM_MAGIC;
        while (length > 0) {
-                u32 val = sky2_vpd_read(sky2->hw->pdev, cap, offset);
+                u32 val = sky2_vpd_read(sky2->hw, cap, offset);
                int n = min_t(int, length, sizeof(val));
                memcpy(data, &val, n);
@@ -3745,10 +3719,10 @@ static int sky2_set_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom
                int n = min_t(int, length, sizeof(val));
                if (n < sizeof(val))
-                        val = sky2_vpd_read(sky2->hw->pdev, cap, offset);
+                        val = sky2_vpd_read(sky2->hw, cap, offset);
                memcpy(&val, data, n);
-                sky2_vpd_write(sky2->hw->pdev, cap, offset, val);
+                sky2_vpd_write(sky2->hw, cap, offset, val);
                length -= n;
                data += n;
@@ -3881,6 +3855,7 @@ static int sky2_debug_show(struct seq_file *seq, void *v)
                   last = sky2_read16(hw, Y2_QADDR(rxqaddr[port], PREF_UNIT_PUT_IDX)),
                   sky2_read16(hw, Y2_QADDR(rxqaddr[port], PREF_UNIT_LAST_IDX)));
+        sky2_read32(hw, B0_Y2_SP_LISR);
        napi_enable(&hw->napi);
        return 0;
 }
@@ -4013,7 +3988,7 @@ static __devinit struct net_device *sky2_init_netdev(struct sky2_hw *hw,
        sky2->duplex = -1;
        sky2->speed = -1;
        sky2->advertising = sky2_supported_modes(hw);
-        sky2->rx_csum = 1;
+        sky2->rx_csum = (hw->chip_id != CHIP_ID_YUKON_XL);
        sky2->wol = wol;
        spin_lock_init(&sky2->phy_lock);
@@ -4184,9 +4159,9 @@ static int __devinit sky2_probe(struct pci_dev *pdev,
         */
        {
                u32 reg;
-                pci_read_config_dword(pdev,PCI_DEV_REG2, &reg);
+                reg = sky2_pci_read32(hw, PCI_DEV_REG2);
                reg &= ~PCI_REV_DESC;
-                pci_write_config_dword(pdev, PCI_DEV_REG2, reg);
+                sky2_pci_write32(hw, PCI_DEV_REG2, reg);
        }
 #endif
@@ -4377,7 +4352,7 @@ static int sky2_resume(struct pci_dev *pdev)
        if (hw->chip_id == CHIP_ID_YUKON_EX ||
            hw->chip_id == CHIP_ID_YUKON_EC_U ||
            hw->chip_id == CHIP_ID_YUKON_FE_P)
-                pci_write_config_dword(pdev, PCI_DEV_REG3, 0);
+                sky2_pci_write32(hw, PCI_DEV_REG3, 0);
        sky2_reset(hw);
        sky2_write32(hw, B0_IMSK, Y2_IS_BASE);
diff --git a/drivers/net/sky2.h b/drivers/net/sky2.h
index 69525fd7908d..ffe9b8a50a1b 100644
--- a/drivers/net/sky2.h
+++ b/drivers/net/sky2.h
@@ -1991,14 +1991,14 @@ struct sky2_port {
        u16                  tx_cons;           /* next le to check */
        u16                  tx_prod;           /* next le to use */
        u16                  tx_next;           /* debug only */
-        u32                  tx_addr64;
        u16                  tx_pending;
        u16                  tx_last_mss;
        u32                  tx_tcpsum;
        struct rx_ring_info  *rx_ring ____cacheline_aligned_in_smp;
        struct sky2_rx_le    *rx_le;
-        u32                  rx_addr64;
        u16                  rx_next;           /* next re to check */
        u16                  rx_put;            /* next le index to use */
        u16                  rx_pending;
@@ -2128,4 +2128,25 @@ static inline void gma_set_addr(struct sky2_hw *hw, unsigned port, unsigned reg,
        gma_write16(hw, port, reg+4,(u16) addr[2] | ((u16) addr[3] << 8));
        gma_write16(hw, port, reg+8,(u16) addr[4] | ((u16) addr[5] << 8));
 }
+/* PCI config space access */
+static inline u32 sky2_pci_read32(const struct sky2_hw *hw, unsigned reg)
+{
+        return sky2_read32(hw, Y2_CFG_SPC + reg);
+}
+static inline u16 sky2_pci_read16(const struct sky2_hw *hw, unsigned reg)
+{
+        return sky2_read16(hw, Y2_CFG_SPC + reg);
+}
+static inline void sky2_pci_write32(struct sky2_hw *hw, unsigned reg, u32 val)
+{
+        sky2_write32(hw, Y2_CFG_SPC + reg, val);
+}
+static inline void sky2_pci_write16(struct sky2_hw *hw, unsigned reg, u16 val)
+{
+        sky2_write16(hw, Y2_CFG_SPC + reg, val);
+}
 #endif
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index dd18af0ce676..76cc1d3adf71 100644
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -428,7 +428,6 @@ static inline void smc911x_drop_pkt(struct net_device *dev)
 */
 static inline void       smc911x_rcv(struct net_device *dev)
 {
-        struct smc911x_local *lp = netdev_priv(dev);
        unsigned long ioaddr = dev->base_addr;
        unsigned int pkt_len, status;
        struct sk_buff *skb;
@@ -473,6 +472,7 @@ static inline void	 smc911x_rcv(struct net_device *dev)
                skb_put(skb,pkt_len-4);
 #ifdef SMC_USE_DMA
                {
+                struct smc911x_local *lp = netdev_priv(dev);
                unsigned int fifo;
                /* Lower the FIFO threshold if possible */
                fifo = SMC_GET_FIFO_INT();
@@ -1299,9 +1299,9 @@ smc911x_rx_dma_irq(int dma, void *data)
        PRINT_PKT(skb->data, skb->len);
        dev->last_rx = jiffies;
        skb->protocol = eth_type_trans(skb, dev);
-        netif_rx(skb);
        dev->stats.rx_packets++;
        dev->stats.rx_bytes += skb->len;
+        netif_rx(skb);
        spin_lock_irqsave(&lp->lock, flags);
        pkts = (SMC_GET_RX_FIFO_INF() & RX_FIFO_INF_RXSUSED_) >> 16;
@@ -1379,13 +1379,6 @@ static void smc911x_set_multicast_list(struct net_device *dev)
        unsigned int multicast_table[2];
        unsigned int mcr, update_multicast = 0;
        unsigned long flags;
-        /* table for flipping the order of 5 bits */
-        static const unsigned char invert5[] =
-                {0x00, 0x10, 0x08, 0x18, 0x04, 0x14, 0x0C, 0x1C,
-                 0x02, 0x12, 0x0A, 0x1A, 0x06, 0x16, 0x0E, 0x1E,
-                 0x01, 0x11, 0x09, 0x19, 0x05, 0x15, 0x0D, 0x1D,
-                 0x03, 0x13, 0x0B, 0x1B, 0x07, 0x17, 0x0F, 0x1F};
        DBG(SMC_DEBUG_FUNC, "%s: --> %s\n", dev->name, __FUNCTION__);
@@ -1432,7 +1425,7 @@ static void smc911x_set_multicast_list(struct net_device *dev)
                cur_addr = dev->mc_list;
                for (i = 0; i < dev->mc_count; i++, cur_addr = cur_addr->next) {
-                        int position;
+                        u32 position;
                        /* do we have a pointer here? */
                        if (!cur_addr)
@@ -1442,12 +1435,10 @@ static void smc911x_set_multicast_list(struct net_device *dev)
                        if (!(*cur_addr->dmi_addr & 1))
                                 continue;
-                        /* only use the low order bits */
+                        /* upper 6 bits are used as hash index */
-                        position = crc32_le(~0, cur_addr->dmi_addr, 6) & 0x3f;
+                        position = ether_crc(ETH_ALEN, cur_addr->dmi_addr)>>26;
-                        /* do some messy swapping to put the bit in the right spot */
+                        multicast_table[position>>5] |= 1 << (position&0x1f);
-                        multicast_table[invert5[position&0x1F]&0x1] |=
-                                (1<<invert5[(position>>1)&0x1F]);
                }
                /* be sure I get rid of flags I might have set */
diff --git a/drivers/net/smc911x.h b/drivers/net/smc911x.h
index 16a0edc078fd..7defa63b9c74 100644
--- a/drivers/net/smc911x.h
+++ b/drivers/net/smc911x.h
@@ -37,7 +37,7 @@
  #define SMC_USE_16BIT         0
  #define SMC_USE_32BIT         1
  #define SMC_IRQ_SENSE         IRQF_TRIGGER_FALLING
-#elif CONFIG_SH_MAGIC_PANEL_R2
+#elif defined(CONFIG_SH_MAGIC_PANEL_R2)
  #define SMC_USE_SH_DMA        0
  #define SMC_USE_16BIT         0
  #define SMC_USE_32BIT         1
@@ -76,7 +76,7 @@
-#if      SMC_USE_PXA_DMA
+#ifdef SMC_USE_PXA_DMA
 #define SMC_USE_DMA
 /*
diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h
index db34e1eb67e9..07b7f7120e37 100644
--- a/drivers/net/smc91x.h
+++ b/drivers/net/smc91x.h
@@ -55,7 +55,7 @@
 #define SMC_insw(a, r, p, l)    readsw((a) + (r), p, l)
 #define SMC_outsw(a, r, p, l)   writesw((a) + (r), p, l)
-#elif defined(CONFIG_BFIN)
+#elif defined(CONFIG_BLACKFIN)
 #define SMC_IRQ_FLAGS           IRQF_TRIGGER_HIGH
 #define RPC_LSA_DEFAULT         RPC_LED_100_10
diff --git a/drivers/net/starfire.c b/drivers/net/starfire.c
index bcc430bd9e49..6e00dc857afa 100644
--- a/drivers/net/starfire.c
+++ b/drivers/net/starfire.c
@@ -1742,7 +1742,7 @@ static void set_rx_mode(struct net_device *dev)
                        if (vlan_group_get_device(np->vlgrp, i)) {
                                if (vlan_count >= 32)
                                        break;
-                                writew(cpu_to_be16(i), filter_addr);
+                                writew(i, filter_addr);
                                filter_addr += 16;
                                vlan_count++;
                        }
diff --git a/drivers/net/sundance.c b/drivers/net/sundance.c
index ff98f5d597f1..0a6186d4a48e 100644
--- a/drivers/net/sundance.c
+++ b/drivers/net/sundance.c
@@ -340,9 +340,9 @@ enum mac_ctrl1_bits {
 /* Note that using only 32 bit fields simplifies conversion to big-endian
   architectures. */
 struct netdev_desc {
-        u32 next_desc;
+        __le32 next_desc;
-        u32 status;
+        __le32 status;
-        struct desc_frag { u32 addr, length; } frag[1];
+        struct desc_frag { __le32 addr, length; } frag[1];
 };
 /* Bits in netdev_desc.status */
@@ -495,8 +495,8 @@ static int __devinit sundance_probe1 (struct pci_dev *pdev,
                goto err_out_res;
        for (i = 0; i < 3; i++)
-                ((u16 *)dev->dev_addr)[i] =
+                ((__le16 *)dev->dev_addr)[i] =
-                        le16_to_cpu(eeprom_read(ioaddr, i + EEPROM_SA_OFFSET));
+                        cpu_to_le16(eeprom_read(ioaddr, i + EEPROM_SA_OFFSET));
        memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
        dev->base_addr = (unsigned long)ioaddr;
@@ -1090,8 +1090,8 @@ reset_tx (struct net_device *dev)
                skb = np->tx_skbuff[i];
                if (skb) {
                        pci_unmap_single(np->pci_dev,
-                                np->tx_ring[i].frag[0].addr, skb->len,
+                                le32_to_cpu(np->tx_ring[i].frag[0].addr),
-                                PCI_DMA_TODEVICE);
+                                skb->len, PCI_DMA_TODEVICE);
                        if (irq)
                                dev_kfree_skb_irq (skb);
                        else
@@ -1214,7 +1214,7 @@ static irqreturn_t intr_handler(int irq, void *dev_instance)
                                skb = np->tx_skbuff[entry];
                                /* Free the original skb. */
                                pci_unmap_single(np->pci_dev,
-                                        np->tx_ring[entry].frag[0].addr,
+                                        le32_to_cpu(np->tx_ring[entry].frag[0].addr),
                                        skb->len, PCI_DMA_TODEVICE);
                                dev_kfree_skb_irq (np->tx_skbuff[entry]);
                                np->tx_skbuff[entry] = NULL;
@@ -1233,7 +1233,7 @@ static irqreturn_t intr_handler(int irq, void *dev_instance)
                                skb = np->tx_skbuff[entry];
                                /* Free the original skb. */
                                pci_unmap_single(np->pci_dev,
-                                        np->tx_ring[entry].frag[0].addr,
+                                        le32_to_cpu(np->tx_ring[entry].frag[0].addr),
                                        skb->len, PCI_DMA_TODEVICE);
                                dev_kfree_skb_irq (np->tx_skbuff[entry]);
                                np->tx_skbuff[entry] = NULL;
@@ -1311,19 +1311,19 @@ static void rx_poll(unsigned long data)
                                && (skb = dev_alloc_skb(pkt_len + 2)) != NULL) {
                                skb_reserve(skb, 2);    /* 16 byte align the IP header */
                                pci_dma_sync_single_for_cpu(np->pci_dev,
-                                                            desc->frag[0].addr,
+                                                            le32_to_cpu(desc->frag[0].addr),
                                                            np->rx_buf_sz,
                                                            PCI_DMA_FROMDEVICE);
                                skb_copy_to_linear_data(skb, np->rx_skbuff[entry]->data, pkt_len);
                                pci_dma_sync_single_for_device(np->pci_dev,
-                                                               desc->frag[0].addr,
+                                                               le32_to_cpu(desc->frag[0].addr),
                                                               np->rx_buf_sz,
                                                               PCI_DMA_FROMDEVICE);
                                skb_put(skb, pkt_len);
                        } else {
                                pci_unmap_single(np->pci_dev,
-                                        desc->frag[0].addr,
+                                        le32_to_cpu(desc->frag[0].addr),
                                        np->rx_buf_sz,
                                        PCI_DMA_FROMDEVICE);
                                skb_put(skb = np->rx_skbuff[entry], pkt_len);
@@ -1709,23 +1709,23 @@ static int netdev_close(struct net_device *dev)
        /* Free all the skbuffs in the Rx queue. */
        for (i = 0; i < RX_RING_SIZE; i++) {
                np->rx_ring[i].status = 0;
-                np->rx_ring[i].frag[0].addr = 0xBADF00D0; /* An invalid address. */
                skb = np->rx_skbuff[i];
                if (skb) {
                        pci_unmap_single(np->pci_dev,
-                                np->rx_ring[i].frag[0].addr, np->rx_buf_sz,
+                                le32_to_cpu(np->rx_ring[i].frag[0].addr),
-                                PCI_DMA_FROMDEVICE);
+                                np->rx_buf_sz, PCI_DMA_FROMDEVICE);
                        dev_kfree_skb(skb);
                        np->rx_skbuff[i] = NULL;
                }
+                np->rx_ring[i].frag[0].addr = cpu_to_le32(0xBADF00D0); /* poison */
        }
        for (i = 0; i < TX_RING_SIZE; i++) {
                np->tx_ring[i].next_desc = 0;
                skb = np->tx_skbuff[i];
                if (skb) {
                        pci_unmap_single(np->pci_dev,
-                                np->tx_ring[i].frag[0].addr, skb->len,
+                                le32_to_cpu(np->tx_ring[i].frag[0].addr),
-                                PCI_DMA_TODEVICE);
+                                skb->len, PCI_DMA_TODEVICE);
                        dev_kfree_skb(skb);
                        np->tx_skbuff[i] = NULL;
                }
diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c
index f6fedcc32de1..68872142530b 100644
--- a/drivers/net/sungem.c
+++ b/drivers/net/sungem.c
@@ -2281,14 +2281,12 @@ static void gem_reset_task(struct work_struct *work)
        mutex_lock(&gp->pm_mutex);
-        napi_disable(&gp->napi);
+        if (gp->opened)
+                napi_disable(&gp->napi);
        spin_lock_irq(&gp->lock);
        spin_lock(&gp->tx_lock);
-        if (gp->running == 0)
-                goto not_running;
        if (gp->running) {
                netif_stop_queue(gp->dev);
@@ -2298,13 +2296,14 @@ static void gem_reset_task(struct work_struct *work)
                        gem_set_link_modes(gp);
                netif_wake_queue(gp->dev);
        }
- not_running:
        gp->reset_task_pending = 0;
        spin_unlock(&gp->tx_lock);
        spin_unlock_irq(&gp->lock);
-        napi_enable(&gp->napi);
+        if (gp->opened)
+                napi_enable(&gp->napi);
        mutex_unlock(&gp->pm_mutex);
 }
diff --git a/drivers/net/tc35815.c b/drivers/net/tc35815.c
index d887c05588d5..370d329d15d9 100644
--- a/drivers/net/tc35815.c
+++ b/drivers/net/tc35815.c
@@ -611,7 +611,7 @@ static int __devinit tc35815_mac_match(struct device *dev, void *data)
 {
        struct platform_device *plat_dev = to_platform_device(dev);
        struct pci_dev *pci_dev = data;
-        unsigned int id = (pci_dev->bus->number << 8) | pci_dev->devfn;
+        unsigned int id = pci_dev->irq;
        return !strcmp(plat_dev->name, "tc35815-mac") && plat_dev->id == id;
 }
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 4942f7d18937..22eb7c8c1a25 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -8189,6 +8189,7 @@ static int tg3_get_eeprom_len(struct net_device *dev)
 }
 static int tg3_nvram_read(struct tg3 *tp, u32 offset, u32 *val);
+static int tg3_nvram_read_le(struct tg3 *tp, u32 offset, __le32 *val);
 static int tg3_nvram_read_swab(struct tg3 *tp, u32 offset, u32 *val);
 static int tg3_get_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom, u8 *data)
@@ -8196,7 +8197,8 @@ static int tg3_get_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom,
        struct tg3 *tp = netdev_priv(dev);
        int ret;
        u8  *pd;
-        u32 i, offset, len, val, b_offset, b_count;
+        u32 i, offset, len, b_offset, b_count;
+        __le32 val;
        if (tp->link_config.phy_is_low_power)
                return -EAGAIN;
@@ -8215,10 +8217,9 @@ static int tg3_get_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom,
                        /* i.e. offset=1 len=2 */
                        b_count = len;
                }
-                ret = tg3_nvram_read(tp, offset-b_offset, &val);
+                ret = tg3_nvram_read_le(tp, offset-b_offset, &val);
                if (ret)
                        return ret;
-                val = cpu_to_le32(val);
                memcpy(data, ((char*)&val) + b_offset, b_count);
                len -= b_count;
                offset += b_count;
@@ -8228,12 +8229,11 @@ static int tg3_get_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom,
        /* read bytes upto the last 4 byte boundary */
        pd = &data[eeprom->len];
        for (i = 0; i < (len - (len & 3)); i += 4) {
-                ret = tg3_nvram_read(tp, offset + i, &val);
+                ret = tg3_nvram_read_le(tp, offset + i, &val);
                if (ret) {
                        eeprom->len += i;
                        return ret;
                }
-                val = cpu_to_le32(val);
                memcpy(pd + i, &val, 4);
        }
        eeprom->len += i;
@@ -8243,11 +8243,10 @@ static int tg3_get_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom,
                pd = &data[eeprom->len];
                b_count = len & 3;
                b_offset = offset + len - b_count;
-                ret = tg3_nvram_read(tp, b_offset, &val);
+                ret = tg3_nvram_read_le(tp, b_offset, &val);
                if (ret)
                        return ret;
-                val = cpu_to_le32(val);
+                memcpy(pd, &val, b_count);
-                memcpy(pd, ((char*)&val), b_count);
                eeprom->len += b_count;
        }
        return 0;
@@ -8259,8 +8258,9 @@ static int tg3_set_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom,
 {
        struct tg3 *tp = netdev_priv(dev);
        int ret;
-        u32 offset, len, b_offset, odd_len, start, end;
+        u32 offset, len, b_offset, odd_len;
        u8 *buf;
+        __le32 start, end;
        if (tp->link_config.phy_is_low_power)
                return -EAGAIN;
@@ -8273,10 +8273,9 @@ static int tg3_set_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom,
        if ((b_offset = (offset & 3))) {
                /* adjustments to start on required 4 byte boundary */
-                ret = tg3_nvram_read(tp, offset-b_offset, &start);
+                ret = tg3_nvram_read_le(tp, offset-b_offset, &start);
                if (ret)
                        return ret;
-                start = cpu_to_le32(start);
                len += b_offset;
                offset &= ~3;
                if (len < 4)
@@ -8288,10 +8287,9 @@ static int tg3_set_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom,
                /* adjustments to end on required 4 byte boundary */
                odd_len = 1;
                len = (len + 3) & ~3;
-                ret = tg3_nvram_read(tp, offset+len-4, &end);
+                ret = tg3_nvram_read_le(tp, offset+len-4, &end);
                if (ret)
                        return ret;
-                end = cpu_to_le32(end);
        }
        buf = data;
@@ -8734,7 +8732,8 @@ static void tg3_get_ethtool_stats (struct net_device *dev,
 static int tg3_test_nvram(struct tg3 *tp)
 {
-        u32 *buf, csum, magic;
+        u32 csum, magic;
+        __le32 *buf;
        int i, j, k, err = 0, size;
        if (tg3_nvram_read_swab(tp, 0, &magic) != 0)
@@ -8771,21 +8770,19 @@ static int tg3_test_nvram(struct tg3 *tp)
        err = -EIO;
        for (i = 0, j = 0; i < size; i += 4, j++) {
-                u32 val;
+                if ((err = tg3_nvram_read_le(tp, i, &buf[j])) != 0)
-                if ((err = tg3_nvram_read(tp, i, &val)) != 0)
                        break;
-                buf[j] = cpu_to_le32(val);
        }
        if (i < size)
                goto out;
        /* Selfboot format */
-        if ((cpu_to_be32(buf[0]) & TG3_EEPROM_MAGIC_FW_MSK) ==
+        magic = swab32(le32_to_cpu(buf[0]));
+        if ((magic & TG3_EEPROM_MAGIC_FW_MSK) ==
            TG3_EEPROM_MAGIC_FW) {
                u8 *buf8 = (u8 *) buf, csum8 = 0;
-                if ((cpu_to_be32(buf[0]) & TG3_EEPROM_SB_REVISION_MASK) ==
+                if ((magic & TG3_EEPROM_SB_REVISION_MASK) ==
                    TG3_EEPROM_SB_REVISION_2) {
                        /* For rev 2, the csum doesn't include the MBA. */
                        for (i = 0; i < TG3_EEPROM_SB_F1R2_MBA_OFF; i++)
@@ -8806,7 +8803,7 @@ static int tg3_test_nvram(struct tg3 *tp)
                goto out;
        }
-        if ((cpu_to_be32(buf[0]) & TG3_EEPROM_MAGIC_HW_MSK) ==
+        if ((magic & TG3_EEPROM_MAGIC_HW_MSK) ==
            TG3_EEPROM_MAGIC_HW) {
                u8 data[NVRAM_SELFBOOT_DATA_SIZE];
                u8 parity[NVRAM_SELFBOOT_DATA_SIZE];
@@ -8852,12 +8849,12 @@ static int tg3_test_nvram(struct tg3 *tp)
        /* Bootstrap checksum at offset 0x10 */
        csum = calc_crc((unsigned char *) buf, 0x10);
-        if(csum != cpu_to_le32(buf[0x10/4]))
+        if(csum != le32_to_cpu(buf[0x10/4]))
                goto out;
        /* Manufacturing block starts at offset 0x74, checksum at 0xfc */
        csum = calc_crc((unsigned char *) &buf[0x74/4], 0x88);
-        if (csum != cpu_to_le32(buf[0xfc/4]))
+        if (csum != le32_to_cpu(buf[0xfc/4]))
                 goto out;
        err = 0;
@@ -10171,6 +10168,15 @@ static int tg3_nvram_read(struct tg3 *tp, u32 offset, u32 *val)
        return ret;
 }
+static int tg3_nvram_read_le(struct tg3 *tp, u32 offset, __le32 *val)
+{
+        u32 v;
+        int res = tg3_nvram_read(tp, offset, &v);
+        if (!res)
+                *val = cpu_to_le32(v);
+        return res;
+}
 static int tg3_nvram_read_swab(struct tg3 *tp, u32 offset, u32 *val)
 {
        int err;
@@ -10188,13 +10194,14 @@ static int tg3_nvram_write_block_using_eeprom(struct tg3 *tp,
        u32 val;
        for (i = 0; i < len; i += 4) {
-                u32 addr, data;
+                u32 addr;
+                __le32 data;
                addr = offset + i;
                memcpy(&data, buf + i, 4);
-                tw32(GRC_EEPROM_DATA, cpu_to_le32(data));
+                tw32(GRC_EEPROM_DATA, le32_to_cpu(data));
                val = tr32(GRC_EEPROM_ADDR);
                tw32(GRC_EEPROM_ADDR, val | EEPROM_ADDR_COMPLETE);
@@ -10244,8 +10251,8 @@ static int tg3_nvram_write_block_unbuffered(struct tg3 *tp, u32 offset, u32 len,
                phy_addr = offset & ~pagemask;
                for (j = 0; j < pagesize; j += 4) {
-                        if ((ret = tg3_nvram_read(tp, phy_addr + j,
+                        if ((ret = tg3_nvram_read_le(tp, phy_addr + j,
-                                                (u32 *) (tmp + j))))
+                                                (__le32 *) (tmp + j))))
                                break;
                }
                if (ret)
@@ -10289,10 +10296,11 @@ static int tg3_nvram_write_block_unbuffered(struct tg3 *tp, u32 offset, u32 len,
                        break;
                for (j = 0; j < pagesize; j += 4) {
-                        u32 data;
+                        __be32 data;
-                        data = *((u32 *) (tmp + j));
+                        data = *((__be32 *) (tmp + j));
-                        tw32(NVRAM_WRDATA, cpu_to_be32(data));
+                        /* swab32(le32_to_cpu(data)), actually */
+                        tw32(NVRAM_WRDATA, be32_to_cpu(data));
                        tw32(NVRAM_ADDR, phy_addr + j);
@@ -10326,10 +10334,11 @@ static int tg3_nvram_write_block_buffered(struct tg3 *tp, u32 offset, u32 len,
        int i, ret = 0;
        for (i = 0; i < len; i += 4, offset += 4) {
-                u32 data, page_off, phy_addr, nvram_cmd;
+                u32 page_off, phy_addr, nvram_cmd;
+                __be32 data;
                memcpy(&data, buf + i, 4);
-                tw32(NVRAM_WRDATA, cpu_to_be32(data));
+                tw32(NVRAM_WRDATA, be32_to_cpu(data));
                page_off = offset % tp->nvram_pagesize;
@@ -10831,6 +10840,7 @@ static void __devinit tg3_read_partno(struct tg3 *tp)
                vpd_cap = pci_find_capability(tp->pdev, PCI_CAP_ID_VPD);
                for (i = 0; i < 256; i += 4) {
                        u32 tmp, j = 0;
+                        __le32 v;
                        u16 tmp16;
                        pci_write_config_word(tp->pdev, vpd_cap + PCI_VPD_ADDR,
@@ -10847,8 +10857,8 @@ static void __devinit tg3_read_partno(struct tg3 *tp)
                        pci_read_config_dword(tp->pdev, vpd_cap + PCI_VPD_DATA,
                                              &tmp);
-                        tmp = cpu_to_le32(tmp);
+                        v = cpu_to_le32(tmp);
-                        memcpy(&vpd_data[i], &tmp, 4);
+                        memcpy(&vpd_data[i], &v, 4);
                }
        }
@@ -10941,11 +10951,11 @@ static void __devinit tg3_read_fw_ver(struct tg3 *tp)
        offset = offset + ver_offset - start;
        for (i = 0; i < 16; i += 4) {
-                if (tg3_nvram_read(tp, offset + i, &val))
+                __le32 v;
+                if (tg3_nvram_read_le(tp, offset + i, &v))
                        return;
-                val = le32_to_cpu(val);
+                memcpy(tp->fw_ver + i, &v, 4);
-                memcpy(tp->fw_ver + i, &val, 4);
        }
        if (!(tp->tg3_flags & TG3_FLAG_ENABLE_ASF) ||
@@ -10983,19 +10993,19 @@ static void __devinit tg3_read_fw_ver(struct tg3 *tp)
        tp->fw_ver[bcnt++] = ' ';
        for (i = 0; i < 4; i++) {
-                if (tg3_nvram_read(tp, offset, &val))
+                __le32 v;
+                if (tg3_nvram_read_le(tp, offset, &v))
                        return;
-                val = le32_to_cpu(val);
+                offset += sizeof(v);
-                offset += sizeof(val);
-                if (bcnt > TG3_VER_SIZE - sizeof(val)) {
+                if (bcnt > TG3_VER_SIZE - sizeof(v)) {
-                        memcpy(&tp->fw_ver[bcnt], &val, TG3_VER_SIZE - bcnt);
+                        memcpy(&tp->fw_ver[bcnt], &v, TG3_VER_SIZE - bcnt);
                        break;
                }
-                memcpy(&tp->fw_ver[bcnt], &val, sizeof(val));
+                memcpy(&tp->fw_ver[bcnt], &v, sizeof(v));
-                bcnt += sizeof(val);
+                bcnt += sizeof(v);
        }
        tp->fw_ver[TG3_VER_SIZE - 1] = 0;
diff --git a/drivers/net/tokenring/3c359.c b/drivers/net/tokenring/3c359.c
index 5d31519a6c67..44a06f8b588f 100644
--- a/drivers/net/tokenring/3c359.c
+++ b/drivers/net/tokenring/3c359.c
@@ -570,7 +570,7 @@ static int xl_open(struct net_device *dev)
        struct xl_private *xl_priv=netdev_priv(dev);
        u8 __iomem *xl_mmio = xl_priv->xl_mmio ; 
        u8 i ; 
-        u16 hwaddr[3] ; /* Should be u8[6] but we get word return values */
+        __le16 hwaddr[3] ; /* Should be u8[6] but we get word return values */
        int open_err ;
        u16 switchsettings, switchsettings_eeprom  ;
@@ -580,15 +580,12 @@ static int xl_open(struct net_device *dev)
        }
        /* 
-         * Read the information from the EEPROM that we need. I know we
+         * Read the information from the EEPROM that we need.
-         * should use ntohs, but the word gets stored reversed in the 16
-         * bit field anyway and it all works its self out when we memcpy
-         * it into dev->dev_addr. 
         */
        
-        hwaddr[0] = xl_ee_read(dev,0x10) ; 
+        hwaddr[0] = cpu_to_le16(xl_ee_read(dev,0x10));
-        hwaddr[1] = xl_ee_read(dev,0x11) ; 
+        hwaddr[1] = cpu_to_le16(xl_ee_read(dev,0x11));
-        hwaddr[2] = xl_ee_read(dev,0x12) ; 
+        hwaddr[2] = cpu_to_le16(xl_ee_read(dev,0x12));
        /* Ring speed */
@@ -665,8 +662,8 @@ static int xl_open(struct net_device *dev)
                        break ; 
                skb->dev = dev ; 
-                xl_priv->xl_rx_ring[i].upfragaddr = pci_map_single(xl_priv->pdev, skb->data,xl_priv->pkt_buf_sz, PCI_DMA_FROMDEVICE) ; 
+                xl_priv->xl_rx_ring[i].upfragaddr = cpu_to_le32(pci_map_single(xl_priv->pdev, skb->data,xl_priv->pkt_buf_sz, PCI_DMA_FROMDEVICE));
-                xl_priv->xl_rx_ring[i].upfraglen = xl_priv->pkt_buf_sz | RXUPLASTFRAG;
+                xl_priv->xl_rx_ring[i].upfraglen = cpu_to_le32(xl_priv->pkt_buf_sz) | RXUPLASTFRAG;
                xl_priv->rx_ring_skb[i] = skb ;         
        }
@@ -680,7 +677,7 @@ static int xl_open(struct net_device *dev)
        xl_priv->rx_ring_tail = 0 ; 
        xl_priv->rx_ring_dma_addr = pci_map_single(xl_priv->pdev,xl_priv->xl_rx_ring, sizeof(struct xl_rx_desc) * XL_RX_RING_SIZE, PCI_DMA_TODEVICE) ; 
        for (i=0;i<(xl_priv->rx_ring_no-1);i++) { 
-                xl_priv->xl_rx_ring[i].upnextptr = xl_priv->rx_ring_dma_addr + (sizeof (struct xl_rx_desc) * (i+1)) ; 
+                xl_priv->xl_rx_ring[i].upnextptr = cpu_to_le32(xl_priv->rx_ring_dma_addr + (sizeof (struct xl_rx_desc) * (i+1)));
        } 
        xl_priv->xl_rx_ring[i].upnextptr = 0 ; 
@@ -698,7 +695,7 @@ static int xl_open(struct net_device *dev)
         * Setup the first dummy DPD entry for polling to start working.
         */
-        xl_priv->xl_tx_ring[0].framestartheader = TXDPDEMPTY ; 
+        xl_priv->xl_tx_ring[0].framestartheader = TXDPDEMPTY;
        xl_priv->xl_tx_ring[0].buffer = 0 ; 
        xl_priv->xl_tx_ring[0].buffer_length = 0 ; 
        xl_priv->xl_tx_ring[0].dnnextptr = 0 ; 
@@ -811,17 +808,17 @@ static int xl_open_hw(struct net_device *dev)
                return open_err ; 
        } else { 
                writel( (MEM_WORD_READ | 0xD0000 | xl_priv->srb) + 8, xl_mmio + MMIO_MAC_ACCESS_CMD) ; 
-                xl_priv->asb = ntohs(readw(xl_mmio + MMIO_MACDATA)) ; 
+                xl_priv->asb = swab16(readw(xl_mmio + MMIO_MACDATA)) ;
                printk(KERN_INFO "%s: Adapter Opened Details: ",dev->name) ; 
                printk("ASB: %04x",xl_priv->asb ) ; 
                writel( (MEM_WORD_READ | 0xD0000 | xl_priv->srb) + 10, xl_mmio + MMIO_MAC_ACCESS_CMD) ; 
-                printk(", SRB: %04x",ntohs(readw(xl_mmio + MMIO_MACDATA)) ) ; 
+                printk(", SRB: %04x",swab16(readw(xl_mmio + MMIO_MACDATA)) ) ;
 
                writel( (MEM_WORD_READ | 0xD0000 | xl_priv->srb) + 12, xl_mmio + MMIO_MAC_ACCESS_CMD) ; 
-                xl_priv->arb = ntohs(readw(xl_mmio + MMIO_MACDATA)) ; 
+                xl_priv->arb = swab16(readw(xl_mmio + MMIO_MACDATA)) ;
                printk(", ARB: %04x \n",xl_priv->arb ) ; 
                writel( (MEM_WORD_READ | 0xD0000 | xl_priv->srb) + 14, xl_mmio + MMIO_MAC_ACCESS_CMD) ; 
-                vsoff = ntohs(readw(xl_mmio + MMIO_MACDATA)) ; 
+                vsoff = swab16(readw(xl_mmio + MMIO_MACDATA)) ;
                /* 
                 * Interesting, sending the individual characters directly to printk was causing klogd to use
@@ -873,16 +870,15 @@ static int xl_open_hw(struct net_device *dev)
 static void adv_rx_ring(struct net_device *dev) /* Advance rx_ring, cut down on bloat in xl_rx */ 
 {
        struct xl_private *xl_priv=netdev_priv(dev);
-        int prev_ring_loc ; 
+        int n = xl_priv->rx_ring_tail;
+        int prev_ring_loc;
-        prev_ring_loc = (xl_priv->rx_ring_tail + XL_RX_RING_SIZE - 1) & (XL_RX_RING_SIZE - 1);
-        xl_priv->xl_rx_ring[prev_ring_loc].upnextptr = xl_priv->rx_ring_dma_addr + (sizeof (struct xl_rx_desc) * xl_priv->rx_ring_tail) ; 
+        prev_ring_loc = (n + XL_RX_RING_SIZE - 1) & (XL_RX_RING_SIZE - 1);
-        xl_priv->xl_rx_ring[xl_priv->rx_ring_tail].framestatus = 0 ; 
+        xl_priv->xl_rx_ring[prev_ring_loc].upnextptr = cpu_to_le32(xl_priv->rx_ring_dma_addr + (sizeof (struct xl_rx_desc) * n));
-        xl_priv->xl_rx_ring[xl_priv->rx_ring_tail].upnextptr = 0 ;      
+        xl_priv->xl_rx_ring[n].framestatus = 0;
-        xl_priv->rx_ring_tail++ ; 
+        xl_priv->xl_rx_ring[n].upnextptr = 0;
-        xl_priv->rx_ring_tail &= (XL_RX_RING_SIZE-1) ; 
+        xl_priv->rx_ring_tail++;
+        xl_priv->rx_ring_tail &= (XL_RX_RING_SIZE-1);
-        return ; 
 }
 static void xl_rx(struct net_device *dev)
@@ -914,7 +910,7 @@ static void xl_rx(struct net_device *dev)
                                temp_ring_loc &= (XL_RX_RING_SIZE-1) ; 
                        }
-                        frame_length = xl_priv->xl_rx_ring[temp_ring_loc].framestatus & 0x7FFF ; 
+                        frame_length = le32_to_cpu(xl_priv->xl_rx_ring[temp_ring_loc].framestatus) & 0x7FFF;
                        skb = dev_alloc_skb(frame_length) ;
 
@@ -931,29 +927,29 @@ static void xl_rx(struct net_device *dev)
                        }
        
                        while (xl_priv->rx_ring_tail != temp_ring_loc) { 
-                                copy_len = xl_priv->xl_rx_ring[xl_priv->rx_ring_tail].upfraglen & 0x7FFF ; 
+                                copy_len = le32_to_cpu(xl_priv->xl_rx_ring[xl_priv->rx_ring_tail].upfraglen) & 0x7FFF;
                                frame_length -= copy_len ;  
-                                pci_dma_sync_single_for_cpu(xl_priv->pdev,xl_priv->xl_rx_ring[xl_priv->rx_ring_tail].upfragaddr,xl_priv->pkt_buf_sz,PCI_DMA_FROMDEVICE) ;
+                                pci_dma_sync_single_for_cpu(xl_priv->pdev,le32_to_cpu(xl_priv->xl_rx_ring[xl_priv->rx_ring_tail].upfragaddr),xl_priv->pkt_buf_sz,PCI_DMA_FROMDEVICE);
                                skb_copy_from_linear_data(xl_priv->rx_ring_skb[xl_priv->rx_ring_tail],
                                                          skb_put(skb, copy_len),
                                                          copy_len);
-                                pci_dma_sync_single_for_device(xl_priv->pdev,xl_priv->xl_rx_ring[xl_priv->rx_ring_tail].upfragaddr,xl_priv->pkt_buf_sz,PCI_DMA_FROMDEVICE) ;
+                                pci_dma_sync_single_for_device(xl_priv->pdev,le32_to_cpu(xl_priv->xl_rx_ring[xl_priv->rx_ring_tail].upfragaddr),xl_priv->pkt_buf_sz,PCI_DMA_FROMDEVICE);
                                adv_rx_ring(dev) ; 
                        } 
                        /* Now we have found the last fragment */
-                        pci_dma_sync_single_for_cpu(xl_priv->pdev,xl_priv->xl_rx_ring[xl_priv->rx_ring_tail].upfragaddr,xl_priv->pkt_buf_sz,PCI_DMA_FROMDEVICE) ;
+                        pci_dma_sync_single_for_cpu(xl_priv->pdev,le32_to_cpu(xl_priv->xl_rx_ring[xl_priv->rx_ring_tail].upfragaddr),xl_priv->pkt_buf_sz,PCI_DMA_FROMDEVICE);
                        skb_copy_from_linear_data(xl_priv->rx_ring_skb[xl_priv->rx_ring_tail],
                                      skb_put(skb,copy_len), frame_length);
 /*                      memcpy(skb_put(skb,frame_length), bus_to_virt(xl_priv->xl_rx_ring[xl_priv->rx_ring_tail].upfragaddr), frame_length) ; */
-                        pci_dma_sync_single_for_device(xl_priv->pdev,xl_priv->xl_rx_ring[xl_priv->rx_ring_tail].upfragaddr,xl_priv->pkt_buf_sz,PCI_DMA_FROMDEVICE) ;
+                        pci_dma_sync_single_for_device(xl_priv->pdev,le32_to_cpu(xl_priv->xl_rx_ring[xl_priv->rx_ring_tail].upfragaddr),xl_priv->pkt_buf_sz,PCI_DMA_FROMDEVICE);
                        adv_rx_ring(dev) ; 
                        skb->protocol = tr_type_trans(skb,dev) ; 
                        netif_rx(skb) ; 
                } else { /* Single Descriptor Used, simply swap buffers over, fast path  */
-                        frame_length = xl_priv->xl_rx_ring[xl_priv->rx_ring_tail].framestatus & 0x7FFF ; 
+                        frame_length = le32_to_cpu(xl_priv->xl_rx_ring[xl_priv->rx_ring_tail].framestatus) & 0x7FFF;
                        
                        skb = dev_alloc_skb(xl_priv->pkt_buf_sz) ; 
@@ -966,13 +962,13 @@ static void xl_rx(struct net_device *dev)
                        }
                        skb2 = xl_priv->rx_ring_skb[xl_priv->rx_ring_tail] ; 
-                        pci_unmap_single(xl_priv->pdev, xl_priv->xl_rx_ring[xl_priv->rx_ring_tail].upfragaddr, xl_priv->pkt_buf_sz,PCI_DMA_FROMDEVICE) ; 
+                        pci_unmap_single(xl_priv->pdev, le32_to_cpu(xl_priv->xl_rx_ring[xl_priv->rx_ring_tail].upfragaddr), xl_priv->pkt_buf_sz,PCI_DMA_FROMDEVICE) ;
                        skb_put(skb2, frame_length) ; 
                        skb2->protocol = tr_type_trans(skb2,dev) ; 
                        xl_priv->rx_ring_skb[xl_priv->rx_ring_tail] = skb ;     
-                        xl_priv->xl_rx_ring[xl_priv->rx_ring_tail].upfragaddr = pci_map_single(xl_priv->pdev,skb->data,xl_priv->pkt_buf_sz, PCI_DMA_FROMDEVICE) ; 
+                        xl_priv->xl_rx_ring[xl_priv->rx_ring_tail].upfragaddr = cpu_to_le32(pci_map_single(xl_priv->pdev,skb->data,xl_priv->pkt_buf_sz, PCI_DMA_FROMDEVICE));
-                        xl_priv->xl_rx_ring[xl_priv->rx_ring_tail].upfraglen = xl_priv->pkt_buf_sz | RXUPLASTFRAG ; 
+                        xl_priv->xl_rx_ring[xl_priv->rx_ring_tail].upfraglen = cpu_to_le32(xl_priv->pkt_buf_sz) | RXUPLASTFRAG;
                        adv_rx_ring(dev) ; 
                        xl_priv->xl_stats.rx_packets++ ; 
                        xl_priv->xl_stats.rx_bytes += frame_length ;    
@@ -1022,7 +1018,7 @@ static void xl_freemem(struct net_device *dev)
        for (i=0;i<XL_RX_RING_SIZE;i++) {
                dev_kfree_skb_irq(xl_priv->rx_ring_skb[xl_priv->rx_ring_tail]) ; 
-                pci_unmap_single(xl_priv->pdev,xl_priv->xl_rx_ring[xl_priv->rx_ring_tail].upfragaddr,xl_priv->pkt_buf_sz, PCI_DMA_FROMDEVICE) ; 
+                pci_unmap_single(xl_priv->pdev,le32_to_cpu(xl_priv->xl_rx_ring[xl_priv->rx_ring_tail].upfragaddr),xl_priv->pkt_buf_sz, PCI_DMA_FROMDEVICE);
                xl_priv->rx_ring_tail++ ; 
                xl_priv->rx_ring_tail &= XL_RX_RING_SIZE-1; 
        } 
@@ -1181,9 +1177,9 @@ static int xl_xmit(struct sk_buff *skb, struct net_device *dev)
                txd = &(xl_priv->xl_tx_ring[tx_head]) ; 
                txd->dnnextptr = 0 ; 
-                txd->framestartheader = skb->len | TXDNINDICATE ; 
+                txd->framestartheader = cpu_to_le32(skb->len) | TXDNINDICATE;
-                txd->buffer = pci_map_single(xl_priv->pdev, skb->data, skb->len, PCI_DMA_TODEVICE) ; 
+                txd->buffer = cpu_to_le32(pci_map_single(xl_priv->pdev, skb->data, skb->len, PCI_DMA_TODEVICE));
-                txd->buffer_length = skb->len | TXDNFRAGLAST  ; 
+                txd->buffer_length = cpu_to_le32(skb->len) | TXDNFRAGLAST;
                xl_priv->tx_ring_skb[tx_head] = skb ; 
                xl_priv->xl_stats.tx_packets++ ; 
                xl_priv->xl_stats.tx_bytes += skb->len ;
@@ -1199,7 +1195,7 @@ static int xl_xmit(struct sk_buff *skb, struct net_device *dev)
                xl_priv->tx_ring_head &= (XL_TX_RING_SIZE - 1) ;
                xl_priv->free_ring_entries-- ; 
-                xl_priv->xl_tx_ring[tx_prev].dnnextptr = xl_priv->tx_ring_dma_addr + (sizeof (struct xl_tx_desc) * tx_head) ; 
+                xl_priv->xl_tx_ring[tx_prev].dnnextptr = cpu_to_le32(xl_priv->tx_ring_dma_addr + (sizeof (struct xl_tx_desc) * tx_head));
                /* Sneaky, by doing a read on DnListPtr we can force the card to poll on the DnNextPtr */
                /* readl(xl_mmio + MMIO_DNLISTPTR) ; */
@@ -1237,9 +1233,9 @@ static void xl_dn_comp(struct net_device *dev)
        while (xl_priv->xl_tx_ring[xl_priv->tx_ring_tail].framestartheader & TXDNCOMPLETE ) { 
                txd = &(xl_priv->xl_tx_ring[xl_priv->tx_ring_tail]) ;
-                pci_unmap_single(xl_priv->pdev,txd->buffer, xl_priv->tx_ring_skb[xl_priv->tx_ring_tail]->len, PCI_DMA_TODEVICE) ; 
+                pci_unmap_single(xl_priv->pdev, le32_to_cpu(txd->buffer), xl_priv->tx_ring_skb[xl_priv->tx_ring_tail]->len, PCI_DMA_TODEVICE);
                txd->framestartheader = 0 ; 
-                txd->buffer = 0xdeadbeef  ; 
+                txd->buffer = cpu_to_le32(0xdeadbeef);
                txd->buffer_length  = 0 ;  
                dev_kfree_skb_irq(xl_priv->tx_ring_skb[xl_priv->tx_ring_tail]) ;
                xl_priv->tx_ring_tail++ ; 
@@ -1507,9 +1503,9 @@ static void xl_arb_cmd(struct net_device *dev)
        if (arb_cmd == RING_STATUS_CHANGE) { /* Ring.Status.Change */
                writel( ( (MEM_WORD_READ | 0xD0000 | xl_priv->arb) + 6), xl_mmio + MMIO_MAC_ACCESS_CMD) ;
                 
-                printk(KERN_INFO "%s: Ring Status Change: New Status = %04x\n", dev->name, ntohs(readw(xl_mmio + MMIO_MACDATA) )) ; 
+                printk(KERN_INFO "%s: Ring Status Change: New Status = %04x\n", dev->name, swab16(readw(xl_mmio + MMIO_MACDATA) )) ;
-                lan_status = ntohs(readw(xl_mmio + MMIO_MACDATA));
+                lan_status = swab16(readw(xl_mmio + MMIO_MACDATA));
        
                /* Acknowledge interrupt, this tells nic we are done with the arb */
                writel(ACK_INTERRUPT | ARBCACK | LATCH_ACK, xl_mmio + MMIO_COMMAND) ; 
@@ -1573,7 +1569,7 @@ static void xl_arb_cmd(struct net_device *dev)
                printk(KERN_INFO "Received.Data \n") ; 
 #endif          
                writel( ((MEM_WORD_READ | 0xD0000 | xl_priv->arb) + 6), xl_mmio + MMIO_MAC_ACCESS_CMD) ;
-                xl_priv->mac_buffer = ntohs(readw(xl_mmio + MMIO_MACDATA)) ;
+                xl_priv->mac_buffer = swab16(readw(xl_mmio + MMIO_MACDATA)) ;
                
                /* Now we are going to be really basic here and not do anything
                 * with the data at all. The tech docs do not give me enough
@@ -1634,7 +1630,7 @@ static void xl_asb_cmd(struct net_device *dev)
        writeb(0x81, xl_mmio + MMIO_MACDATA) ; 
        writel(MEM_WORD_WRITE | 0xd0000 | xl_priv->asb | 6, xl_mmio + MMIO_MAC_ACCESS_CMD) ; 
-        writew(ntohs(xl_priv->mac_buffer), xl_mmio + MMIO_MACDATA) ; 
+        writew(swab16(xl_priv->mac_buffer), xl_mmio + MMIO_MACDATA) ;
        xl_wait_misr_flags(dev) ;       
diff --git a/drivers/net/tokenring/3c359.h b/drivers/net/tokenring/3c359.h
index 05c860368852..b880cba0f6fd 100644
--- a/drivers/net/tokenring/3c359.h
+++ b/drivers/net/tokenring/3c359.h
@@ -156,19 +156,19 @@
 #define HOSTERRINT (1<<1)
 /* Receive descriptor bits */
-#define RXOVERRUN (1<<19)
+#define RXOVERRUN cpu_to_le32(1<<19)
-#define RXFC (1<<21)
+#define RXFC cpu_to_le32(1<<21)
-#define RXAR (1<<22)
+#define RXAR cpu_to_le32(1<<22)
-#define RXUPDCOMPLETE (1<<23)
+#define RXUPDCOMPLETE cpu_to_le32(1<<23)
-#define RXUPDFULL (1<<24)
+#define RXUPDFULL cpu_to_le32(1<<24)
-#define RXUPLASTFRAG (1<<31)
+#define RXUPLASTFRAG cpu_to_le32(1<<31)
 /* Transmit descriptor bits */
-#define TXDNCOMPLETE (1<<16)
+#define TXDNCOMPLETE cpu_to_le32(1<<16)
-#define TXTXINDICATE (1<<27)
+#define TXTXINDICATE cpu_to_le32(1<<27)
-#define TXDPDEMPTY (1<<29)
+#define TXDPDEMPTY cpu_to_le32(1<<29)
-#define TXDNINDICATE (1<<31)
+#define TXDNINDICATE cpu_to_le32(1<<31)
-#define TXDNFRAGLAST (1<<31)
+#define TXDNFRAGLAST cpu_to_le32(1<<31)
 /* Interrupts to Acknowledge */
 #define LATCH_ACK 1 
@@ -232,17 +232,17 @@
 /* 3c359 data structures */
 struct xl_tx_desc {
-        u32 dnnextptr ; 
+        __le32 dnnextptr;
-        u32 framestartheader ; 
+        __le32 framestartheader;
-        u32 buffer ;
+        __le32 buffer;
-        u32 buffer_length ;
+        __le32 buffer_length;
 };
 struct xl_rx_desc {
-        u32 upnextptr ; 
+        __le32 upnextptr;
-        u32 framestatus ; 
+        __le32 framestatus;
-        u32 upfragaddr ; 
+        __le32 upfragaddr;
-        u32 upfraglen ; 
+        __le32 upfraglen;
 };
 struct xl_private {
diff --git a/drivers/net/tulip/de4x5.c b/drivers/net/tulip/de4x5.c
index 41f34bb91cad..6e8b18a3b3cc 100644
--- a/drivers/net/tulip/de4x5.c
+++ b/drivers/net/tulip/de4x5.c
@@ -911,7 +911,7 @@ static int     de4x5_init(struct net_device *dev);
 static int     de4x5_sw_reset(struct net_device *dev);
 static int     de4x5_rx(struct net_device *dev);
 static int     de4x5_tx(struct net_device *dev);
-static int     de4x5_ast(struct net_device *dev);
+static void    de4x5_ast(struct net_device *dev);
 static int     de4x5_txur(struct net_device *dev);
 static int     de4x5_rx_ovfc(struct net_device *dev);
@@ -984,11 +984,9 @@ static int     test_bad_enet(struct net_device *dev, int status);
 static int     an_exception(struct de4x5_private *lp);
 static char    *build_setup_frame(struct net_device *dev, int mode);
 static void    disable_ast(struct net_device *dev);
-static void    enable_ast(struct net_device *dev, u32 time_out);
 static long    de4x5_switch_mac_port(struct net_device *dev);
 static int     gep_rd(struct net_device *dev);
 static void    gep_wr(s32 data, struct net_device *dev);
-static void    timeout(struct net_device *dev, void (*fn)(u_long data), u_long data, u_long msec);
 static void    yawn(struct net_device *dev, int state);
 static void    de4x5_parse_params(struct net_device *dev);
 static void    de4x5_dbg_open(struct net_device *dev);
@@ -1139,6 +1137,8 @@ de4x5_hw_init(struct net_device *dev, u_long iobase, struct device *gendev)
        lp->gendev = gendev;
        spin_lock_init(&lp->lock);
        init_timer(&lp->timer);
+        lp->timer.function = (void (*)(unsigned long))de4x5_ast;
+        lp->timer.data = (unsigned long)dev;
        de4x5_parse_params(dev);
        /*
@@ -1311,7 +1311,7 @@ de4x5_open(struct net_device *dev)
    lp->state = OPEN;
    de4x5_dbg_open(dev);
-    if (request_irq(dev->irq, (void *)de4x5_interrupt, IRQF_SHARED,
+    if (request_irq(dev->irq, 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, IRQF_DISABLED | IRQF_SHARED,
@@ -1737,27 +1737,29 @@ de4x5_tx(struct net_device *dev)
    return 0;
 }
-static int
+static void
 de4x5_ast(struct net_device *dev)
 {
-    struct de4x5_private *lp = netdev_priv(dev);
+        struct de4x5_private *lp = netdev_priv(dev);
-    int next_tick = DE4X5_AUTOSENSE_MS;
+        int next_tick = DE4X5_AUTOSENSE_MS;
+        int dt;
-    disable_ast(dev);
+        if (lp->useSROM)
+                next_tick = srom_autoconf(dev);
+        else if (lp->chipset == DC21140)
+                next_tick = dc21140m_autoconf(dev);
+        else if (lp->chipset == DC21041)
+                next_tick = dc21041_autoconf(dev);
+        else if (lp->chipset == DC21040)
+                next_tick = dc21040_autoconf(dev);
+        lp->linkOK = 0;
-    if (lp->useSROM) {
+        dt = (next_tick * HZ) / 1000;
-        next_tick = srom_autoconf(dev);
-    } else if (lp->chipset == DC21140) {
-        next_tick = dc21140m_autoconf(dev);
-    } else if (lp->chipset == DC21041) {
-        next_tick = dc21041_autoconf(dev);
-    } else if (lp->chipset == DC21040) {
-        next_tick = dc21040_autoconf(dev);
-    }
-    lp->linkOK = 0;
-    enable_ast(dev, next_tick);
-    return 0;
+        if (!dt)
+                dt = 1;
+        mod_timer(&lp->timer, jiffies + dt);
 }
 static int
@@ -2174,7 +2176,7 @@ srom_search(struct net_device *dev, struct pci_dev *pdev)
        for (j=0, i=0; i<ETH_ALEN; i++) {
            j += (u_char) *((u_char *)&lp->srom + SROM_HWADD + i);
        }
-        if ((j != 0) && (j != 0x5fa)) {
+        if (j != 0 && j != 6 * 0xff) {
            last.chipset = device;
            last.bus = pb;
            last.irq = irq;
@@ -2371,30 +2373,19 @@ static struct pci_driver de4x5_pci_driver = {
 static int
 autoconf_media(struct net_device *dev)
 {
-    struct de4x5_private *lp = netdev_priv(dev);
+        struct de4x5_private *lp = netdev_priv(dev);
-    u_long iobase = dev->base_addr;
+        u_long iobase = dev->base_addr;
-    int next_tick = DE4X5_AUTOSENSE_MS;
-    lp->linkOK = 0;
+        disable_ast(dev);
-    lp->c_media = AUTO;                     /* Bogus last media */
-    disable_ast(dev);
-    inl(DE4X5_MFC);                         /* Zero the lost frames counter */
-    lp->media = INIT;
-    lp->tcount = 0;
-    if (lp->useSROM) {
+        lp->c_media = AUTO;                     /* Bogus last media */
-        next_tick = srom_autoconf(dev);
+        inl(DE4X5_MFC);                         /* Zero the lost frames counter */
-    } else if (lp->chipset == DC21040) {
+        lp->media = INIT;
-        next_tick = dc21040_autoconf(dev);
+        lp->tcount = 0;
-    } else if (lp->chipset == DC21041) {
-        next_tick = dc21041_autoconf(dev);
-    } else if (lp->chipset == DC21140) {
-        next_tick = dc21140m_autoconf(dev);
-    }
-    enable_ast(dev, next_tick);
+        de4x5_ast(dev);
-    return (lp->media);
+        return lp->media;
 }
 /*
@@ -4018,20 +4009,22 @@ DevicePresent(struct net_device *dev, u_long aprom_addr)
            outl(0, aprom_addr);       /* Reset Ethernet Address ROM Pointer */
        }
    } else {                           /* Read new srom */
-        u_short tmp, *p = (short *)((char *)&lp->srom + SROM_HWADD);
+        u_short tmp;
+        __le16 *p = (__le16 *)((char *)&lp->srom + SROM_HWADD);
        for (i=0; i<(ETH_ALEN>>1); i++) {
            tmp = srom_rd(aprom_addr, (SROM_HWADD>>1) + i);
-            *p = le16_to_cpu(tmp);
+            j += tmp;   /* for check for 0:0:0:0:0:0 or ff:ff:ff:ff:ff:ff */
-            j += *p++;
+            *p = cpu_to_le16(tmp);
        }
-        if ((j == 0) || (j == 0x2fffd)) {
+        if (j == 0 || j == 3 * 0xffff) {
-            return;
+                /* could get 0 only from all-0 and 3 * 0xffff only from all-1 */
+                return;
        }
-        p=(short *)&lp->srom;
+        p = (__le16 *)&lp->srom;
        for (i=0; i<(sizeof(struct de4x5_srom)>>1); i++) {
            tmp = srom_rd(aprom_addr, i);
-            *p++ = le16_to_cpu(tmp);
+            *p++ = cpu_to_le16(tmp);
        }
        de4x5_dbg_srom((struct de4x5_srom *)&lp->srom);
    }
@@ -5161,21 +5154,10 @@ build_setup_frame(struct net_device *dev, int mode)
 }
 static void
-enable_ast(struct net_device *dev, u32 time_out)
-{
-    timeout(dev, (void *)&de4x5_ast, (u_long)dev, time_out);
-    return;
-}
-static void
 disable_ast(struct net_device *dev)
 {
-    struct de4x5_private *lp = netdev_priv(dev);
+        struct de4x5_private *lp = netdev_priv(dev);
+        del_timer_sync(&lp->timer);
-    del_timer(&lp->timer);
-    return;
 }
 static long
@@ -5245,29 +5227,6 @@ gep_rd(struct net_device *dev)
 }
 static void
-timeout(struct net_device *dev, void (*fn)(u_long data), u_long data, u_long msec)
-{
-    struct de4x5_private *lp = netdev_priv(dev);
-    int dt;
-    /* First, cancel any pending timer events */
-    del_timer(&lp->timer);
-    /* Convert msec to ticks */
-    dt = (msec * HZ) / 1000;
-    if (dt==0) dt=1;
-    /* Set up timer */
-    init_timer(&lp->timer);
-    lp->timer.expires = jiffies + dt;
-    lp->timer.function = fn;
-    lp->timer.data = data;
-    add_timer(&lp->timer);
-    return;
-}
-static void
 yawn(struct net_device *dev, int state)
 {
    struct de4x5_private *lp = netdev_priv(dev);
diff --git a/drivers/net/tulip/dmfe.c b/drivers/net/tulip/dmfe.c
index ca90566d5bcd..656200472fa1 100644
--- a/drivers/net/tulip/dmfe.c
+++ b/drivers/net/tulip/dmfe.c
@@ -1909,7 +1909,7 @@ static void dmfe_parse_srom(struct dmfe_board_info * db)
        if ( ( (int) srom[18] & 0xff) == SROM_V41_CODE) {
                /* SROM V4.01 */
                /* Get NIC support media mode */
-                db->NIC_capability = le16_to_cpup((__le16 *)srom + 34/2);
+                db->NIC_capability = le16_to_cpup((__le16 *) (srom + 34));
                db->PHY_reg4 = 0;
                for (tmp_reg = 1; tmp_reg < 0x10; tmp_reg <<= 1) {
                        switch( db->NIC_capability & tmp_reg ) {
@@ -1921,8 +1921,8 @@ static void dmfe_parse_srom(struct dmfe_board_info * db)
                }
                /* Media Mode Force or not check */
-                dmfe_mode = le32_to_cpup((__le32 *)srom + 34/4) &
+                dmfe_mode = (le32_to_cpup((__le32 *) (srom + 34)) &
-                                le32_to_cpup((__le32 *)srom + 36/4);
+                             le32_to_cpup((__le32 *) (srom + 36)));
                switch(dmfe_mode) {
                case 0x4: dmfe_media_mode = DMFE_100MHF; break; /* 100MHF */
                case 0x2: dmfe_media_mode = DMFE_10MFD; break;  /* 10MFD */
@@ -2118,8 +2118,8 @@ static int dmfe_suspend(struct pci_dev *pci_dev, pm_message_t state)
        pci_enable_wake(pci_dev, PCI_D3cold, 1);
        /* Power down device*/
-        pci_set_power_state(pci_dev, pci_choose_state (pci_dev,state));
        pci_save_state(pci_dev);
+        pci_set_power_state(pci_dev, pci_choose_state (pci_dev, state));
        return 0;
 }
@@ -2129,8 +2129,8 @@ static int dmfe_resume(struct pci_dev *pci_dev)
        struct net_device *dev = pci_get_drvdata(pci_dev);
        u32 tmp;
-        pci_restore_state(pci_dev);
        pci_set_power_state(pci_dev, PCI_D0);
+        pci_restore_state(pci_dev);
        /* Re-initilize DM910X board */
        dmfe_init_dm910x(dev);
diff --git a/drivers/net/tulip/interrupt.c b/drivers/net/tulip/interrupt.c
index 365331446387..6284afd14bbb 100644
--- a/drivers/net/tulip/interrupt.c
+++ b/drivers/net/tulip/interrupt.c
@@ -117,9 +117,6 @@ int tulip_poll(struct napi_struct *napi, int budget)
        int received = 0;
 #endif
-        if (!netif_running(dev))
-                goto done;
 #ifdef CONFIG_TULIP_NAPI_HW_MITIGATION
 /* that one buffer is needed for mit activation; or might be a
@@ -151,7 +148,8 @@ int tulip_poll(struct napi_struct *napi, int budget)
                       if (tulip_debug > 5)
                               printk(KERN_DEBUG "%s: In tulip_rx(), entry %d %8.8x.\n",
                                      dev->name, entry, status);
-                       if (work_done++ >= budget)
+                       if (++work_done >= budget)
                               goto not_done;
                       if ((status & 0x38008300) != 0x0300) {
@@ -260,8 +258,6 @@ int tulip_poll(struct napi_struct *napi, int budget)
                * finally: amount of IO did not increase at all. */
       } while ((ioread32(tp->base_addr + CSR5) & RxIntr));
-done:
 #ifdef CONFIG_TULIP_NAPI_HW_MITIGATION
          /* We use this simplistic scheme for IM. It's proven by
diff --git a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c
index e5e2c9c4ebfe..ed600bf56e78 100644
--- a/drivers/net/tulip/tulip_core.c
+++ b/drivers/net/tulip/tulip_core.c
@@ -797,7 +797,8 @@ static int tulip_close (struct net_device *dev)
                tp->rx_ring[i].status = 0;      /* Not owned by Tulip chip. */
                tp->rx_ring[i].length = 0;
-                tp->rx_ring[i].buffer1 = 0xBADF00D0;    /* An invalid address. */
+                /* An invalid address. */
+                tp->rx_ring[i].buffer1 = cpu_to_le32(0xBADF00D0);
                if (skb) {
                        pci_unmap_single(tp->pdev, mapping, PKT_BUF_SZ,
                                         PCI_DMA_FROMDEVICE);
diff --git a/drivers/net/tulip/xircom_cb.c b/drivers/net/tulip/xircom_cb.c
index 70befe33e454..8fc7274642eb 100644
--- a/drivers/net/tulip/xircom_cb.c
+++ b/drivers/net/tulip/xircom_cb.c
@@ -83,8 +83,8 @@ static int bufferoffsets[NUMDESCRIPTORS] = {128,2048,4096,6144};
 struct xircom_private {
        /* Send and receive buffers, kernel-addressable and dma addressable forms */
-        unsigned int *rx_buffer;
+        __le32 *rx_buffer;
-        unsigned int *tx_buffer;
+        __le32 *tx_buffer;
        dma_addr_t rx_dma_handle;
        dma_addr_t tx_dma_handle;
@@ -412,19 +412,20 @@ static int xircom_start_xmit(struct sk_buff *skb, struct net_device *dev)
                        /* FIXME: The specification tells us that the length we send HAS to be a multiple of
                           4 bytes. */
-                        card->tx_buffer[4*desc+1] = skb->len;
+                        card->tx_buffer[4*desc+1] = cpu_to_le32(skb->len);
-                        if (desc == NUMDESCRIPTORS-1)
+                        if (desc == NUMDESCRIPTORS - 1) /* bit 25: last descriptor of the ring */
-                                card->tx_buffer[4*desc+1] |= (1<<25);  /* bit 25: last descriptor of the ring */
+                                card->tx_buffer[4*desc+1] |= cpu_to_le32(1<<25);  
-                        card->tx_buffer[4*desc+1] |= 0xF0000000;
+                        card->tx_buffer[4*desc+1] |= cpu_to_le32(0xF0000000);
                                                 /* 0xF0... means want interrupts*/
                        card->tx_skb[desc] = skb;
                        wmb();
                        /* This gives the descriptor to the card */
-                        card->tx_buffer[4*desc] = 0x80000000;
+                        card->tx_buffer[4*desc] = cpu_to_le32(0x80000000);
                        trigger_transmit(card);
-                        if (((int)card->tx_buffer[nextdescriptor*4])<0) {       /* next descriptor is occupied... */
+                        if (card->tx_buffer[nextdescriptor*4] & cpu_to_le32(0x8000000)) {
+                                /* next descriptor is occupied... */
                                netif_stop_queue(dev);
                        }
                        card->transmit_used = nextdescriptor;
@@ -590,8 +591,7 @@ descriptors and programs the addresses into the card.
 */
 static void setup_descriptors(struct xircom_private *card)
 {
-        unsigned int val;
+        u32 address;
-        unsigned int address;
        int i;
        enter("setup_descriptors");
@@ -604,16 +604,16 @@ static void setup_descriptors(struct xircom_private *card)
        for (i=0;i<NUMDESCRIPTORS;i++ ) {
                /* Rx Descr0: It's empty, let the card own it, no errors -> 0x80000000 */
-                card->rx_buffer[i*4 + 0] = 0x80000000;
+                card->rx_buffer[i*4 + 0] = cpu_to_le32(0x80000000);
                /* Rx Descr1: buffer 1 is 1536 bytes, buffer 2 is 0 bytes */
-                card->rx_buffer[i*4 + 1] = 1536;
+                card->rx_buffer[i*4 + 1] = cpu_to_le32(1536);
-                if (i==NUMDESCRIPTORS-1)
+                if (i == NUMDESCRIPTORS - 1) /* bit 25 is "last descriptor" */
-                        card->rx_buffer[i*4 + 1] |= (1 << 25); /* bit 25 is "last descriptor" */
+                        card->rx_buffer[i*4 + 1] |= cpu_to_le32(1 << 25);
                /* Rx Descr2: address of the buffer
                   we store the buffer at the 2nd half of the page */
-                address = (unsigned long) card->rx_dma_handle;
+                address = card->rx_dma_handle;
                card->rx_buffer[i*4 + 2] = cpu_to_le32(address + bufferoffsets[i]);
                /* Rx Desc3: address of 2nd buffer -> 0 */
                card->rx_buffer[i*4 + 3] = 0;
@@ -621,9 +621,8 @@ static void setup_descriptors(struct xircom_private *card)
        wmb();
        /* Write the receive descriptor ring address to the card */
-        address = (unsigned long) card->rx_dma_handle;
+        address = card->rx_dma_handle;
-        val = cpu_to_le32(address);
+        outl(address, card->io_port + CSR3);    /* Receive descr list address */
-        outl(val, card->io_port + CSR3);        /* Receive descr list address */
        /* transmit descriptors */
@@ -633,13 +632,13 @@ static void setup_descriptors(struct xircom_private *card)
                /* Tx Descr0: Empty, we own it, no errors -> 0x00000000 */
                card->tx_buffer[i*4 + 0] = 0x00000000;
                /* Tx Descr1: buffer 1 is 1536 bytes, buffer 2 is 0 bytes */
-                card->tx_buffer[i*4 + 1] = 1536;
+                card->tx_buffer[i*4 + 1] = cpu_to_le32(1536);
-                if (i==NUMDESCRIPTORS-1)
+                if (i == NUMDESCRIPTORS - 1) /* bit 25 is "last descriptor" */
-                        card->tx_buffer[i*4 + 1] |= (1 << 25); /* bit 25 is "last descriptor" */
+                        card->tx_buffer[i*4 + 1] |= cpu_to_le32(1 << 25);
                /* Tx Descr2: address of the buffer
                   we store the buffer at the 2nd half of the page */
-                address = (unsigned long) card->tx_dma_handle;
+                address = card->tx_dma_handle;
                card->tx_buffer[i*4 + 2] = cpu_to_le32(address + bufferoffsets[i]);
                /* Tx Desc3: address of 2nd buffer -> 0 */
                card->tx_buffer[i*4 + 3] = 0;
@@ -647,9 +646,8 @@ static void setup_descriptors(struct xircom_private *card)
        wmb();
        /* wite the transmit descriptor ring to the card */
-        address = (unsigned long) card->tx_dma_handle;
+        address = card->tx_dma_handle;
-        val =cpu_to_le32(address);
+        outl(address, card->io_port + CSR4);    /* xmit descr list address */
-        outl(val, card->io_port + CSR4);        /* xmit descr list address */
        leave("setup_descriptors");
 }
@@ -1180,7 +1178,7 @@ static void investigate_read_descriptor(struct net_device *dev,struct xircom_pri
                int status;
                enter("investigate_read_descriptor");
-                status = card->rx_buffer[4*descnr];
+                status = le32_to_cpu(card->rx_buffer[4*descnr]);
                if ((status > 0)) {     /* packet received */
@@ -1210,7 +1208,7 @@ static void investigate_read_descriptor(struct net_device *dev,struct xircom_pri
                      out:
                        /* give the buffer back to the card */
-                        card->rx_buffer[4*descnr] =  0x80000000;
+                        card->rx_buffer[4*descnr] =  cpu_to_le32(0x80000000);
                        trigger_receive(card);
                }
@@ -1226,7 +1224,7 @@ static void investigate_write_descriptor(struct net_device *dev, struct xircom_p
                enter("investigate_write_descriptor");
-                status = card->tx_buffer[4*descnr];
+                status = le32_to_cpu(card->tx_buffer[4*descnr]);
 #if 0
                if (status & 0x8000) {  /* Major error */
                        printk(KERN_ERR "Major transmit error status %x \n", status);
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 1f7644695976..f8b8c71187a0 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -610,7 +610,7 @@ static int tun_chr_ioctl(struct inode *inode, struct file *file,
                        tun->flags &= ~TUN_PERSIST;
                DBG(KERN_INFO "%s: persist %s\n",
-                    tun->dev->name, arg ? "disabled" : "enabled");
+                    tun->dev->name, arg ? "enabled" : "disabled");
                break;
        case TUNSETOWNER:
diff --git a/drivers/net/typhoon.c b/drivers/net/typhoon.c
index 94ac5869bb18..f50cb520dffb 100644
--- a/drivers/net/typhoon.c
+++ b/drivers/net/typhoon.c
@@ -813,8 +813,7 @@ typhoon_start_tx(struct sk_buff *skb, struct net_device *dev)
        first_txd->flags = TYPHOON_TX_DESC | TYPHOON_DESC_VALID;
        first_txd->numDesc = 0;
        first_txd->len = 0;
-        first_txd->addr = (u64)((unsigned long) skb) & 0xffffffff;
+        first_txd->tx_addr = (u64)((unsigned long) skb);
-        first_txd->addrHi = (u64)((unsigned long) skb) >> 32;
        first_txd->processFlags = 0;
        if(skb->ip_summed == CHECKSUM_PARTIAL) {
@@ -850,8 +849,8 @@ typhoon_start_tx(struct sk_buff *skb, struct net_device *dev)
                                       PCI_DMA_TODEVICE);
                txd->flags = TYPHOON_FRAG_DESC | TYPHOON_DESC_VALID;
                txd->len = cpu_to_le16(skb->len);
-                txd->addr = cpu_to_le32(skb_dma);
+                txd->frag.addr = cpu_to_le32(skb_dma);
-                txd->addrHi = 0;
+                txd->frag.addrHi = 0;
                first_txd->numDesc++;
        } else {
                int i, len;
@@ -861,8 +860,8 @@ typhoon_start_tx(struct sk_buff *skb, struct net_device *dev)
                                         PCI_DMA_TODEVICE);
                txd->flags = TYPHOON_FRAG_DESC | TYPHOON_DESC_VALID;
                txd->len = cpu_to_le16(len);
-                txd->addr = cpu_to_le32(skb_dma);
+                txd->frag.addr = cpu_to_le32(skb_dma);
-                txd->addrHi = 0;
+                txd->frag.addrHi = 0;
                first_txd->numDesc++;
                for(i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
@@ -880,8 +879,8 @@ typhoon_start_tx(struct sk_buff *skb, struct net_device *dev)
                                         PCI_DMA_TODEVICE);
                        txd->flags = TYPHOON_FRAG_DESC | TYPHOON_DESC_VALID;
                        txd->len = cpu_to_le16(len);
-                        txd->addr = cpu_to_le32(skb_dma);
+                        txd->frag.addr = cpu_to_le32(skb_dma);
-                        txd->addrHi = 0;
+                        txd->frag.addrHi = 0;
                        first_txd->numDesc++;
                }
        }
@@ -977,12 +976,12 @@ typhoon_do_get_stats(struct typhoon *tp)
         * ethtool_ops->get_{strings,stats}()
         */
        stats->tx_packets = le32_to_cpu(s->txPackets);
-        stats->tx_bytes = le32_to_cpu(s->txBytes);
+        stats->tx_bytes = le64_to_cpu(s->txBytes);
        stats->tx_errors = le32_to_cpu(s->txCarrierLost);
        stats->tx_carrier_errors = le32_to_cpu(s->txCarrierLost);
        stats->collisions = le32_to_cpu(s->txMultipleCollisions);
        stats->rx_packets = le32_to_cpu(s->rxPacketsGood);
-        stats->rx_bytes = le32_to_cpu(s->rxBytesGood);
+        stats->rx_bytes = le64_to_cpu(s->rxBytesGood);
        stats->rx_fifo_errors = le32_to_cpu(s->rxFifoOverruns);
        stats->rx_errors = le32_to_cpu(s->rxFifoOverruns) +
                        le32_to_cpu(s->BadSSD) + le32_to_cpu(s->rxCrcErrors);
@@ -1056,7 +1055,7 @@ typhoon_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
                if(typhoon_issue_command(tp, 1, &xp_cmd, 3, xp_resp) < 0) {
                        strcpy(info->fw_version, "Unknown runtime");
                } else {
-                        u32 sleep_ver = xp_resp[0].parm2;
+                        u32 sleep_ver = le32_to_cpu(xp_resp[0].parm2);
                        snprintf(info->fw_version, 32, "%02x.%03x.%03x",
                                 sleep_ver >> 24, (sleep_ver >> 12) & 0xfff,
                                 sleep_ver & 0xfff);
@@ -1157,7 +1156,7 @@ typhoon_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
        }
        INIT_COMMAND_NO_RESPONSE(&xp_cmd, TYPHOON_CMD_XCVR_SELECT);
-        xp_cmd.parm1 = cpu_to_le16(xcvr);
+        xp_cmd.parm1 = xcvr;
        err = typhoon_issue_command(tp, 1, &xp_cmd, 0, NULL);
        if(err < 0)
                goto out;
@@ -1320,7 +1319,7 @@ typhoon_init_interface(struct typhoon *tp)
        tp->txLoRing.writeRegister = TYPHOON_REG_TX_LO_READY;
        tp->txHiRing.writeRegister = TYPHOON_REG_TX_HI_READY;
-        tp->txlo_dma_addr = iface->txLoAddr;
+        tp->txlo_dma_addr = le32_to_cpu(iface->txLoAddr);
        tp->card_state = Sleeping;
        smp_wmb();
@@ -1358,7 +1357,7 @@ typhoon_download_firmware(struct typhoon *tp)
        u8 *image_data;
        void *dpage;
        dma_addr_t dpage_dma;
-        unsigned int csum;
+        __sum16 csum;
        u32 irqEnabled;
        u32 irqMasked;
        u32 numSections;
@@ -1450,13 +1449,13 @@ typhoon_download_firmware(struct typhoon *tp)
                         * summing. Fortunately, due to the properties of
                         * the checksum, we can do this once, at the end.
                         */
-                        csum = csum_partial_copy_nocheck(image_data, dpage,
+                        csum = csum_fold(csum_partial_copy_nocheck(image_data,
-                                                         len, 0);
+                                                                  dpage, len,
-                        csum = csum_fold(csum);
+                                                                  0));
-                        csum = le16_to_cpu(csum);
                        iowrite32(len, ioaddr + TYPHOON_REG_BOOT_LENGTH);
-                        iowrite32(csum, ioaddr + TYPHOON_REG_BOOT_CHECKSUM);
+                        iowrite32(le16_to_cpu((__force __le16)csum),
+                                        ioaddr + TYPHOON_REG_BOOT_CHECKSUM);
                        iowrite32(load_addr,
                                        ioaddr + TYPHOON_REG_BOOT_DEST_ADDR);
                        iowrite32(0, ioaddr + TYPHOON_REG_BOOT_DATA_HI);
@@ -1551,13 +1550,13 @@ typhoon_clean_tx(struct typhoon *tp, struct transmit_ring *txRing,
                if(type == TYPHOON_TX_DESC) {
                        /* This tx_desc describes a packet.
                         */
-                        unsigned long ptr = tx->addr | ((u64)tx->addrHi << 32);
+                        unsigned long ptr = tx->tx_addr;
                        struct sk_buff *skb = (struct sk_buff *) ptr;
                        dev_kfree_skb_irq(skb);
                } else if(type == TYPHOON_FRAG_DESC) {
                        /* This tx_desc describes a memory mapping. Free it.
                         */
-                        skb_dma = (dma_addr_t) le32_to_cpu(tx->addr);
+                        skb_dma = (dma_addr_t) le32_to_cpu(tx->frag.addr);
                        dma_len = le16_to_cpu(tx->len);
                        pci_unmap_single(tp->pdev, skb_dma, dma_len,
                                       PCI_DMA_TODEVICE);
@@ -1596,7 +1595,7 @@ typhoon_recycle_rx_skb(struct typhoon *tp, u32 idx)
        struct rx_free *r;
        if((ring->lastWrite + sizeof(*r)) % (RXFREE_ENTRIES * sizeof(*r)) ==
-                                indexes->rxBuffCleared) {
+                                le32_to_cpu(indexes->rxBuffCleared)) {
                /* no room in ring, just drop the skb
                 */
                dev_kfree_skb_any(rxb->skb);
@@ -1627,7 +1626,7 @@ typhoon_alloc_rx_skb(struct typhoon *tp, u32 idx)
        rxb->skb = NULL;
        if((ring->lastWrite + sizeof(*r)) % (RXFREE_ENTRIES * sizeof(*r)) ==
-                                indexes->rxBuffCleared)
+                                le32_to_cpu(indexes->rxBuffCleared))
                return -ENOMEM;
        skb = dev_alloc_skb(PKT_BUF_SZ);
diff --git a/drivers/net/typhoon.h b/drivers/net/typhoon.h
index 19df20889b82..dd7022ca7354 100644
--- a/drivers/net/typhoon.h
+++ b/drivers/net/typhoon.h
@@ -73,7 +73,7 @@ struct typhoon_indexes {
        volatile __le32 txLoCleared;
        volatile __le32 txHiCleared;
        volatile __le32 rxLoReady;
-        volatile __u32 rxBuffCleared;   /* AV: really? */
+        volatile __le32 rxBuffCleared;
        volatile __le32 cmdCleared;
        volatile __le32 respReady;
        volatile __le32 rxHiReady;
@@ -166,8 +166,13 @@ struct tx_desc {
 #define TYPHOON_DESC_VALID      0x80
        u8  numDesc;
        __le16 len;
-        u32 addr;
+        union {
-        u32 addrHi;
+                struct {
+                        __le32 addr;
+                        __le32 addrHi;
+                } frag;
+                u64 tx_addr;    /* opaque for hardware, for TX_DESC */
+        };
        __le32 processFlags;
 #define TYPHOON_TX_PF_NO_CRC            __constant_cpu_to_le32(0x00000001)
 #define TYPHOON_TX_PF_IP_CHKSUM         __constant_cpu_to_le32(0x00000002)
@@ -240,8 +245,8 @@ struct rx_desc {
        u8  flags;
        u8  numDesc;
        __le16 frameLen;
-        u32 addr;
+        u32 addr;       /* opaque, comes from virtAddr */
-        u32 addrHi;
+        u32 addrHi;     /* opaque, comes from virtAddrHi */
        __le32 rxStatus;
 #define TYPHOON_RX_ERR_INTERNAL         __constant_cpu_to_le32(0x00000000)
 #define TYPHOON_RX_ERR_FIFO_UNDERRUN    __constant_cpu_to_le32(0x00000001)
diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c
index a3ff270593f1..abac7db3819e 100644
--- a/drivers/net/ucc_geth.c
+++ b/drivers/net/ucc_geth.c
@@ -1460,6 +1460,8 @@ static int adjust_enet_interface(struct ucc_geth_private *ugeth)
        if ((ugeth->phy_interface == PHY_INTERFACE_MODE_RMII) ||
            (ugeth->phy_interface == PHY_INTERFACE_MODE_RGMII) ||
            (ugeth->phy_interface == PHY_INTERFACE_MODE_RGMII_ID) ||
+            (ugeth->phy_interface == PHY_INTERFACE_MODE_RGMII_RXID) ||
+            (ugeth->phy_interface == PHY_INTERFACE_MODE_RGMII_TXID) ||
            (ugeth->phy_interface == PHY_INTERFACE_MODE_RTBI)) {
                upsmr |= UPSMR_RPM;
                switch (ugeth->max_speed) {
@@ -1557,6 +1559,8 @@ static void adjust_link(struct net_device *dev)
                                if ((ugeth->phy_interface == PHY_INTERFACE_MODE_RMII) ||
                                    (ugeth->phy_interface == PHY_INTERFACE_MODE_RGMII) ||
                                    (ugeth->phy_interface == PHY_INTERFACE_MODE_RGMII_ID) ||
+                                    (ugeth->phy_interface == PHY_INTERFACE_MODE_RGMII_RXID) ||
+                                    (ugeth->phy_interface == PHY_INTERFACE_MODE_RGMII_TXID) ||
                                    (ugeth->phy_interface == PHY_INTERFACE_MODE_RTBI)) {
                                        if (phydev->speed == SPEED_10)
                                                upsmr |= UPSMR_R10M;
@@ -3443,7 +3447,7 @@ static int ucc_geth_rx(struct ucc_geth_private *ugeth, u8 rxQ, int rx_work_limit
        u16 length, howmany = 0;
        u32 bd_status;
        u8 *bdBuffer;
-        struct net_device * dev;
+        struct net_device *dev;
        ugeth_vdbg("%s: IN", __FUNCTION__);
@@ -3795,6 +3799,10 @@ static phy_interface_t to_phy_interface(const char *phy_connection_type)
                return PHY_INTERFACE_MODE_RGMII;
        if (strcasecmp(phy_connection_type, "rgmii-id") == 0)
                return PHY_INTERFACE_MODE_RGMII_ID;
+        if (strcasecmp(phy_connection_type, "rgmii-txid") == 0)
+                return PHY_INTERFACE_MODE_RGMII_TXID;
+        if (strcasecmp(phy_connection_type, "rgmii-rxid") == 0)
+                return PHY_INTERFACE_MODE_RGMII_RXID;
        if (strcasecmp(phy_connection_type, "rtbi") == 0)
                return PHY_INTERFACE_MODE_RTBI;
@@ -3889,6 +3897,8 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma
                case PHY_INTERFACE_MODE_GMII:
                case PHY_INTERFACE_MODE_RGMII:
                case PHY_INTERFACE_MODE_RGMII_ID:
+                case PHY_INTERFACE_MODE_RGMII_RXID:
+                case PHY_INTERFACE_MODE_RGMII_TXID:
                case PHY_INTERFACE_MODE_TBI:
                case PHY_INTERFACE_MODE_RTBI:
                        max_speed = SPEED_1000;
diff --git a/drivers/net/ucc_geth_mii.h b/drivers/net/ucc_geth_mii.h
index d83437039919..1e45b2028a50 100644
--- a/drivers/net/ucc_geth_mii.h
+++ b/drivers/net/ucc_geth_mii.h
@@ -96,5 +96,5 @@ enum enet_tbi_mii_reg {
 int uec_mdio_read(struct mii_bus *bus, int mii_id, int regnum);
 int uec_mdio_write(struct mii_bus *bus, int mii_id, int regnum, u16 value);
 int __init uec_mdio_init(void);
-void __exit uec_mdio_exit(void);
+void uec_mdio_exit(void);
 #endif                          /* __UEC_MII_H */
diff --git a/drivers/net/usb/asix.c b/drivers/net/usb/asix.c
index 61daa096de66..569028b2baf2 100644
--- a/drivers/net/usb/asix.c
+++ b/drivers/net/usb/asix.c
@@ -172,45 +172,76 @@ struct asix_data {
 };
 struct ax88172_int_data {
-        u16 res1;
+        __le16 res1;
        u8 link;
-        u16 res2;
+        __le16 res2;
        u8 status;
-        u16 res3;
+        __le16 res3;
 } __attribute__ ((packed));
 static int asix_read_cmd(struct usbnet *dev, u8 cmd, u16 value, u16 index,
                            u16 size, void *data)
 {
+        void *buf;
+        int err = -ENOMEM;
        devdbg(dev,"asix_read_cmd() cmd=0x%02x value=0x%04x index=0x%04x size=%d",
                cmd, value, index, size);
-        return usb_control_msg(
+        buf = kmalloc(size, GFP_KERNEL);
+        if (!buf)
+                goto out;
+        err = usb_control_msg(
                dev->udev,
                usb_rcvctrlpipe(dev->udev, 0),
                cmd,
                USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
                value,
                index,
-                data,
+                buf,
                size,
                USB_CTRL_GET_TIMEOUT);
+        if (err == size)
+                memcpy(data, buf, size);
+        else if (err >= 0)
+                err = -EINVAL;
+        kfree(buf);
+out:
+        return err;
 }
 static int asix_write_cmd(struct usbnet *dev, u8 cmd, u16 value, u16 index,
                             u16 size, void *data)
 {
+        void *buf = NULL;
+        int err = -ENOMEM;
        devdbg(dev,"asix_write_cmd() cmd=0x%02x value=0x%04x index=0x%04x size=%d",
                cmd, value, index, size);
-        return usb_control_msg(
+        if (data) {
+                buf = kmalloc(size, GFP_KERNEL);
+                if (!buf)
+                        goto out;
+                memcpy(buf, data, size);
+        }
+        err = usb_control_msg(
                dev->udev,
                usb_sndctrlpipe(dev->udev, 0),
                cmd,
                USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
                value,
                index,
-                data,
+                buf,
                size,
                USB_CTRL_SET_TIMEOUT);
+        kfree(buf);
+out:
+        return err;
 }
 static void asix_async_cmd_callback(struct urb *urb)
@@ -402,25 +433,19 @@ static inline int asix_set_hw_mii(struct usbnet *dev)
 static inline int asix_get_phy_addr(struct usbnet *dev)
 {
-        int ret = 0;
+        u8 buf[2];
-        void *buf;
+        int ret = asix_read_cmd(dev, AX_CMD_READ_PHY_ID, 0, 0, 2, buf);
        devdbg(dev, "asix_get_phy_addr()");
-        buf = kmalloc(2, GFP_KERNEL);
+        if (ret < 0) {
-        if (!buf)
-                goto out1;
-        if ((ret = asix_read_cmd(dev, AX_CMD_READ_PHY_ID,
-                                    0, 0, 2, buf)) < 2) {
                deverr(dev, "Error reading PHYID register: %02x", ret);
-                goto out2;
+                goto out;
        }
-        devdbg(dev, "asix_get_phy_addr() returning 0x%04x", *((u16 *)buf));
+        devdbg(dev, "asix_get_phy_addr() returning 0x%04x", *((__le16 *)buf));
-        ret = *((u8 *)buf + 1);
+        ret = buf[1];
-out2:
-        kfree(buf);
+out:
-out1:
        return ret;
 }
@@ -437,22 +462,15 @@ static int asix_sw_reset(struct usbnet *dev, u8 flags)
 static u16 asix_read_rx_ctl(struct usbnet *dev)
 {
-        u16 ret = 0;
+        __le16 v;
-        void *buf;
+        int ret = asix_read_cmd(dev, AX_CMD_READ_RX_CTL, 0, 0, 2, &v);
-        buf = kmalloc(2, GFP_KERNEL);
-        if (!buf)
-                goto out1;
-        if ((ret = asix_read_cmd(dev, AX_CMD_READ_RX_CTL,
+        if (ret < 0) {
-                                    0, 0, 2, buf)) < 2) {
                deverr(dev, "Error reading RX_CTL register: %02x", ret);
-                goto out2;
+                goto out;
        }
-        ret = le16_to_cpu(*((u16 *)buf));
+        ret = le16_to_cpu(v);
-out2:
+out:
-        kfree(buf);
-out1:
        return ret;
 }
@@ -471,22 +489,15 @@ static int asix_write_rx_ctl(struct usbnet *dev, u16 mode)
 static u16 asix_read_medium_status(struct usbnet *dev)
 {
-        u16 ret = 0;
+        __le16 v;
-        void *buf;
+        int ret = asix_read_cmd(dev, AX_CMD_READ_MEDIUM_STATUS, 0, 0, 2, &v);
-        buf = kmalloc(2, GFP_KERNEL);
+        if (ret < 0) {
-        if (!buf)
-                goto out1;
-        if ((ret = asix_read_cmd(dev, AX_CMD_READ_MEDIUM_STATUS,
-                                    0, 0, 2, buf)) < 2) {
                deverr(dev, "Error reading Medium Status register: %02x", ret);
-                goto out2;
+                goto out;
        }
-        ret = le16_to_cpu(*((u16 *)buf));
+        ret = le16_to_cpu(v);
-out2:
+out:
-        kfree(buf);
-out1:
        return ret;
 }
@@ -568,31 +579,30 @@ static void asix_set_multicast(struct net_device *net)
 static int asix_mdio_read(struct net_device *netdev, int phy_id, int loc)
 {
        struct usbnet *dev = netdev_priv(netdev);
-        u16 res;
+        __le16 res;
        mutex_lock(&dev->phy_mutex);
        asix_set_sw_mii(dev);
        asix_read_cmd(dev, AX_CMD_READ_MII_REG, phy_id,
-                                (__u16)loc, 2, (u16 *)&res);
+                                (__u16)loc, 2, &res);
        asix_set_hw_mii(dev);
        mutex_unlock(&dev->phy_mutex);
-        devdbg(dev, "asix_mdio_read() phy_id=0x%02x, loc=0x%02x, returns=0x%04x", phy_id, loc, le16_to_cpu(res & 0xffff));
+        devdbg(dev, "asix_mdio_read() phy_id=0x%02x, loc=0x%02x, returns=0x%04x", phy_id, loc, le16_to_cpu(res));
-        return le16_to_cpu(res & 0xffff);
+        return le16_to_cpu(res);
 }
 static void
 asix_mdio_write(struct net_device *netdev, int phy_id, int loc, int val)
 {
        struct usbnet *dev = netdev_priv(netdev);
-        u16 res = cpu_to_le16(val);
+        __le16 res = cpu_to_le16(val);
        devdbg(dev, "asix_mdio_write() phy_id=0x%02x, loc=0x%02x, val=0x%04x", phy_id, loc, val);
        mutex_lock(&dev->phy_mutex);
        asix_set_sw_mii(dev);
-        asix_write_cmd(dev, AX_CMD_WRITE_MII_REG, phy_id,
+        asix_write_cmd(dev, AX_CMD_WRITE_MII_REG, phy_id, (__u16)loc, 2, &res);
-                                (__u16)loc, 2, (u16 *)&res);
        asix_set_hw_mii(dev);
        mutex_unlock(&dev->phy_mutex);
 }
@@ -644,7 +654,6 @@ asix_set_wol(struct net_device *net, struct ethtool_wolinfo *wolinfo)
 {
        struct usbnet *dev = netdev_priv(net);
        u8 opt = 0;
-        u8 buf[1];
        if (wolinfo->wolopts & WAKE_PHY)
                opt |= AX_MONITOR_LINK;
@@ -654,7 +663,7 @@ asix_set_wol(struct net_device *net, struct ethtool_wolinfo *wolinfo)
                opt |= AX_MONITOR_MODE;
        if (asix_write_cmd(dev, AX_CMD_WRITE_MONITOR_MODE,
-                              opt, 0, 0, &buf) < 0)
+                              opt, 0, 0, NULL) < 0)
                return -EINVAL;
        return 0;
@@ -672,7 +681,7 @@ static int asix_get_eeprom(struct net_device *net,
                              struct ethtool_eeprom *eeprom, u8 *data)
 {
        struct usbnet *dev = netdev_priv(net);
-        u16 *ebuf = (u16 *)data;
+        __le16 *ebuf = (__le16 *)data;
        int i;
        /* Crude hack to ensure that we don't overwrite memory
@@ -801,7 +810,7 @@ static int ax88172_link_reset(struct usbnet *dev)
 static int ax88172_bind(struct usbnet *dev, struct usb_interface *intf)
 {
        int ret = 0;
-        void *buf;
+        u8 buf[ETH_ALEN];
        int i;
        unsigned long gpio_bits = dev->driver_info->data;
        struct asix_data *data = (struct asix_data *)&dev->data;
@@ -810,30 +819,23 @@ static int ax88172_bind(struct usbnet *dev, struct usb_interface *intf)
        usbnet_get_endpoints(dev,intf);
-        buf = kmalloc(ETH_ALEN, GFP_KERNEL);
-        if(!buf) {
-                ret = -ENOMEM;
-                goto out1;
-        }
        /* Toggle the GPIOs in a manufacturer/model specific way */
        for (i = 2; i >= 0; i--) {
                if ((ret = asix_write_cmd(dev, AX_CMD_WRITE_GPIOS,
                                        (gpio_bits >> (i * 8)) & 0xff, 0, 0,
-                                        buf)) < 0)
+                                        NULL)) < 0)
-                        goto out2;
+                        goto out;
                msleep(5);
        }
        if ((ret = asix_write_rx_ctl(dev, 0x80)) < 0)
-                goto out2;
+                goto out;
        /* Get the MAC address */
-        memset(buf, 0, ETH_ALEN);
        if ((ret = asix_read_cmd(dev, AX88172_CMD_READ_NODE_ID,
-                                0, 0, 6, buf)) < 0) {
+                                0, 0, ETH_ALEN, buf)) < 0) {
                dbg("read AX_CMD_READ_NODE_ID failed: %d", ret);
-                goto out2;
+                goto out;
        }
        memcpy(dev->net->dev_addr, buf, ETH_ALEN);
@@ -855,9 +857,8 @@ static int ax88172_bind(struct usbnet *dev, struct usb_interface *intf)
        mii_nway_restart(&dev->mii);
        return 0;
-out2:
-        kfree(buf);
+out:
-out1:
        return ret;
 }
@@ -900,66 +901,58 @@ static int ax88772_link_reset(struct usbnet *dev)
 static int ax88772_bind(struct usbnet *dev, struct usb_interface *intf)
 {
        int ret, embd_phy;
-        void *buf;
        u16 rx_ctl;
        struct asix_data *data = (struct asix_data *)&dev->data;
+        u8 buf[ETH_ALEN];
        u32 phyid;
        data->eeprom_len = AX88772_EEPROM_LEN;
        usbnet_get_endpoints(dev,intf);
-        buf = kmalloc(6, GFP_KERNEL);
-        if(!buf) {
-                dbg ("Cannot allocate memory for buffer");
-                ret = -ENOMEM;
-                goto out1;
-        }
        if ((ret = asix_write_gpio(dev,
                        AX_GPIO_RSE | AX_GPIO_GPO_2 | AX_GPIO_GPO2EN, 5)) < 0)
-                goto out2;
+                goto out;
        /* 0x10 is the phy id of the embedded 10/100 ethernet phy */
        embd_phy = ((asix_get_phy_addr(dev) & 0x1f) == 0x10 ? 1 : 0);
        if ((ret = asix_write_cmd(dev, AX_CMD_SW_PHY_SELECT,
-                                embd_phy, 0, 0, buf)) < 0) {
+                                embd_phy, 0, 0, NULL)) < 0) {
                dbg("Select PHY #1 failed: %d", ret);
-                goto out2;
+                goto out;
        }
        if ((ret = asix_sw_reset(dev, AX_SWRESET_IPPD | AX_SWRESET_PRL)) < 0)
-                goto out2;
+                goto out;
        msleep(150);
        if ((ret = asix_sw_reset(dev, AX_SWRESET_CLEAR)) < 0)
-                goto out2;
+                goto out;
        msleep(150);
        if (embd_phy) {
                if ((ret = asix_sw_reset(dev, AX_SWRESET_IPRL)) < 0)
-                        goto out2;
+                        goto out;
        }
        else {
                if ((ret = asix_sw_reset(dev, AX_SWRESET_PRTE)) < 0)
-                        goto out2;
+                        goto out;
        }
        msleep(150);
        rx_ctl = asix_read_rx_ctl(dev);
        dbg("RX_CTL is 0x%04x after software reset", rx_ctl);
        if ((ret = asix_write_rx_ctl(dev, 0x0000)) < 0)
-                goto out2;
+                goto out;
        rx_ctl = asix_read_rx_ctl(dev);
        dbg("RX_CTL is 0x%04x setting to 0x0000", rx_ctl);
        /* Get the MAC address */
-        memset(buf, 0, ETH_ALEN);
        if ((ret = asix_read_cmd(dev, AX_CMD_READ_NODE_ID,
                                0, 0, ETH_ALEN, buf)) < 0) {
                dbg("Failed to read MAC address: %d", ret);
-                goto out2;
+                goto out;
        }
        memcpy(dev->net->dev_addr, buf, ETH_ALEN);
@@ -976,12 +969,12 @@ static int ax88772_bind(struct usbnet *dev, struct usb_interface *intf)
        dbg("PHYID=0x%08x", phyid);
        if ((ret = asix_sw_reset(dev, AX_SWRESET_PRL)) < 0)
-                goto out2;
+                goto out;
        msleep(150);
        if ((ret = asix_sw_reset(dev, AX_SWRESET_IPRL | AX_SWRESET_PRL)) < 0)
-                goto out2;
+                goto out;
        msleep(150);
@@ -994,18 +987,18 @@ static int ax88772_bind(struct usbnet *dev, struct usb_interface *intf)
        mii_nway_restart(&dev->mii);
        if ((ret = asix_write_medium_mode(dev, AX88772_MEDIUM_DEFAULT)) < 0)
-                goto out2;
+                goto out;
        if ((ret = asix_write_cmd(dev, AX_CMD_WRITE_IPG0,
                                AX88772_IPG0_DEFAULT | AX88772_IPG1_DEFAULT,
-                                AX88772_IPG2_DEFAULT, 0, buf)) < 0) {
+                                AX88772_IPG2_DEFAULT, 0, NULL)) < 0) {
                dbg("Write IPG,IPG1,IPG2 failed: %d", ret);
-                goto out2;
+                goto out;
        }
        /* Set RX_CTL to default values with 2k buffer, and enable cactus */
        if ((ret = asix_write_rx_ctl(dev, AX_DEFAULT_RX_CTL)) < 0)
-                goto out2;
+                goto out;
        rx_ctl = asix_read_rx_ctl(dev);
        dbg("RX_CTL is 0x%04x after all initializations", rx_ctl);
@@ -1013,20 +1006,15 @@ static int ax88772_bind(struct usbnet *dev, struct usb_interface *intf)
        rx_ctl = asix_read_medium_status(dev);
        dbg("Medium Status is 0x%04x after all initializations", rx_ctl);
-        kfree(buf);
        /* Asix framing packs multiple eth frames into a 2K usb bulk transfer */
        if (dev->driver_info->flags & FLAG_FRAMING_AX) {
                /* hard_mtu  is still the default - the device does not support
                   jumbo eth frames */
                dev->rx_urb_size = 2048;
        }
        return 0;
-out2:
+out:
-        kfree(buf);
-out1:
        return ret;
 }
@@ -1195,23 +1183,16 @@ static int ax88178_bind(struct usbnet *dev, struct usb_interface *intf)
 {
        struct asix_data *data = (struct asix_data *)&dev->data;
        int ret;
-        void *buf;
+        u8 buf[ETH_ALEN];
-        u16 eeprom;
+        __le16 eeprom;
+        u8 status;
        int gpio0 = 0;
        u32 phyid;
        usbnet_get_endpoints(dev,intf);
-        buf = kmalloc(6, GFP_KERNEL);
+        asix_read_cmd(dev, AX_CMD_READ_GPIOS, 0, 0, 1, &status);
-        if(!buf) {
+        dbg("GPIO Status: 0x%04x", status);
-                dbg ("Cannot allocate memory for buffer");
-                ret = -ENOMEM;
-                goto out1;
-        }
-        eeprom = 0;
-        asix_read_cmd(dev, AX_CMD_READ_GPIOS, 0, 0, 1, &eeprom);
-        dbg("GPIO Status: 0x%04x", eeprom);
        asix_write_cmd(dev, AX_CMD_WRITE_ENABLE, 0, 0, 0, NULL);
        asix_read_cmd(dev, AX_CMD_READ_EEPROM, 0x0017, 0, 2, &eeprom);
@@ -1219,19 +1200,19 @@ static int ax88178_bind(struct usbnet *dev, struct usb_interface *intf)
        dbg("EEPROM index 0x17 is 0x%04x", eeprom);
-        if (eeprom == 0xffff) {
+        if (eeprom == cpu_to_le16(0xffff)) {
                data->phymode = PHY_MODE_MARVELL;
                data->ledmode = 0;
                gpio0 = 1;
        } else {
-                data->phymode = eeprom & 7;
+                data->phymode = le16_to_cpu(eeprom) & 7;
-                data->ledmode = eeprom >> 8;
+                data->ledmode = le16_to_cpu(eeprom) >> 8;
-                gpio0 = (eeprom & 0x80) ? 0 : 1;
+                gpio0 = (le16_to_cpu(eeprom) & 0x80) ? 0 : 1;
        }
        dbg("GPIO0: %d, PhyMode: %d", gpio0, data->phymode);
        asix_write_gpio(dev, AX_GPIO_RSE | AX_GPIO_GPO_1 | AX_GPIO_GPO1EN, 40);
-        if ((eeprom >> 8) != 1) {
+        if ((le16_to_cpu(eeprom) >> 8) != 1) {
                asix_write_gpio(dev, 0x003c, 30);
                asix_write_gpio(dev, 0x001c, 300);
                asix_write_gpio(dev, 0x003c, 30);
@@ -1250,11 +1231,10 @@ static int ax88178_bind(struct usbnet *dev, struct usb_interface *intf)
        asix_write_rx_ctl(dev, 0);
        /* Get the MAC address */
-        memset(buf, 0, ETH_ALEN);
        if ((ret = asix_read_cmd(dev, AX_CMD_READ_NODE_ID,
                                0, 0, ETH_ALEN, buf)) < 0) {
                dbg("Failed to read MAC address: %d", ret);
-                goto out2;
+                goto out;
        }
        memcpy(dev->net->dev_addr, buf, ETH_ALEN);
@@ -1289,12 +1269,10 @@ static int ax88178_bind(struct usbnet *dev, struct usb_interface *intf)
        mii_nway_restart(&dev->mii);
        if ((ret = asix_write_medium_mode(dev, AX88178_MEDIUM_DEFAULT)) < 0)
-                goto out2;
+                goto out;
        if ((ret = asix_write_rx_ctl(dev, AX_DEFAULT_RX_CTL)) < 0)
-                goto out2;
+                goto out;
-        kfree(buf);
        /* Asix framing packs multiple eth frames into a 2K usb bulk transfer */
        if (dev->driver_info->flags & FLAG_FRAMING_AX) {
@@ -1302,12 +1280,9 @@ static int ax88178_bind(struct usbnet *dev, struct usb_interface *intf)
                   jumbo eth frames */
                dev->rx_urb_size = 2048;
        }
        return 0;
-out2:
+out:
-        kfree(buf);
-out1:
        return ret;
 }
diff --git a/drivers/net/usb/dm9601.c b/drivers/net/usb/dm9601.c
index 2c685734b7a4..1ffdd106f4c4 100644
--- a/drivers/net/usb/dm9601.c
+++ b/drivers/net/usb/dm9601.c
@@ -94,7 +94,7 @@ static void dm_write_async_callback(struct urb *urb)
        struct usb_ctrlrequest *req = (struct usb_ctrlrequest *)urb->context;
        if (urb->status < 0)
-                printk(KERN_DEBUG "dm_write_async_callback() failed with %d",
+                printk(KERN_DEBUG "dm_write_async_callback() failed with %d\n",
                       urb->status);
        kfree(req);
diff --git a/drivers/net/usb/kaweth.c b/drivers/net/usb/kaweth.c
index 58a53a641754..569ad8bfd383 100644
--- a/drivers/net/usb/kaweth.c
+++ b/drivers/net/usb/kaweth.c
@@ -70,7 +70,7 @@
 #define KAWETH_TX_TIMEOUT               (5 * HZ)
 #define KAWETH_SCRATCH_SIZE             32
 #define KAWETH_FIRMWARE_BUF_SIZE        4096
-#define KAWETH_CONTROL_TIMEOUT          (30 * HZ)
+#define KAWETH_CONTROL_TIMEOUT          (30000)
 #define KAWETH_STATUS_BROKEN            0x0000001
 #define KAWETH_STATUS_CLOSING           0x0000002
diff --git a/drivers/net/usb/mcs7830.c b/drivers/net/usb/mcs7830.c
index f55a5951733a..5ea7411e1337 100644
--- a/drivers/net/usb/mcs7830.c
+++ b/drivers/net/usb/mcs7830.c
@@ -94,7 +94,7 @@ static int mcs7830_get_reg(struct usbnet *dev, u16 index, u16 size, void *data)
        ret = usb_control_msg(xdev, usb_rcvctrlpipe(xdev, 0), MCS7830_RD_BREQ,
                              MCS7830_RD_BMREQ, 0x0000, index, data,
-                              size, msecs_to_jiffies(MCS7830_CTRL_TIMEOUT));
+                              size, MCS7830_CTRL_TIMEOUT);
        return ret;
 }
@@ -105,7 +105,7 @@ static int mcs7830_set_reg(struct usbnet *dev, u16 index, u16 size, void *data)
        ret = usb_control_msg(xdev, usb_sndctrlpipe(xdev, 0), MCS7830_WR_BREQ,
                              MCS7830_WR_BMREQ, 0x0000, index, data,
-                              size, msecs_to_jiffies(MCS7830_CTRL_TIMEOUT));
+                              size, MCS7830_CTRL_TIMEOUT);
        return ret;
 }
diff --git a/drivers/net/veth.c b/drivers/net/veth.c
index fdd1e034569d..3f67a29593bc 100644
--- a/drivers/net/veth.c
+++ b/drivers/net/veth.c
@@ -15,7 +15,7 @@
 #include <net/dst.h>
 #include <net/xfrm.h>
-#include <net/veth.h>
+#include <linux/veth.h>
 #define DRV_NAME        "veth"
 #define DRV_VERSION     "1.0"
@@ -459,19 +459,7 @@ static __init int veth_init(void)
 static __exit void veth_exit(void)
 {
-        struct veth_priv *priv, *next;
+        rtnl_link_unregister(&veth_link_ops);
-        rtnl_lock();
-        /*
-         * cannot trust __rtnl_link_unregister() to unregister all
-         * devices, as each ->dellink call will remove two devices
-         * from the list at once.
-         */
-        list_for_each_entry_safe(priv, next, &veth_list, list)
-                veth_dellink(priv->dev);
-        __rtnl_link_unregister(&veth_link_ops);
-        rtnl_unlock();
 }
 module_init(veth_init);
diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c
index 450e29d7a9f3..35cd65d6b9ed 100644
--- a/drivers/net/via-velocity.c
+++ b/drivers/net/via-velocity.c
@@ -1242,6 +1242,9 @@ static int velocity_rx_refill(struct velocity_info *vptr)
 static int velocity_init_rd_ring(struct velocity_info *vptr)
 {
        int ret;
+        int mtu = vptr->dev->mtu;
+        vptr->rx_buf_sz = (mtu <= ETH_DATA_LEN) ? PKT_BUF_SZ : mtu + 32;
        vptr->rd_info = kcalloc(vptr->options.numrx,
                                sizeof(struct velocity_rd_info), GFP_KERNEL);
@@ -1898,8 +1901,6 @@ static int velocity_open(struct net_device *dev)
        struct velocity_info *vptr = netdev_priv(dev);
        int ret;
-        vptr->rx_buf_sz = (dev->mtu <= 1504 ? PKT_BUF_SZ : dev->mtu + 32);
        ret = velocity_init_rings(vptr);
        if (ret < 0)
                goto out;
@@ -1978,12 +1979,6 @@ static int velocity_change_mtu(struct net_device *dev, int new_mtu)
                velocity_free_rd_ring(vptr);
                dev->mtu = new_mtu;
-                if (new_mtu > 8192)
-                        vptr->rx_buf_sz = 9 * 1024;
-                else if (new_mtu > 4096)
-                        vptr->rx_buf_sz = 8192;
-                else
-                        vptr->rx_buf_sz = 4 * 1024;
                ret = velocity_init_rd_ring(vptr);
                if (ret < 0)
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index a75be57fb209..5413dbf3d4ac 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -198,8 +198,8 @@ again:
        if (vi->num < vi->max / 2)
                try_fill_recv(vi);
-        /* All done? */
+        /* Out of packets? */
-        if (!skb) {
+        if (received < budget) {
                netif_rx_complete(vi->dev, napi);
                if (unlikely(!vi->rvq->vq_ops->restart(vi->rvq))
                    && netif_rx_reschedule(vi->dev, napi))
@@ -404,8 +404,12 @@ free:
 static void virtnet_remove(struct virtio_device *vdev)
 {
-        unregister_netdev(vdev->priv);
+        struct virtnet_info *vi = vdev->priv;
-        free_netdev(vdev->priv);
+        vdev->config->del_vq(vi->svq);
+        vdev->config->del_vq(vi->rvq);
+        unregister_netdev(vi->dev);
+        free_netdev(vi->dev);
 }
 static struct virtio_device_id id_table[] = {
diff --git a/drivers/net/wan/cosa.c b/drivers/net/wan/cosa.c
index ff37bf437a99..1d706eae3052 100644
--- a/drivers/net/wan/cosa.c
+++ b/drivers/net/wan/cosa.c
@@ -395,8 +395,7 @@ static int __init cosa_init(void)
                goto out_chrdev;
        }
        for (i=0; i<nr_cards; i++) {
-                class_device_create(cosa_class, NULL, MKDEV(cosa_major, i),
+                device_create(cosa_class, NULL, MKDEV(cosa_major, i), "cosa%d", i);
-                                NULL, "cosa%d", i);
        }
        err = 0;
        goto out;
@@ -415,7 +414,7 @@ static void __exit cosa_exit(void)
        printk(KERN_INFO "Unloading the cosa module\n");
        for (i=0; i<nr_cards; i++)
-                class_device_destroy(cosa_class, MKDEV(cosa_major, i));
+                device_destroy(cosa_class, MKDEV(cosa_major, i));
        class_destroy(cosa_class);
        for (cosa=cosa_cards; nr_cards--; cosa++) {
                /* Clean up the per-channel data */
diff --git a/drivers/net/wan/cycx_x25.c b/drivers/net/wan/cycx_x25.c
index 8a1778cf98d1..d3b28b01b9f9 100644
--- a/drivers/net/wan/cycx_x25.c
+++ b/drivers/net/wan/cycx_x25.c
@@ -503,7 +503,7 @@ static int cycx_netdevice_init(struct net_device *dev)
        dev->addr_len           = 0;            /* hardware address length */
        if (!chan->svc)
-                *(u16*)dev->dev_addr = htons(chan->lcn);
+                *(__be16*)dev->dev_addr = htons(chan->lcn);
        /* Initialize hardware parameters (just for reference) */
        dev->irq                = wandev->irq;
@@ -565,7 +565,7 @@ static int cycx_netdevice_hard_header(struct sk_buff *skb,
                                      const void *daddr, const void *saddr,
                                      unsigned len)
 {
-        skb->protocol = type;
+        skb->protocol = htons(type);
        return dev->hard_header_len;
 }
@@ -600,15 +600,15 @@ static int cycx_netdevice_hard_start_xmit(struct sk_buff *skb,
        struct cycx_device *card = chan->card;
        if (!chan->svc)
-                chan->protocol = skb->protocol;
+                chan->protocol = ntohs(skb->protocol);
        if (card->wandev.state != WAN_CONNECTED)
                ++chan->ifstats.tx_dropped;
        else if (chan->svc && chan->protocol &&
-                 chan->protocol != skb->protocol) {
+                 chan->protocol != ntohs(skb->protocol)) {
                printk(KERN_INFO
                       "%s: unsupported Ethertype 0x%04X on interface %s!\n",
-                       card->devname, skb->protocol, dev->name);
+                       card->devname, ntohs(skb->protocol), dev->name);
                ++chan->ifstats.tx_errors;
        } else if (chan->protocol == ETH_P_IP) {
                switch (chan->state) {
@@ -1401,7 +1401,7 @@ static void cycx_x25_set_chan_state(struct net_device *dev, u8 state)
                switch (state) {
                case WAN_CONNECTED:
                        string_state = "connected!";
-                        *(u16*)dev->dev_addr = htons(chan->lcn);
+                        *(__be16*)dev->dev_addr = htons(chan->lcn);
                        netif_wake_queue(dev);
                        reset_timer(dev);
diff --git a/drivers/net/wan/dscc4.c b/drivers/net/wan/dscc4.c
index 33dc713b5301..c6f26e28e376 100644
--- a/drivers/net/wan/dscc4.c
+++ b/drivers/net/wan/dscc4.c
@@ -139,19 +139,21 @@ struct thingie {
 };
 struct TxFD {
-        u32 state;
+        __le32 state;
-        u32 next;
+        __le32 next;
-        u32 data;
+        __le32 data;
-        u32 complete;
+        __le32 complete;
        u32 jiffies; /* Allows sizeof(TxFD) == sizeof(RxFD) + extra hack */
+                     /* FWIW, datasheet calls that "dummy" and says that card
+                      * never looks at it; neither does the driver */
 };
 struct RxFD {
-        u32 state1;
+        __le32 state1;
-        u32 next;
+        __le32 next;
-        u32 data;
+        __le32 data;
-        u32 state2;
+        __le32 state2;
-        u32 end;
+        __le32 end;
 };
 #define DUMMY_SKB_SIZE          64
@@ -181,7 +183,7 @@ struct RxFD {
 #define SCC_REG_START(dpriv)    (SCC_START+(dpriv->dev_id)*SCC_OFFSET)
 struct dscc4_pci_priv {
-        u32 *iqcfg;
+        __le32 *iqcfg;
        int cfg_cur;
        spinlock_t lock;
        struct pci_dev *pdev;
@@ -197,8 +199,8 @@ struct dscc4_dev_priv {
        struct RxFD *rx_fd;
        struct TxFD *tx_fd;
-        u32 *iqrx;
+        __le32 *iqrx;
-        u32 *iqtx;
+        __le32 *iqtx;
        /* FIXME: check all the volatile are required */
        volatile u32 tx_current;
@@ -298,7 +300,7 @@ struct dscc4_dev_priv {
 #define BrrExpMask      0x00000f00
 #define BrrMultMask     0x0000003f
 #define EncodingMask    0x00700000
-#define Hold            0x40000000
+#define Hold            cpu_to_le32(0x40000000)
 #define SccBusy         0x10000000
 #define PowerUp         0x80000000
 #define Vis             0x00001000
@@ -307,14 +309,14 @@ struct dscc4_dev_priv {
 #define FrameRdo        0x40
 #define FrameCrc        0x20
 #define FrameRab        0x10
-#define FrameAborted    0x00000200
+#define FrameAborted    cpu_to_le32(0x00000200)
-#define FrameEnd        0x80000000
+#define FrameEnd        cpu_to_le32(0x80000000)
-#define DataComplete    0x40000000
+#define DataComplete    cpu_to_le32(0x40000000)
 #define LengthCheck     0x00008000
 #define SccEvt          0x02000000
 #define NoAck           0x00000200
 #define Action          0x00000001
-#define HiDesc          0x20000000
+#define HiDesc          cpu_to_le32(0x20000000)
 /* SCC events */
 #define RxEvt           0xf0000000
@@ -489,8 +491,8 @@ static void dscc4_release_ring(struct dscc4_dev_priv *dpriv)
        skbuff = dpriv->tx_skbuff;
        for (i = 0; i < TX_RING_SIZE; i++) {
                if (*skbuff) {
-                        pci_unmap_single(pdev, tx_fd->data, (*skbuff)->len,
+                        pci_unmap_single(pdev, le32_to_cpu(tx_fd->data),
-                                PCI_DMA_TODEVICE);
+                                (*skbuff)->len, PCI_DMA_TODEVICE);
                        dev_kfree_skb(*skbuff);
                }
                skbuff++;
@@ -500,7 +502,7 @@ static void dscc4_release_ring(struct dscc4_dev_priv *dpriv)
        skbuff = dpriv->rx_skbuff;
        for (i = 0; i < RX_RING_SIZE; i++) {
                if (*skbuff) {
-                        pci_unmap_single(pdev, rx_fd->data,
+                        pci_unmap_single(pdev, le32_to_cpu(rx_fd->data),
                                RX_MAX(HDLC_MAX_MRU), PCI_DMA_FROMDEVICE);
                        dev_kfree_skb(*skbuff);
                }
@@ -522,10 +524,10 @@ static inline int try_get_rx_skb(struct dscc4_dev_priv *dpriv,
        dpriv->rx_skbuff[dirty] = skb;
        if (skb) {
                skb->protocol = hdlc_type_trans(skb, dev);
-                rx_fd->data = pci_map_single(dpriv->pci_priv->pdev, skb->data,
+                rx_fd->data = cpu_to_le32(pci_map_single(dpriv->pci_priv->pdev,
-                                             len, PCI_DMA_FROMDEVICE);
+                                          skb->data, len, PCI_DMA_FROMDEVICE));
        } else {
-                rx_fd->data = (u32) NULL;
+                rx_fd->data = 0;
                ret = -1;
        }
        return ret;
@@ -587,7 +589,7 @@ static inline int dscc4_xpr_ack(struct dscc4_dev_priv *dpriv)
        do {
                if (!(dpriv->flags & (NeedIDR | NeedIDT)) ||
-                    (dpriv->iqtx[cur] & Xpr))
+                    (dpriv->iqtx[cur] & cpu_to_le32(Xpr)))
                        break;
                smp_rmb();
                schedule_timeout_uninterruptible(10);
@@ -650,8 +652,9 @@ static inline void dscc4_rx_skb(struct dscc4_dev_priv *dpriv,
                printk(KERN_DEBUG "%s: skb=0 (%s)\n", dev->name, __FUNCTION__);
                goto refill;
        }
-        pkt_len = TO_SIZE(rx_fd->state2);
+        pkt_len = TO_SIZE(le32_to_cpu(rx_fd->state2));
-        pci_unmap_single(pdev, rx_fd->data, RX_MAX(HDLC_MAX_MRU), PCI_DMA_FROMDEVICE);
+        pci_unmap_single(pdev, le32_to_cpu(rx_fd->data),
+                         RX_MAX(HDLC_MAX_MRU), PCI_DMA_FROMDEVICE);
        if ((skb->data[--pkt_len] & FrameOk) == FrameOk) {
                stats->rx_packets++;
                stats->rx_bytes += pkt_len;
@@ -679,7 +682,7 @@ refill:
        }
        dscc4_rx_update(dpriv, dev);
        rx_fd->state2 = 0x00000000;
-        rx_fd->end = 0xbabeface;
+        rx_fd->end = cpu_to_le32(0xbabeface);
 }
 static void dscc4_free1(struct pci_dev *pdev)
@@ -772,8 +775,8 @@ static int __devinit dscc4_init_one(struct pci_dev *pdev,
        }
        /* Global interrupt queue */
        writel((u32)(((IRQ_RING_SIZE >> 5) - 1) << 20), ioaddr + IQLENR1);
-        priv->iqcfg = (u32 *) pci_alloc_consistent(pdev,
+        priv->iqcfg = (__le32 *) pci_alloc_consistent(pdev,
-                IRQ_RING_SIZE*sizeof(u32), &priv->iqcfg_dma);
+                IRQ_RING_SIZE*sizeof(__le32), &priv->iqcfg_dma);
        if (!priv->iqcfg)
                goto err_free_irq_5;
        writel(priv->iqcfg_dma, ioaddr + IQCFG);
@@ -786,7 +789,7 @@ static int __devinit dscc4_init_one(struct pci_dev *pdev,
         */
        for (i = 0; i < dev_per_card; i++) {
                dpriv = priv->root + i;
-                dpriv->iqtx = (u32 *) pci_alloc_consistent(pdev,
+                dpriv->iqtx = (__le32 *) pci_alloc_consistent(pdev,
                        IRQ_RING_SIZE*sizeof(u32), &dpriv->iqtx_dma);
                if (!dpriv->iqtx)
                        goto err_free_iqtx_6;
@@ -794,7 +797,7 @@ static int __devinit dscc4_init_one(struct pci_dev *pdev,
        }
        for (i = 0; i < dev_per_card; i++) {
                dpriv = priv->root + i;
-                dpriv->iqrx = (u32 *) pci_alloc_consistent(pdev,
+                dpriv->iqrx = (__le32 *) pci_alloc_consistent(pdev,
                        IRQ_RING_SIZE*sizeof(u32), &dpriv->iqrx_dma);
                if (!dpriv->iqrx)
                        goto err_free_iqrx_7;
@@ -1156,8 +1159,8 @@ static int dscc4_start_xmit(struct sk_buff *skb, struct net_device *dev)
        dpriv->tx_skbuff[next] = skb;
        tx_fd = dpriv->tx_fd + next;
        tx_fd->state = FrameEnd | TO_STATE_TX(skb->len);
-        tx_fd->data = pci_map_single(ppriv->pdev, skb->data, skb->len,
+        tx_fd->data = cpu_to_le32(pci_map_single(ppriv->pdev, skb->data, skb->len,
-                                     PCI_DMA_TODEVICE);
+                                     PCI_DMA_TODEVICE));
        tx_fd->complete = 0x00000000;
        tx_fd->jiffies = jiffies;
        mb();
@@ -1508,7 +1511,7 @@ static irqreturn_t dscc4_irq(int irq, void *token)
        if (state & Cfg) {
                if (debug > 0)
                        printk(KERN_DEBUG "%s: CfgIV\n", DRV_NAME);
-                if (priv->iqcfg[priv->cfg_cur++%IRQ_RING_SIZE] & Arf)
+                if (priv->iqcfg[priv->cfg_cur++%IRQ_RING_SIZE] & cpu_to_le32(Arf))
                        printk(KERN_ERR "%s: %s failed\n", dev->name, "CFG");
                if (!(state &= ~Cfg))
                        goto out;
@@ -1541,7 +1544,7 @@ static void dscc4_tx_irq(struct dscc4_pci_priv *ppriv,
 try:
        cur = dpriv->iqtx_current%IRQ_RING_SIZE;
-        state = dpriv->iqtx[cur];
+        state = le32_to_cpu(dpriv->iqtx[cur]);
        if (!state) {
                if (debug > 4)
                        printk(KERN_DEBUG "%s: Tx ISR = 0x%08x\n", dev->name,
@@ -1580,7 +1583,7 @@ try:
                        tx_fd = dpriv->tx_fd + cur;
                        skb = dpriv->tx_skbuff[cur];
                        if (skb) {
-                                pci_unmap_single(ppriv->pdev, tx_fd->data,
+                                pci_unmap_single(ppriv->pdev, le32_to_cpu(tx_fd->data),
                                                 skb->len, PCI_DMA_TODEVICE);
                                if (tx_fd->state & FrameEnd) {
                                        stats->tx_packets++;
@@ -1711,7 +1714,7 @@ static void dscc4_rx_irq(struct dscc4_pci_priv *priv,
 try:
        cur = dpriv->iqrx_current%IRQ_RING_SIZE;
-        state = dpriv->iqrx[cur];
+        state = le32_to_cpu(dpriv->iqrx[cur]);
        if (!state)
                return;
        dpriv->iqrx[cur] = 0;
@@ -1755,7 +1758,7 @@ try:
                                        goto try;
                                rx_fd->state1 &= ~Hold;
                                rx_fd->state2 = 0x00000000;
-                                rx_fd->end = 0xbabeface;
+                                rx_fd->end = cpu_to_le32(0xbabeface);
                        //}
                        goto try;
                }
@@ -1834,7 +1837,7 @@ try:
                                        hdlc_stats(dev)->rx_over_errors++;
                                        rx_fd->state1 |= Hold;
                                        rx_fd->state2 = 0x00000000;
-                                        rx_fd->end = 0xbabeface;
+                                        rx_fd->end = cpu_to_le32(0xbabeface);
                                } else
                                        dscc4_rx_skb(dpriv, dev);
                        } while (1);
@@ -1904,8 +1907,9 @@ static struct sk_buff *dscc4_init_dummy_skb(struct dscc4_dev_priv *dpriv)
                skb_copy_to_linear_data(skb, version,
                                        strlen(version) % DUMMY_SKB_SIZE);
                tx_fd->state = FrameEnd | TO_STATE_TX(DUMMY_SKB_SIZE);
-                tx_fd->data = pci_map_single(dpriv->pci_priv->pdev, skb->data,
+                tx_fd->data = cpu_to_le32(pci_map_single(dpriv->pci_priv->pdev,
-                                             DUMMY_SKB_SIZE, PCI_DMA_TODEVICE);
+                                             skb->data, DUMMY_SKB_SIZE,
+                                             PCI_DMA_TODEVICE));
                dpriv->tx_skbuff[last] = skb;
        }
        return skb;
@@ -1937,8 +1941,8 @@ static int dscc4_init_ring(struct net_device *dev)
                tx_fd->state = FrameEnd | TO_STATE_TX(2*DUMMY_SKB_SIZE);
                tx_fd->complete = 0x00000000;
                /* FIXME: NULL should be ok - to be tried */
-                tx_fd->data = dpriv->tx_fd_dma;
+                tx_fd->data = cpu_to_le32(dpriv->tx_fd_dma);
-                (tx_fd++)->next = (u32)(dpriv->tx_fd_dma +
+                (tx_fd++)->next = cpu_to_le32(dpriv->tx_fd_dma +
                                        (++i%TX_RING_SIZE)*sizeof(*tx_fd));
        } while (i < TX_RING_SIZE);
@@ -1951,12 +1955,12 @@ static int dscc4_init_ring(struct net_device *dev)
                /* size set by the host. Multiple of 4 bytes please */
                rx_fd->state1 = HiDesc;
                rx_fd->state2 = 0x00000000;
-                rx_fd->end = 0xbabeface;
+                rx_fd->end = cpu_to_le32(0xbabeface);
                rx_fd->state1 |= TO_STATE_RX(HDLC_MAX_MRU);
                // FIXME: return value verifiee mais traitement suspect
                if (try_get_rx_skb(dpriv, dev) >= 0)
                        dpriv->rx_dirty++;
-                (rx_fd++)->next = (u32)(dpriv->rx_fd_dma +
+                (rx_fd++)->next = cpu_to_le32(dpriv->rx_fd_dma +
                                        (++i%RX_RING_SIZE)*sizeof(*rx_fd));
        } while (i < RX_RING_SIZE);
diff --git a/drivers/net/wan/lmc/lmc_media.c b/drivers/net/wan/lmc/lmc_media.c
index 574737b55f39..c9c878cd5c72 100644
--- a/drivers/net/wan/lmc/lmc_media.c
+++ b/drivers/net/wan/lmc/lmc_media.c
@@ -890,16 +890,8 @@ write_av9110 (lmc_softc_t * sc, u_int32_t n, u_int32_t m, u_int32_t v,
 static void
 lmc_ssi_watchdog (lmc_softc_t * const sc)
 {
-  u_int16_t mii17;
+  u_int16_t mii17 = lmc_mii_readreg (sc, 0, 17);
-  struct ssicsr2
+  if (((mii17 >> 3) & 7) == 7)
-  {
-    unsigned short dtr:1, dsr:1, rts:1, cable:3, crc:1, led0:1, led1:1,
-      led2:1, led3:1, fifo:1, ll:1, rl:1, tm:1, loop:1;
-  };
-  struct ssicsr2 *ssicsr;
-  mii17 = lmc_mii_readreg (sc, 0, 17);
-  ssicsr = (struct ssicsr2 *) &mii17;
-  if (ssicsr->cable == 7)
    {
      lmc_led_off (sc, LMC_MII16_LED2);
    }
diff --git a/drivers/net/wan/sbni.h b/drivers/net/wan/sbni.h
index 27715e70f28b..84264510a8ed 100644
--- a/drivers/net/wan/sbni.h
+++ b/drivers/net/wan/sbni.h
@@ -44,9 +44,15 @@ enum {
 #define PR_RES 0x80
 struct sbni_csr1 {
-        unsigned rxl    : 5;
+#ifdef __LITTLE_ENDIAN_BITFIELD
-        unsigned rate   : 2;
+        u8 rxl  : 5;
-        unsigned        : 1;
+        u8 rate : 2;
+        u8      : 1;
+#else
+        u8      : 1;
+        u8 rate : 2;
+        u8 rxl  : 5;
+#endif
 };
 /* fields in frame header */
diff --git a/drivers/net/wan/syncppp.c b/drivers/net/wan/syncppp.c
index 232ecba5340f..61e24b7a45a3 100644
--- a/drivers/net/wan/syncppp.c
+++ b/drivers/net/wan/syncppp.c
@@ -107,24 +107,24 @@
 struct ppp_header {
        u8 address;
        u8 control;
-        u16 protocol;
+        __be16 protocol;
 };
 #define PPP_HEADER_LEN          sizeof (struct ppp_header)
 struct lcp_header {
        u8 type;
        u8 ident;
-        u16 len;
+        __be16 len;
 };
 #define LCP_HEADER_LEN          sizeof (struct lcp_header)
 struct cisco_packet {
-        u32 type;
+        __be32 type;
-        u32 par1;
+        __be32 par1;
-        u32 par2;
+        __be32 par2;
-        u16 rel;
+        __be16 rel;
-        u16 time0;
+        __be16 time0;
-        u16 time1;
+        __be16 time1;
 };
 #define CISCO_PACKET_LEN 18
 #define CISCO_BIG_PACKET_LEN 20
@@ -139,7 +139,7 @@ static struct sk_buff_head tx_queue;
 static void sppp_keepalive (unsigned long dummy);
 static void sppp_cp_send (struct sppp *sp, u16 proto, u8 type,
        u8 ident, u16 len, void *data);
-static void sppp_cisco_send (struct sppp *sp, int type, long par1, long par2);
+static void sppp_cisco_send (struct sppp *sp, int type, u32 par1, u32 par2);
 static void sppp_lcp_input (struct sppp *sp, struct sk_buff *m);
 static void sppp_cisco_input (struct sppp *sp, struct sk_buff *m);
 static void sppp_ipcp_input (struct sppp *sp, struct sk_buff *m);
@@ -447,7 +447,7 @@ static void sppp_keepalive (unsigned long dummy)
                        sppp_cisco_send (sp, CISCO_KEEPALIVE_REQ, ++sp->pp_seq,
                                sp->pp_rseq);
                else if (sp->lcp.state == LCP_STATE_OPENED) {
-                        long nmagic = htonl (sp->lcp.magic);
+                        __be32 nmagic = htonl (sp->lcp.magic);
                        sp->lcp.echoid = ++sp->pp_seq;
                        sppp_cp_send (sp, PPP_LCP, LCP_ECHO_REQ,
                                sp->lcp.echoid, 4, &nmagic);
@@ -667,7 +667,7 @@ badreq:
                                        dev->name, len);
                        break;
                }
-                if (ntohl (*(long*)(h+1)) == sp->lcp.magic) {
+                if (ntohl (*(__be32*)(h+1)) == sp->lcp.magic) {
                        /* Line loopback mode detected. */
                        printk (KERN_WARNING "%s: loopback\n", dev->name);
                        if_down (dev);
@@ -680,7 +680,7 @@ badreq:
                        sppp_lcp_open (sp);
                        break;
                }
-                *(long*)(h+1) = htonl (sp->lcp.magic);
+                *(__be32 *)(h+1) = htonl (sp->lcp.magic);
                sppp_cp_send (sp, PPP_LCP, LCP_ECHO_REPLY, h->ident, len-4, h+1);
                break;
        case LCP_ECHO_REPLY:
@@ -692,7 +692,7 @@ badreq:
                                        dev->name, len);
                        break;
                }
-                if (ntohl (*(long*)(h+1)) != sp->lcp.magic)
+                if (ntohl(*(__be32 *)(h+1)) != sp->lcp.magic)
                sp->pp_alivecnt = 0;
                break;
        }
@@ -765,7 +765,7 @@ static void sppp_cisco_input (struct sppp *sp, struct sk_buff *skb)
                {
                struct in_device *in_dev;
                struct in_ifaddr *ifa;
-                __be32 addr = 0, mask = ~0; /* FIXME: is the mask correct? */
+                __be32 addr = 0, mask = htonl(~0U); /* FIXME: is the mask correct? */
 #ifdef CONFIG_INET
                rcu_read_lock();
                if ((in_dev = __in_dev_get_rcu(dev)) != NULL)
@@ -782,8 +782,7 @@ static void sppp_cisco_input (struct sppp *sp, struct sk_buff *skb)
                }
                rcu_read_unlock();
 #endif          
-                /* I hope both addr and mask are in the net order */
+                sppp_cisco_send (sp, CISCO_ADDR_REPLY, ntohl(addr), ntohl(mask));
-                sppp_cisco_send (sp, CISCO_ADDR_REPLY, addr, mask);
                break;
                }
        }
@@ -844,7 +843,7 @@ static void sppp_cp_send (struct sppp *sp, u16 proto, u8 type,
 * Send Cisco keepalive packet.
 */
-static void sppp_cisco_send (struct sppp *sp, int type, long par1, long par2)
+static void sppp_cisco_send (struct sppp *sp, int type, u32 par1, u32 par2)
 {
        struct ppp_header *h;
        struct cisco_packet *ch;
@@ -868,7 +867,7 @@ static void sppp_cisco_send (struct sppp *sp, int type, long par1, long par2)
        ch->type = htonl (type);
        ch->par1 = htonl (par1);
        ch->par2 = htonl (par2);
-        ch->rel = -1;
+        ch->rel = htons(0xffff);
        ch->time0 = htons ((u16) (t >> 16));
        ch->time1 = htons ((u16) t);
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index 2b733c582915..2c08c0a5a0df 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -68,7 +68,7 @@ config WAVELAN
          <http://www.tldp.org/docs.html#howto>. Some more specific
          information is contained in
          <file:Documentation/networking/wavelan.txt> and in the source code
-          <file:drivers/net/wavelan.p.h>.
+          <file:drivers/net/wireless/wavelan.p.h>.
          You will also need the wireless tools package available from
          <http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html>.
@@ -264,6 +264,7 @@ config IPW2200_DEBUG
 config LIBERTAS
        tristate "Marvell 8xxx Libertas WLAN driver support"
        depends on WLAN_80211
+        select WIRELESS_EXT
        select IEEE80211
        select FW_LOADER
        ---help---
@@ -586,15 +587,66 @@ config ADM8211
 config P54_COMMON
        tristate "Softmac Prism54 support"
        depends on MAC80211 && WLAN_80211 && FW_LOADER && EXPERIMENTAL
+        ---help---
+          This is common code for isl38xx based cards.
+          This module does nothing by itself - the USB/PCI frontends
+          also need to be enabled in order to support any devices.
+          These devices require softmac firmware which can be found at
+          http://prism54.org/
+          If you choose to build a module, it'll be called p54common.
 config P54_USB
        tristate "Prism54 USB support"
        depends on P54_COMMON && USB
        select CRC32
+        ---help---
+          This driver is for USB isl38xx based wireless cards.
+          These are USB based adapters found in devices such as:
+          3COM 3CRWE254G72
+          SMC 2862W-G
+          Accton 802.11g WN4501 USB
+          Siemens Gigaset USB
+          Netgear WG121
+          Netgear WG111
+          Medion 40900, Roper Europe
+          Shuttle PN15, Airvast WM168g, IOGear GWU513
+          Linksys WUSB54G
+          Linksys WUSB54G Portable
+          DLink DWL-G120 Spinnaker
+          DLink DWL-G122
+          Belkin F5D7050 ver 1000
+          Cohiba Proto board
+          SMC 2862W-G version 2
+          U.S. Robotics U5 802.11g Adapter
+          FUJITSU E-5400 USB D1700
+          Sagem XG703A
+          DLink DWL-G120 Cohiba
+          Spinnaker Proto board
+          Linksys WUSB54AG
+          Inventel UR054G
+          Spinnaker DUT
+          These devices require softmac firmware which can be found at
+          http://prism54.org/
+          If you choose to build a module, it'll be called p54usb.
 config P54_PCI
        tristate "Prism54 PCI support"
        depends on P54_COMMON && PCI
+        ---help---
+          This driver is for PCI isl38xx based wireless cards.
+          This driver supports most devices that are supported by the
+          fullmac prism54 driver plus many devices which are not
+          supported by the fullmac driver/firmware.
+          This driver requires softmac firmware which can be found at
+          http://prism54.org/
+          If you choose to build a module, it'll be called p54pci.
 source "drivers/net/wireless/iwlwifi/Kconfig"
 source "drivers/net/wireless/hostap/Kconfig"
diff --git a/drivers/net/wireless/b43/b43.h b/drivers/net/wireless/b43/b43.h
index a28ad230d63e..7b6fc1ab2b90 100644
--- a/drivers/net/wireless/b43/b43.h
+++ b/drivers/net/wireless/b43/b43.h
@@ -273,6 +273,8 @@ enum {
 #define B43_PHYTYPE_A                   0x00
 #define B43_PHYTYPE_B                   0x01
 #define B43_PHYTYPE_G                   0x02
+#define B43_PHYTYPE_N                   0x04
+#define B43_PHYTYPE_LP                  0x05
 /* PHYRegisters */
 #define B43_PHY_ILT_A_CTRL              0x0072
diff --git a/drivers/net/wireless/b43/leds.c b/drivers/net/wireless/b43/leds.c
index 19e588582c7c..6c0e2b9f7760 100644
--- a/drivers/net/wireless/b43/leds.c
+++ b/drivers/net/wireless/b43/leds.c
@@ -163,6 +163,9 @@ static void b43_map_led(struct b43_wldev *dev,
                b43_register_led(dev, &dev->led_radio, name,
                                 b43_rfkill_led_name(dev),
                                 led_index, activelow);
+                /* Sync the RF-kill LED state with the switch state. */
+                if (dev->radio_hw_enable)
+                        b43_led_turn_on(dev, led_index, activelow);
                break;
        case B43_LED_WEIRD:
        case B43_LED_ASSOC:
@@ -232,4 +235,5 @@ void b43_leds_exit(struct b43_wldev *dev)
        b43_unregister_led(&dev->led_tx);
        b43_unregister_led(&dev->led_rx);
        b43_unregister_led(&dev->led_assoc);
+        b43_unregister_led(&dev->led_radio);
 }
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index 2b17c1dc46f1..1c93b4f4bfe3 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -1566,7 +1566,7 @@ static void b43_release_firmware(struct b43_wldev *dev)
 static void b43_print_fw_helptext(struct b43_wl *wl)
 {
        b43err(wl, "You must go to "
-               "http://linuxwireless.org/en/users/Drivers/bcm43xx#devicefirmware "
+               "http://linuxwireless.org/en/users/Drivers/b43#devicefirmware "
               "and download the correct firmware (version 4).\n");
 }
@@ -2163,7 +2163,6 @@ static void b43_mgmtframe_txantenna(struct b43_wldev *dev, int antenna)
 static void b43_chip_exit(struct b43_wldev *dev)
 {
        b43_radio_turn_off(dev, 1);
-        b43_leds_exit(dev);
        b43_gpio_cleanup(dev);
        /* firmware is released later */
 }
@@ -2191,11 +2190,10 @@ static int b43_chip_init(struct b43_wldev *dev)
        err = b43_gpio_init(dev);
        if (err)
                goto out;       /* firmware is released later */
-        b43_leds_init(dev);
        err = b43_upload_initvals(dev);
        if (err)
-                goto err_leds_exit;
+                goto err_gpio_clean;
        b43_radio_turn_on(dev);
        b43_write16(dev, 0x03E6, 0x0000);
@@ -2271,8 +2269,7 @@ out:
 err_radio_off:
        b43_radio_turn_off(dev, 1);
-err_leds_exit:
+err_gpio_clean:
-        b43_leds_exit(dev);
        b43_gpio_cleanup(dev);
        return err;
 }
@@ -3273,10 +3270,7 @@ static void b43_wireless_core_exit(struct b43_wldev *dev)
                return;
        b43_set_status(dev, B43_STAT_UNINIT);
-        mutex_unlock(&dev->wl->mutex);
+        b43_leds_exit(dev);
-        b43_rfkill_exit(dev);
-        mutex_lock(&dev->wl->mutex);
        b43_rng_exit(dev->wl);
        b43_pio_free(dev);
        b43_dma_free(dev);
@@ -3405,12 +3399,12 @@ static int b43_wireless_core_init(struct b43_wldev *dev)
        memset(wl->mac_addr, 0, ETH_ALEN);
        b43_upload_card_macaddress(dev);
        b43_security_init(dev);
-        b43_rfkill_init(dev);
        b43_rng_init(wl);
        b43_set_status(dev, B43_STAT_INITIALIZED);
-      out:
+        b43_leds_init(dev);
+out:
        return err;
      err_chip_exit:
@@ -3499,6 +3493,10 @@ static int b43_start(struct ieee80211_hw *hw)
        int did_init = 0;
        int err = 0;
+        /* First register RFkill.
+         * LEDs that are registered later depend on it. */
+        b43_rfkill_init(dev);
        mutex_lock(&wl->mutex);
        if (b43_status(dev) < B43_STAT_INITIALIZED) {
@@ -3528,6 +3526,8 @@ static void b43_stop(struct ieee80211_hw *hw)
        struct b43_wl *wl = hw_to_b43_wl(hw);
        struct b43_wldev *dev = wl->current_dev;
+        b43_rfkill_exit(dev);
        mutex_lock(&wl->mutex);
        if (b43_status(dev) >= B43_STAT_STARTED)
                b43_wireless_core_stop(dev);
diff --git a/drivers/net/wireless/b43/main.h b/drivers/net/wireless/b43/main.h
index 284d17da17d1..08e2e56e48f4 100644
--- a/drivers/net/wireless/b43/main.h
+++ b/drivers/net/wireless/b43/main.h
@@ -39,11 +39,11 @@
 #define PAD_BYTES(nr_bytes)             P4D_BYTES( __LINE__ , (nr_bytes))
 /* Lightweight function to convert a frequency (in Mhz) to a channel number. */
-static inline u8 b43_freq_to_channel_a(int freq)
+static inline u8 b43_freq_to_channel_5ghz(int freq)
 {
        return ((freq - 5000) / 5);
 }
-static inline u8 b43_freq_to_channel_bg(int freq)
+static inline u8 b43_freq_to_channel_2ghz(int freq)
 {
        u8 channel;
@@ -54,19 +54,13 @@ static inline u8 b43_freq_to_channel_bg(int freq)
        return channel;
 }
-static inline u8 b43_freq_to_channel(struct b43_wldev *dev, int freq)
-{
-        if (dev->phy.type == B43_PHYTYPE_A)
-                return b43_freq_to_channel_a(freq);
-        return b43_freq_to_channel_bg(freq);
-}
 /* Lightweight function to convert a channel number to a frequency (in Mhz). */
-static inline int b43_channel_to_freq_a(u8 channel)
+static inline int b43_channel_to_freq_5ghz(u8 channel)
 {
        return (5000 + (5 * channel));
 }
-static inline int b43_channel_to_freq_bg(u8 channel)
+static inline int b43_channel_to_freq_2ghz(u8 channel)
 {
        int freq;
@@ -77,12 +71,6 @@ static inline int b43_channel_to_freq_bg(u8 channel)
        return freq;
 }
-static inline int b43_channel_to_freq(struct b43_wldev *dev, u8 channel)
-{
-        if (dev->phy.type == B43_PHYTYPE_A)
-                return b43_channel_to_freq_a(channel);
-        return b43_channel_to_freq_bg(channel);
-}
 static inline int b43_is_cck_rate(int rate)
 {
diff --git a/drivers/net/wireless/b43/phy.c b/drivers/net/wireless/b43/phy.c
index 3d4ed647c311..7ff091e69f05 100644
--- a/drivers/net/wireless/b43/phy.c
+++ b/drivers/net/wireless/b43/phy.c
@@ -2214,7 +2214,7 @@ int b43_phy_init_tssi2dbm_table(struct b43_wldev *dev)
                }
                dyn_tssi2dbm = kmalloc(64, GFP_KERNEL);
                if (dyn_tssi2dbm == NULL) {
-                        b43err(dev->wl, "Could not allocate memory"
+                        b43err(dev->wl, "Could not allocate memory "
                               "for tssi2dbm table\n");
                        return -ENOMEM;
                }
diff --git a/drivers/net/wireless/b43/rfkill.c b/drivers/net/wireless/b43/rfkill.c
index 9b1f905ffbf4..11f53cb1139e 100644
--- a/drivers/net/wireless/b43/rfkill.c
+++ b/drivers/net/wireless/b43/rfkill.c
@@ -25,6 +25,8 @@
 #include "rfkill.h"
 #include "b43.h"
+#include <linux/kmod.h>
 /* Returns TRUE, if the radio is enabled in hardware. */
 static bool b43_is_hw_radio_enabled(struct b43_wldev *dev)
@@ -50,7 +52,10 @@ static void b43_rfkill_poll(struct input_polled_dev *poll_dev)
        bool report_change = 0;
        mutex_lock(&wl->mutex);
-        B43_WARN_ON(b43_status(dev) < B43_STAT_INITIALIZED);
+        if (unlikely(b43_status(dev) < B43_STAT_INITIALIZED)) {
+                mutex_unlock(&wl->mutex);
+                return;
+        }
        enabled = b43_is_hw_radio_enabled(dev);
        if (unlikely(enabled != dev->radio_hw_enable)) {
                dev->radio_hw_enable = enabled;
@@ -60,8 +65,12 @@ static void b43_rfkill_poll(struct input_polled_dev *poll_dev)
        }
        mutex_unlock(&wl->mutex);
-        if (unlikely(report_change))
+        /* send the radio switch event to the system - note both a key press
-                input_report_key(poll_dev->input, KEY_WLAN, enabled);
+         * and a release are required */
+        if (unlikely(report_change)) {
+                input_report_key(poll_dev->input, KEY_WLAN, 1);
+                input_report_key(poll_dev->input, KEY_WLAN, 0);
+        }
 }
 /* Called when the RFKILL toggled in software. */
@@ -69,13 +78,15 @@ static int b43_rfkill_soft_toggle(void *data, enum rfkill_state state)
 {
        struct b43_wldev *dev = data;
        struct b43_wl *wl = dev->wl;
-        int err = 0;
+        int err = -EBUSY;
        if (!wl->rfkill.registered)
                return 0;
        mutex_lock(&wl->mutex);
-        B43_WARN_ON(b43_status(dev) < B43_STAT_INITIALIZED);
+        if (b43_status(dev) < B43_STAT_INITIALIZED)
+                goto out_unlock;
+        err = 0;
        switch (state) {
        case RFKILL_STATE_ON:
                if (!dev->radio_hw_enable) {
@@ -127,15 +138,34 @@ void b43_rfkill_init(struct b43_wldev *dev)
        rfk->rfkill->user_claim_unsupported = 1;
        rfk->poll_dev = input_allocate_polled_device();
-        if (!rfk->poll_dev)
+        if (!rfk->poll_dev) {
-                goto err_free_rfk;
+                rfkill_free(rfk->rfkill);
+                goto err_freed_rfk;
+        }
        rfk->poll_dev->private = dev;
        rfk->poll_dev->poll = b43_rfkill_poll;
        rfk->poll_dev->poll_interval = 1000; /* msecs */
+        rfk->poll_dev->input->name = rfk->name;
+        rfk->poll_dev->input->id.bustype = BUS_HOST;
+        rfk->poll_dev->input->id.vendor = dev->dev->bus->boardinfo.vendor;
+        rfk->poll_dev->input->evbit[0] = BIT(EV_KEY);
+        set_bit(KEY_WLAN, rfk->poll_dev->input->keybit);
        err = rfkill_register(rfk->rfkill);
        if (err)
                goto err_free_polldev;
+#ifdef CONFIG_RFKILL_INPUT_MODULE
+        /* B43 RF-kill isn't useful without the rfkill-input subsystem.
+         * Try to load the module. */
+        err = request_module("rfkill-input");
+        if (err)
+                b43warn(wl, "Failed to load the rfkill-input module. "
+                        "The built-in radio LED will not work.\n");
+#endif /* CONFIG_RFKILL_INPUT */
        err = input_register_polled_device(rfk->poll_dev);
        if (err)
                goto err_unreg_rfk;
@@ -148,8 +178,7 @@ err_unreg_rfk:
 err_free_polldev:
        input_free_polled_device(rfk->poll_dev);
        rfk->poll_dev = NULL;
-err_free_rfk:
+err_freed_rfk:
-        rfkill_free(rfk->rfkill);
        rfk->rfkill = NULL;
 out_error:
        rfk->registered = 0;
@@ -168,6 +197,5 @@ void b43_rfkill_exit(struct b43_wldev *dev)
        rfkill_unregister(rfk->rfkill);
        input_free_polled_device(rfk->poll_dev);
        rfk->poll_dev = NULL;
-        rfkill_free(rfk->rfkill);
        rfk->rfkill = NULL;
 }
diff --git a/drivers/net/wireless/b43/xmit.c b/drivers/net/wireless/b43/xmit.c
index 0bd6f8a348a8..3307ba1856b1 100644
--- a/drivers/net/wireless/b43/xmit.c
+++ b/drivers/net/wireless/b43/xmit.c
@@ -531,21 +531,32 @@ void b43_rx(struct b43_wldev *dev, struct sk_buff *skb, const void *_rxhdr)
        switch (chanstat & B43_RX_CHAN_PHYTYPE) {
        case B43_PHYTYPE_A:
                status.phymode = MODE_IEEE80211A;
-                status.freq = chanid;
+                B43_WARN_ON(1);
-                status.channel = b43_freq_to_channel_a(chanid);
+                /* FIXME: We don't really know which value the "chanid" contains.
-                break;
+                 *        So the following assignment might be wrong. */
-        case B43_PHYTYPE_B:
+                status.channel = chanid;
-                status.phymode = MODE_IEEE80211B;
+                status.freq = b43_channel_to_freq_5ghz(status.channel);
-                status.freq = chanid + 2400;
-                status.channel = b43_freq_to_channel_bg(chanid + 2400);
                break;
        case B43_PHYTYPE_G:
                status.phymode = MODE_IEEE80211G;
+                /* chanid is the radio channel cookie value as used
+                 * to tune the radio. */
                status.freq = chanid + 2400;
-                status.channel = b43_freq_to_channel_bg(chanid + 2400);
+                status.channel = b43_freq_to_channel_2ghz(status.freq);
+                break;
+        case B43_PHYTYPE_N:
+                status.phymode = 0xDEAD /*FIXME MODE_IEEE80211N*/;
+                /* chanid is the SHM channel cookie. Which is the plain
+                 * channel number in b43. */
+                status.channel = chanid;
+                if (chanstat & B43_RX_CHAN_5GHZ)
+                        status.freq = b43_freq_to_channel_5ghz(status.freq);
+                else
+                        status.freq = b43_freq_to_channel_2ghz(status.freq);
                break;
        default:
                B43_WARN_ON(1);
+                goto drop;
        }
        dev->stats.last_rx = jiffies;
diff --git a/drivers/net/wireless/b43/xmit.h b/drivers/net/wireless/b43/xmit.h
index 03bddd251618..6dc079382f7f 100644
--- a/drivers/net/wireless/b43/xmit.h
+++ b/drivers/net/wireless/b43/xmit.h
@@ -142,49 +142,56 @@ struct b43_rxhdr_fw4 {
 } __attribute__ ((__packed__));
 /* PHY RX Status 0 */
-#define B43_RX_PHYST0_GAINCTL   0x4000  /* Gain Control */
+#define B43_RX_PHYST0_GAINCTL           0x4000 /* Gain Control */
-#define B43_RX_PHYST0_PLCPHCF   0x0200
+#define B43_RX_PHYST0_PLCPHCF           0x0200
-#define B43_RX_PHYST0_PLCPFV    0x0100
+#define B43_RX_PHYST0_PLCPFV            0x0100
-#define B43_RX_PHYST0_SHORTPRMBL        0x0080  /* Received with Short Preamble */
+#define B43_RX_PHYST0_SHORTPRMBL        0x0080 /* Received with Short Preamble */
 #define B43_RX_PHYST0_LCRS              0x0040
-#define B43_RX_PHYST0_ANT               0x0020  /* Antenna */
+#define B43_RX_PHYST0_ANT               0x0020 /* Antenna */
-#define B43_RX_PHYST0_UNSRATE   0x0010
+#define B43_RX_PHYST0_UNSRATE           0x0010
 #define B43_RX_PHYST0_CLIP              0x000C
 #define B43_RX_PHYST0_CLIP_SHIFT        2
-#define B43_RX_PHYST0_FTYPE             0x0003  /* Frame type */
+#define B43_RX_PHYST0_FTYPE             0x0003 /* Frame type */
-#define  B43_RX_PHYST0_CCK              0x0000  /* Frame type: CCK */
+#define  B43_RX_PHYST0_CCK              0x0000 /* Frame type: CCK */
-#define  B43_RX_PHYST0_OFDM             0x0001  /* Frame type: OFDM */
+#define  B43_RX_PHYST0_OFDM             0x0001 /* Frame type: OFDM */
-#define  B43_RX_PHYST0_PRE_N    0x0002  /* Pre-standard N-PHY frame */
+#define  B43_RX_PHYST0_PRE_N            0x0002 /* Pre-standard N-PHY frame */
-#define  B43_RX_PHYST0_STD_N    0x0003  /* Standard N-PHY frame */
+#define  B43_RX_PHYST0_STD_N            0x0003 /* Standard N-PHY frame */
 /* PHY RX Status 2 */
-#define B43_RX_PHYST2_LNAG              0xC000  /* LNA Gain */
+#define B43_RX_PHYST2_LNAG              0xC000 /* LNA Gain */
 #define B43_RX_PHYST2_LNAG_SHIFT        14
-#define B43_RX_PHYST2_PNAG              0x3C00  /* PNA Gain */
+#define B43_RX_PHYST2_PNAG              0x3C00 /* PNA Gain */
 #define B43_RX_PHYST2_PNAG_SHIFT        10
-#define B43_RX_PHYST2_FOFF              0x03FF  /* F offset */
+#define B43_RX_PHYST2_FOFF              0x03FF /* F offset */
 /* PHY RX Status 3 */
-#define B43_RX_PHYST3_DIGG              0x1800  /* DIG Gain */
+#define B43_RX_PHYST3_DIGG              0x1800 /* DIG Gain */
 #define B43_RX_PHYST3_DIGG_SHIFT        11
-#define B43_RX_PHYST3_TRSTATE   0x0400  /* TR state */
+#define B43_RX_PHYST3_TRSTATE           0x0400 /* TR state */
 /* MAC RX Status */
-#define B43_RX_MAC_BEACONSENT   0x00008000      /* Beacon send flag */
+#define B43_RX_MAC_RXST_VALID           0x01000000 /* PHY RXST valid */
-#define B43_RX_MAC_KEYIDX               0x000007E0      /* Key index */
+#define B43_RX_MAC_TKIP_MICERR          0x00100000 /* TKIP MIC error */
-#define B43_RX_MAC_KEYIDX_SHIFT 5
+#define B43_RX_MAC_TKIP_MICATT          0x00080000 /* TKIP MIC attempted */
-#define B43_RX_MAC_DECERR               0x00000010      /* Decrypt error */
+#define B43_RX_MAC_AGGTYPE              0x00060000 /* Aggregation type */
-#define B43_RX_MAC_DEC          0x00000008      /* Decryption attempted */
+#define B43_RX_MAC_AGGTYPE_SHIFT        17
-#define B43_RX_MAC_PADDING              0x00000004      /* Pad bytes present */
+#define B43_RX_MAC_AMSDU                0x00010000 /* A-MSDU mask */
-#define B43_RX_MAC_RESP         0x00000002      /* Response frame transmitted */
+#define B43_RX_MAC_BEACONSENT           0x00008000 /* Beacon sent flag */
-#define B43_RX_MAC_FCSERR               0x00000001      /* FCS error */
+#define B43_RX_MAC_KEYIDX               0x000007E0 /* Key index */
+#define B43_RX_MAC_KEYIDX_SHIFT         5
+#define B43_RX_MAC_DECERR               0x00000010 /* Decrypt error */
+#define B43_RX_MAC_DEC                  0x00000008 /* Decryption attempted */
+#define B43_RX_MAC_PADDING              0x00000004 /* Pad bytes present */
+#define B43_RX_MAC_RESP                 0x00000002 /* Response frame transmitted */
+#define B43_RX_MAC_FCSERR               0x00000001 /* FCS error */
 /* RX channel */
-#define B43_RX_CHAN_GAIN                0xFC00  /* Gain */
+#define B43_RX_CHAN_40MHZ               0x1000 /* 40 Mhz channel width */
-#define B43_RX_CHAN_GAIN_SHIFT  10
+#define B43_RX_CHAN_5GHZ                0x0800 /* 5 Ghz band */
-#define B43_RX_CHAN_ID          0x03FC  /* Channel ID */
+#define B43_RX_CHAN_ID                  0x07F8 /* Channel ID */
-#define B43_RX_CHAN_ID_SHIFT    2
+#define B43_RX_CHAN_ID_SHIFT            3
-#define B43_RX_CHAN_PHYTYPE             0x0003  /* PHY type */
+#define B43_RX_CHAN_PHYTYPE             0x0007 /* PHY type */
 u8 b43_plcp_get_ratecode_cck(const u8 bitrate);
 u8 b43_plcp_get_ratecode_ofdm(const u8 bitrate);
diff --git a/drivers/net/wireless/b43legacy/dma.c b/drivers/net/wireless/b43legacy/dma.c
index 8cb3dc4c4745..83161d9af813 100644
--- a/drivers/net/wireless/b43legacy/dma.c
+++ b/drivers/net/wireless/b43legacy/dma.c
@@ -996,7 +996,7 @@ int b43legacy_dma_init(struct b43legacy_wldev *dev)
        err = ssb_dma_set_mask(dev->dev, dmamask);
        if (err) {
-#ifdef BCM43XX_PIO
+#ifdef CONFIG_B43LEGACY_PIO
                b43legacywarn(dev->wl, "DMA for this device not supported. "
                        "Falling back to PIO\n");
                dev->__using_pio = 1;
diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c
index 3bde1e9ab428..32d5e1785bda 100644
--- a/drivers/net/wireless/b43legacy/main.c
+++ b/drivers/net/wireless/b43legacy/main.c
@@ -1419,7 +1419,7 @@ static void b43legacy_release_firmware(struct b43legacy_wldev *dev)
 static void b43legacy_print_fw_helptext(struct b43legacy_wl *wl)
 {
        b43legacyerr(wl, "You must go to http://linuxwireless.org/en/users/"
-                     "Drivers/bcm43xx#devicefirmware "
+                     "Drivers/b43#devicefirmware "
                     "and download the correct firmware (version 3).\n");
 }
diff --git a/drivers/net/wireless/b43legacy/phy.c b/drivers/net/wireless/b43legacy/phy.c
index 22a4b3d0186d..491e518e4aeb 100644
--- a/drivers/net/wireless/b43legacy/phy.c
+++ b/drivers/net/wireless/b43legacy/phy.c
@@ -2020,7 +2020,7 @@ int b43legacy_phy_init_tssi2dbm_table(struct b43legacy_wldev *dev)
                        phy->idle_tssi = 62;
                dyn_tssi2dbm = kmalloc(64, GFP_KERNEL);
                if (dyn_tssi2dbm == NULL) {
-                        b43legacyerr(dev->wl, "Could not allocate memory"
+                        b43legacyerr(dev->wl, "Could not allocate memory "
                               "for tssi2dbm table\n");
                        return -ENOMEM;
                }
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c b/drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c
index 35dbe4554513..76e9dd843faa 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c
@@ -219,7 +219,7 @@ static ssize_t tsf_write_file(struct file *file, const char __user *user_buf,
        ssize_t buf_size;
        ssize_t res;
        unsigned long flags;
-        u64 tsf;
+        unsigned long long tsf;
        buf_size = min(count, sizeof (really_big_buffer) - 1);
        down(&big_buffer_sem);
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_phy.c b/drivers/net/wireless/bcm43xx/bcm43xx_phy.c
index b37f1e348700..af3de3343650 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_phy.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_phy.c
@@ -2149,7 +2149,7 @@ int bcm43xx_phy_init_tssi2dbm_table(struct bcm43xx_private *bcm)
                }
                dyn_tssi2dbm = kmalloc(64, GFP_KERNEL);
                if (dyn_tssi2dbm == NULL) {
-                        printk(KERN_ERR PFX "Could not allocate memory"
+                        printk(KERN_ERR PFX "Could not allocate memory "
                                            "for tssi2dbm table\n");
                        return -ENOMEM;
                }
diff --git a/drivers/net/wireless/hostap/hostap_plx.c b/drivers/net/wireless/hostap/hostap_plx.c
index 040dc3e36410..cbf15d703201 100644
--- a/drivers/net/wireless/hostap/hostap_plx.c
+++ b/drivers/net/wireless/hostap/hostap_plx.c
@@ -608,7 +608,7 @@ static void prism2_plx_remove(struct pci_dev *pdev)
 MODULE_DEVICE_TABLE(pci, prism2_plx_id_table);
-static struct pci_driver prism2_plx_drv_id = {
+static struct pci_driver prism2_plx_driver = {
        .name           = "hostap_plx",
        .id_table       = prism2_plx_id_table,
        .probe          = prism2_plx_probe,
@@ -618,13 +618,13 @@ static struct pci_driver prism2_plx_drv_id = {
 static int __init init_prism2_plx(void)
 {
-        return pci_register_driver(&prism2_plx_drv_id);
+        return pci_register_driver(&prism2_plx_driver);
 }
 static void __exit exit_prism2_plx(void)
 {
-        pci_unregister_driver(&prism2_plx_drv_id);
+        pci_unregister_driver(&prism2_plx_driver);
 }
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c
index 54f44e5473c0..003f73f89efa 100644
--- a/drivers/net/wireless/ipw2200.c
+++ b/drivers/net/wireless/ipw2200.c
@@ -1233,9 +1233,19 @@ static ssize_t show_event_log(struct device *d,
 {
        struct ipw_priv *priv = dev_get_drvdata(d);
        u32 log_len = ipw_get_event_log_len(priv);
-        struct ipw_event log[log_len];
+        u32 log_size;
+        struct ipw_event *log;
        u32 len = 0, i;
+        /* not using min() because of its strict type checking */
+        log_size = PAGE_SIZE / sizeof(*log) > log_len ?
+                        sizeof(*log) * log_len : PAGE_SIZE;
+        log = kzalloc(log_size, GFP_KERNEL);
+        if (!log) {
+                IPW_ERROR("Unable to allocate memory for log\n");
+                return 0;
+        }
+        log_len = log_size / sizeof(*log);
        ipw_capture_event_log(priv, log_len, log);
        len += snprintf(buf + len, PAGE_SIZE - len, "%08X", log_len);
@@ -1244,6 +1254,7 @@ static ssize_t show_event_log(struct device *d,
                                "\n%08X%08X%08X",
                                log[i].time, log[i].event, log[i].data);
        len += snprintf(buf + len, PAGE_SIZE - len, "\n");
+        kfree(log);
        return len;
 }
@@ -4924,7 +4935,7 @@ static int ipw_queue_reset(struct ipw_priv *priv)
 /**
 * Reclaim Tx queue entries no more used by NIC.
 *
- * When FW adwances 'R' index, all entries between old and
+ * When FW advances 'R' index, all entries between old and
 * new 'R' index need to be reclaimed. As result, some free space
 * forms. If there is enough free space (> low mark), wake Tx queue.
 *
@@ -10751,7 +10762,7 @@ static void ipw_bg_link_down(struct work_struct *work)
        mutex_unlock(&priv->mutex);
 }
-static int ipw_setup_deferred_work(struct ipw_priv *priv)
+static int __devinit ipw_setup_deferred_work(struct ipw_priv *priv)
 {
        int ret = 0;
@@ -11600,7 +11611,8 @@ static void ipw_prom_free(struct ipw_priv *priv)
 #endif
-static int ipw_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
+static int __devinit ipw_pci_probe(struct pci_dev *pdev,
+                                   const struct pci_device_id *ent)
 {
        int err = 0;
        struct net_device *net_dev;
@@ -11767,7 +11779,7 @@ static int ipw_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        return err;
 }
-static void ipw_pci_remove(struct pci_dev *pdev)
+static void __devexit ipw_pci_remove(struct pci_dev *pdev)
 {
        struct ipw_priv *priv = pci_get_drvdata(pdev);
        struct list_head *p, *q;
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index 465da4f67ce7..0b3ec7e4d93b 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -2915,6 +2915,10 @@ static void iwl_set_rate(struct iwl_priv *priv)
        int i;
        hw = iwl_get_hw_mode(priv, priv->phymode);
+        if (!hw) {
+                IWL_ERROR("Failed to set rate: unable to get hw mode\n");
+                return;
+        }
        priv->active_rate = 0;
        priv->active_rate_basic = 0;
@@ -4739,8 +4743,10 @@ static void iwl_irq_tasklet(struct iwl_priv *priv)
                 *   when we loaded driver, and is now set to "enable".
                 * After we're Alive, RF_KILL gets handled by
                 *   iwl_rx_card_state_notif() */
-                if (!hw_rf_kill && !test_bit(STATUS_ALIVE, &priv->status))
+                if (!hw_rf_kill && !test_bit(STATUS_ALIVE, &priv->status)) {
+                        clear_bit(STATUS_RF_KILL_HW, &priv->status);
                        queue_work(priv->workqueue, &priv->restart);
+                }
                handled |= CSR_INT_BIT_RF_KILL;
        }
@@ -6167,6 +6173,7 @@ static void iwl_alive_start(struct iwl_priv *priv)
                mutex_lock(&priv->mutex);
                if (rc) {
+                        iwl_rate_control_unregister(priv->hw);
                        IWL_ERROR("Failed to register network "
                                  "device (error %d)\n", rc);
                        return;
@@ -6239,8 +6246,6 @@ static void __iwl_down(struct iwl_priv *priv)
        /* Unblock any waiting calls */
        wake_up_interruptible_all(&priv->wait_command_queue);
-        iwl_cancel_deferred_work(priv);
        /* Wipe out the EXIT_PENDING status bit if we are not actually
         * exiting the module */
        if (!exit_pending)
@@ -6315,6 +6320,8 @@ static void iwl_down(struct iwl_priv *priv)
        mutex_lock(&priv->mutex);
        __iwl_down(priv);
        mutex_unlock(&priv->mutex);
+        iwl_cancel_deferred_work(priv);
 }
 #define MAX_HW_RESTARTS 5
@@ -6335,6 +6342,11 @@ static int __iwl_up(struct iwl_priv *priv)
                return 0;
        }
+        if (!priv->ucode_data_backup.v_addr || !priv->ucode_data.v_addr) {
+                IWL_ERROR("ucode not available for device bringup\n");
+                return -EIO;
+        }
        iwl_write32(priv, CSR_INT, 0xFFFFFFFF);
        rc = iwl_hw_nic_init(priv);
@@ -6936,13 +6948,10 @@ static int iwl_mac_add_interface(struct ieee80211_hw *hw,
        DECLARE_MAC_BUF(mac);
        IWL_DEBUG_MAC80211("enter: id %d, type %d\n", conf->if_id, conf->type);
-        if (conf->mac_addr)
-                IWL_DEBUG_MAC80211("enter: MAC %s\n",
-                                   print_mac(mac, conf->mac_addr));
        if (priv->interface_id) {
                IWL_DEBUG_MAC80211("leave - interface_id != 0\n");
-                return 0;
+                return -EOPNOTSUPP;
        }
        spin_lock_irqsave(&priv->lock, flags);
@@ -6951,6 +6960,12 @@ static int iwl_mac_add_interface(struct ieee80211_hw *hw,
        spin_unlock_irqrestore(&priv->lock, flags);
        mutex_lock(&priv->mutex);
+        if (conf->mac_addr) {
+                IWL_DEBUG_MAC80211("Set: %s\n", print_mac(mac, conf->mac_addr));
+                memcpy(priv->mac_addr, conf->mac_addr, ETH_ALEN);
+        }
        iwl_set_mode(priv, conf->type);
        IWL_DEBUG_MAC80211("leave\n");
@@ -8270,6 +8285,7 @@ static void iwl_cancel_deferred_work(struct iwl_priv *priv)
 {
        iwl_hw_cancel_deferred_work(priv);
+        cancel_delayed_work_sync(&priv->init_alive_start);
        cancel_delayed_work(&priv->scan_check);
        cancel_delayed_work(&priv->alive_start);
        cancel_delayed_work(&priv->post_associate);
@@ -8569,10 +8585,9 @@ static void iwl_pci_remove(struct pci_dev *pdev)
        IWL_DEBUG_INFO("*** UNLOAD DRIVER ***\n");
-        mutex_lock(&priv->mutex);
        set_bit(STATUS_EXIT_PENDING, &priv->status);
-        __iwl_down(priv);
-        mutex_unlock(&priv->mutex);
+        iwl_down(priv);
        /* Free MAC hash list for ADHOC */
        for (i = 0; i < IWL_IBSS_MAC_HASH_SIZE; i++) {
@@ -8631,12 +8646,10 @@ static int iwl_pci_suspend(struct pci_dev *pdev, pm_message_t state)
 {
        struct iwl_priv *priv = pci_get_drvdata(pdev);
-        mutex_lock(&priv->mutex);
        set_bit(STATUS_IN_SUSPEND, &priv->status);
        /* Take down the device; powers it off, etc. */
-        __iwl_down(priv);
+        iwl_down(priv);
        if (priv->mac80211_registered)
                ieee80211_stop_queues(priv->hw);
@@ -8645,8 +8658,6 @@ static int iwl_pci_suspend(struct pci_dev *pdev, pm_message_t state)
        pci_disable_device(pdev);
        pci_set_power_state(pdev, PCI_D3hot);
-        mutex_unlock(&priv->mutex);
        return 0;
 }
@@ -8704,8 +8715,6 @@ static int iwl_pci_resume(struct pci_dev *pdev)
        printk(KERN_INFO "Coming out of suspend...\n");
-        mutex_lock(&priv->mutex);
        pci_set_power_state(pdev, PCI_D0);
        err = pci_enable_device(pdev);
        pci_restore_state(pdev);
@@ -8719,7 +8728,6 @@ static int iwl_pci_resume(struct pci_dev *pdev)
        pci_write_config_byte(pdev, 0x41, 0x00);
        iwl_resume(priv);
-        mutex_unlock(&priv->mutex);
        return 0;
 }
diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c
index 9918780f5e86..15a45f471710 100644
--- a/drivers/net/wireless/iwlwifi/iwl4965-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c
@@ -3003,6 +3003,10 @@ static void iwl_set_rate(struct iwl_priv *priv)
        int i;
        hw = iwl_get_hw_mode(priv, priv->phymode);
+        if (!hw) {
+                IWL_ERROR("Failed to set rate: unable to get hw mode\n");
+                return;
+        }
        priv->active_rate = 0;
        priv->active_rate_basic = 0;
@@ -5055,8 +5059,10 @@ static void iwl_irq_tasklet(struct iwl_priv *priv)
                 *   when we loaded driver, and is now set to "enable".
                 * After we're Alive, RF_KILL gets handled by
                 *   iwl_rx_card_state_notif() */
-                if (!hw_rf_kill && !test_bit(STATUS_ALIVE, &priv->status))
+                if (!hw_rf_kill && !test_bit(STATUS_ALIVE, &priv->status)) {
+                        clear_bit(STATUS_RF_KILL_HW, &priv->status);
                        queue_work(priv->workqueue, &priv->restart);
+                }
                handled |= CSR_INT_BIT_RF_KILL;
        }
@@ -6523,6 +6529,7 @@ static void iwl_alive_start(struct iwl_priv *priv)
                mutex_lock(&priv->mutex);
                if (rc) {
+                        iwl_rate_control_unregister(priv->hw);
                        IWL_ERROR("Failed to register network "
                                  "device (error %d)\n", rc);
                        return;
@@ -6594,8 +6601,6 @@ static void __iwl_down(struct iwl_priv *priv)
        /* Unblock any waiting calls */
        wake_up_interruptible_all(&priv->wait_command_queue);
-        iwl_cancel_deferred_work(priv);
        /* Wipe out the EXIT_PENDING status bit if we are not actually
         * exiting the module */
        if (!exit_pending)
@@ -6670,6 +6675,8 @@ static void iwl_down(struct iwl_priv *priv)
        mutex_lock(&priv->mutex);
        __iwl_down(priv);
        mutex_unlock(&priv->mutex);
+        iwl_cancel_deferred_work(priv);
 }
 #define MAX_HW_RESTARTS 5
@@ -6691,6 +6698,11 @@ static int __iwl_up(struct iwl_priv *priv)
                return 0;
        }
+        if (!priv->ucode_data_backup.v_addr || !priv->ucode_data.v_addr) {
+                IWL_ERROR("ucode not available for device bringup\n");
+                return -EIO;
+        }
        iwl_write32(priv, CSR_INT, 0xFFFFFFFF);
        rc = iwl_hw_nic_init(priv);
@@ -7326,9 +7338,6 @@ static int iwl_mac_add_interface(struct ieee80211_hw *hw,
        DECLARE_MAC_BUF(mac);
        IWL_DEBUG_MAC80211("enter: id %d, type %d\n", conf->if_id, conf->type);
-        if (conf->mac_addr)
-                IWL_DEBUG_MAC80211("enter: MAC %s\n",
-                                   print_mac(mac, conf->mac_addr));
        if (priv->interface_id) {
                IWL_DEBUG_MAC80211("leave - interface_id != 0\n");
@@ -7341,6 +7350,11 @@ static int iwl_mac_add_interface(struct ieee80211_hw *hw,
        spin_unlock_irqrestore(&priv->lock, flags);
        mutex_lock(&priv->mutex);
+        if (conf->mac_addr) {
+                IWL_DEBUG_MAC80211("Set %s\n", print_mac(mac, conf->mac_addr));
+                memcpy(priv->mac_addr, conf->mac_addr, ETH_ALEN);
+        }
        iwl_set_mode(priv, conf->type);
        IWL_DEBUG_MAC80211("leave\n");
@@ -8864,6 +8878,7 @@ static void iwl_cancel_deferred_work(struct iwl_priv *priv)
 {
        iwl_hw_cancel_deferred_work(priv);
+        cancel_delayed_work_sync(&priv->init_alive_start);
        cancel_delayed_work(&priv->scan_check);
        cancel_delayed_work(&priv->alive_start);
        cancel_delayed_work(&priv->post_associate);
@@ -9164,10 +9179,9 @@ static void iwl_pci_remove(struct pci_dev *pdev)
        IWL_DEBUG_INFO("*** UNLOAD DRIVER ***\n");
-        mutex_lock(&priv->mutex);
        set_bit(STATUS_EXIT_PENDING, &priv->status);
-        __iwl_down(priv);
-        mutex_unlock(&priv->mutex);
+        iwl_down(priv);
        /* Free MAC hash list for ADHOC */
        for (i = 0; i < IWL_IBSS_MAC_HASH_SIZE; i++) {
@@ -9226,12 +9240,10 @@ static int iwl_pci_suspend(struct pci_dev *pdev, pm_message_t state)
 {
        struct iwl_priv *priv = pci_get_drvdata(pdev);
-        mutex_lock(&priv->mutex);
        set_bit(STATUS_IN_SUSPEND, &priv->status);
        /* Take down the device; powers it off, etc. */
-        __iwl_down(priv);
+        iwl_down(priv);
        if (priv->mac80211_registered)
                ieee80211_stop_queues(priv->hw);
@@ -9240,8 +9252,6 @@ static int iwl_pci_suspend(struct pci_dev *pdev, pm_message_t state)
        pci_disable_device(pdev);
        pci_set_power_state(pdev, PCI_D3hot);
-        mutex_unlock(&priv->mutex);
        return 0;
 }
@@ -9299,8 +9309,6 @@ static int iwl_pci_resume(struct pci_dev *pdev)
        printk(KERN_INFO "Coming out of suspend...\n");
-        mutex_lock(&priv->mutex);
        pci_set_power_state(pdev, PCI_D0);
        err = pci_enable_device(pdev);
        pci_restore_state(pdev);
@@ -9314,7 +9322,6 @@ static int iwl_pci_resume(struct pci_dev *pdev)
        pci_write_config_byte(pdev, 0x41, 0x00);
        iwl_resume(priv);
-        mutex_unlock(&priv->mutex);
        return 0;
 }
diff --git a/drivers/net/wireless/libertas/if_cs.c b/drivers/net/wireless/libertas/if_cs.c
index ec89dabc412c..ba4fc2b3bf0a 100644
--- a/drivers/net/wireless/libertas/if_cs.c
+++ b/drivers/net/wireless/libertas/if_cs.c
@@ -170,7 +170,8 @@ static int if_cs_poll_while_fw_download(struct if_cs_card *card, uint addr, u8 r
 #define IF_CS_H_IC_TX_OVER              0x0001
 #define IF_CS_H_IC_RX_OVER              0x0002
 #define IF_CS_H_IC_DNLD_OVER            0x0004
-#define IF_CS_H_IC_HOST_EVENT           0x0008
+#define IF_CS_H_IC_POWER_DOWN           0x0008
+#define IF_CS_H_IC_HOST_EVENT           0x0010
 #define IF_CS_H_IC_MASK                 0x001f
 #define IF_CS_H_INT_MASK                0x00000004
diff --git a/drivers/net/wireless/libertas/if_sdio.c b/drivers/net/wireless/libertas/if_sdio.c
index b24425f74883..4f1efb108c28 100644
--- a/drivers/net/wireless/libertas/if_sdio.c
+++ b/drivers/net/wireless/libertas/if_sdio.c
@@ -871,6 +871,10 @@ static int if_sdio_probe(struct sdio_func *func,
                if (sscanf(func->card->info[i],
                                "ID: %x", &model) == 1)
                        break;
+               if (!strcmp(func->card->info[i], "IBIS Wireless SDIO Card")) {
+                       model = 4;
+                       break;
+               }
        }
        if (i == func->card->num_info) {
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c
index 5ead08312e1e..1823b48a8ba7 100644
--- a/drivers/net/wireless/libertas/main.c
+++ b/drivers/net/wireless/libertas/main.c
@@ -1165,8 +1165,6 @@ wlan_private *libertas_add_card(void *card, struct device *dmdev)
 #ifdef  WIRELESS_EXT
        dev->wireless_handlers = (struct iw_handler_def *)&libertas_handler_def;
 #endif
-#define NETIF_F_DYNALLOC 16
-        dev->features |= NETIF_F_DYNALLOC;
        dev->flags |= IFF_BROADCAST | IFF_MULTICAST;
        dev->set_multicast_list = libertas_set_multicast_list;
@@ -1348,8 +1346,6 @@ int libertas_add_mesh(wlan_private *priv, struct device *dev)
 #ifdef  WIRELESS_EXT
        mesh_dev->wireless_handlers = (struct iw_handler_def *)&mesh_handler_def;
 #endif
-#define NETIF_F_DYNALLOC 16
        /* Register virtual mesh interface */
        ret = register_netdev(mesh_dev);
        if (ret) {
diff --git a/drivers/net/wireless/libertas/wext.c b/drivers/net/wireless/libertas/wext.c
index c6f5aa3cb465..395b7882d4d6 100644
--- a/drivers/net/wireless/libertas/wext.c
+++ b/drivers/net/wireless/libertas/wext.c
@@ -1528,7 +1528,7 @@ static int wlan_set_encodeext(struct net_device *dev,
                        && (ext->key_len != KEY_LEN_WPA_TKIP))
                    || ((alg == IW_ENCODE_ALG_CCMP)
                        && (ext->key_len != KEY_LEN_WPA_AES))) {
-                                lbs_deb_wext("invalid size %d for key of alg"
+                                lbs_deb_wext("invalid size %d for key of alg "
                                       "type %d\n",
                                       ext->key_len,
                                       alg);
diff --git a/drivers/net/wireless/netwave_cs.c b/drivers/net/wireless/netwave_cs.c
index 2402cb8dd328..d2fa079fbc4c 100644
--- a/drivers/net/wireless/netwave_cs.c
+++ b/drivers/net/wireless/netwave_cs.c
@@ -806,7 +806,7 @@ static int netwave_pcmcia_config(struct pcmcia_device *link) {
    for (i = 0; i < 6; i++) 
        dev->dev_addr[i] = readb(ramBase + NETWAVE_EREG_PA + i);
-    printk(KERN_INFO "%s: Netwave: port %#3lx, irq %d, mem %lx"
+    printk(KERN_INFO "%s: Netwave: port %#3lx, irq %d, mem %lx, "
           "id %c%c, hw_addr %s\n",
           dev->name, dev->base_addr, dev->irq,
           (u_long) ramBase,
diff --git a/drivers/net/wireless/p54usb.c b/drivers/net/wireless/p54usb.c
index 755482a5a938..60d286eb0b8b 100644
--- a/drivers/net/wireless/p54usb.c
+++ b/drivers/net/wireless/p54usb.c
@@ -308,7 +308,7 @@ static int p54u_read_eeprom(struct ieee80211_hw *dev)
        buf = kmalloc(0x2020, GFP_KERNEL);
        if (!buf) {
-                printk(KERN_ERR "prism54usb: cannot allocate memory for"
+                printk(KERN_ERR "prism54usb: cannot allocate memory for "
                       "eeprom readback!\n");
                return -ENOMEM;
        }
diff --git a/drivers/net/wireless/rt2x00/rt2500usb.c b/drivers/net/wireless/rt2x00/rt2500usb.c
index 277a020b35e9..18b1f9145389 100644
--- a/drivers/net/wireless/rt2x00/rt2500usb.c
+++ b/drivers/net/wireless/rt2x00/rt2500usb.c
@@ -257,7 +257,7 @@ static const struct rt2x00debug rt2500usb_rt2x00debug = {
 static void rt2500usb_config_mac_addr(struct rt2x00_dev *rt2x00dev,
                                      __le32 *mac)
 {
-        rt2500usb_register_multiwrite(rt2x00dev, MAC_CSR2, &mac,
+        rt2500usb_register_multiwrite(rt2x00dev, MAC_CSR2, mac,
                                      (3 * sizeof(__le16)));
 }
@@ -1032,7 +1032,7 @@ static void rt2500usb_write_tx_desc(struct rt2x00_dev *rt2x00dev,
 }
 static int rt2500usb_get_tx_data_len(struct rt2x00_dev *rt2x00dev,
-                                     int maxpacket, struct sk_buff *skb)
+                                     struct sk_buff *skb)
 {
        int length;
@@ -1041,7 +1041,7 @@ static int rt2500usb_get_tx_data_len(struct rt2x00_dev *rt2x00dev,
         * but it must _not_ be a multiple of the USB packet size.
         */
        length = roundup(skb->len, 2);
-        length += (2 * !(length % maxpacket));
+        length += (2 * !(length % rt2x00dev->usb_maxpacket));
        return length;
 }
@@ -1643,7 +1643,6 @@ static int rt2500usb_beacon_update(struct ieee80211_hw *hw,
        struct data_entry *beacon;
        struct data_entry *guardian;
        int pipe = usb_sndbulkpipe(usb_dev, 1);
-        int max_packet = usb_maxpacket(usb_dev, pipe, 1);
        int length;
        /*
@@ -1672,7 +1671,7 @@ static int rt2500usb_beacon_update(struct ieee80211_hw *hw,
                                                         ring->desc_size),
                                skb->len - ring->desc_size, control);
-        length = rt2500usb_get_tx_data_len(rt2x00dev, max_packet, skb);
+        length = rt2500usb_get_tx_data_len(rt2x00dev, skb);
        usb_fill_bulk_urb(beacon->priv, usb_dev, pipe,
                          skb->data, length, rt2500usb_beacondone, beacon);
diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
index d1ad5251a77a..c8f16f161c28 100644
--- a/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/rt2x00/rt2x00.h
@@ -418,7 +418,7 @@ struct rt2x00lib_ops {
        int (*write_tx_data) (struct rt2x00_dev *rt2x00dev,
                              struct data_ring *ring, struct sk_buff *skb,
                              struct ieee80211_tx_control *control);
-        int (*get_tx_data_len) (struct rt2x00_dev *rt2x00dev, int maxpacket,
+        int (*get_tx_data_len) (struct rt2x00_dev *rt2x00dev,
                                struct sk_buff *skb);
        void (*kick_tx_queue) (struct rt2x00_dev *rt2x00dev,
                               unsigned int queue);
@@ -599,6 +599,11 @@ struct rt2x00_dev {
        u32 *rf;
        /*
+         * USB Max frame size (for rt2500usb & rt73usb).
+         */
+        u16 usb_maxpacket;
+        /*
         * Current TX power value.
         */
        u16 tx_power;
diff --git a/drivers/net/wireless/rt2x00/rt2x00pci.c b/drivers/net/wireless/rt2x00/rt2x00pci.c
index 2780df00623c..04663eb31950 100644
--- a/drivers/net/wireless/rt2x00/rt2x00pci.c
+++ b/drivers/net/wireless/rt2x00/rt2x00pci.c
@@ -124,7 +124,10 @@ void rt2x00pci_rxdone(struct rt2x00_dev *rt2x00dev)
        struct data_entry *entry;
        struct data_desc *rxd;
        struct sk_buff *skb;
+        struct ieee80211_hdr *hdr;
        struct rxdata_entry_desc desc;
+        int header_size;
+        int align;
        u32 word;
        while (1) {
@@ -138,17 +141,26 @@ void rt2x00pci_rxdone(struct rt2x00_dev *rt2x00dev)
                memset(&desc, 0x00, sizeof(desc));
                rt2x00dev->ops->lib->fill_rxdone(entry, &desc);
+                hdr = (struct ieee80211_hdr *)entry->data_addr;
+                header_size =
+                    ieee80211_get_hdrlen(le16_to_cpu(hdr->frame_control));
+                /*
+                 * The data behind the ieee80211 header must be
+                 * aligned on a 4 byte boundary.
+                 */
+                align = header_size % 4;
                /*
                 * Allocate the sk_buffer, initialize it and copy
                 * all data into it.
                 */
-                skb = dev_alloc_skb(desc.size + NET_IP_ALIGN);
+                skb = dev_alloc_skb(desc.size + align);
                if (!skb)
                        return;
-                skb_reserve(skb, NET_IP_ALIGN);
+                skb_reserve(skb, align);
-                skb_put(skb, desc.size);
+                memcpy(skb_put(skb, desc.size), entry->data_addr, desc.size);
-                memcpy(skb->data, entry->data_addr, desc.size);
                /*
                 * Send the frame to rt2x00lib for further processing.
diff --git a/drivers/net/wireless/rt2x00/rt2x00usb.c b/drivers/net/wireless/rt2x00/rt2x00usb.c
index 73cc726c4046..568d73847dca 100644
--- a/drivers/net/wireless/rt2x00/rt2x00usb.c
+++ b/drivers/net/wireless/rt2x00/rt2x00usb.c
@@ -159,7 +159,6 @@ int rt2x00usb_write_tx_data(struct rt2x00_dev *rt2x00dev,
            interface_to_usbdev(rt2x00dev_usb(rt2x00dev));
        struct data_entry *entry = rt2x00_get_data_entry(ring);
        int pipe = usb_sndbulkpipe(usb_dev, 1);
-        int max_packet = usb_maxpacket(usb_dev, pipe, 1);
        u32 length;
        if (rt2x00_ring_full(ring)) {
@@ -194,8 +193,7 @@ int rt2x00usb_write_tx_data(struct rt2x00_dev *rt2x00dev,
         * length of the data to usb_fill_bulk_urb. Pass the skb
         * to the driver to determine what the length should be.
         */
-        length = rt2x00dev->ops->lib->get_tx_data_len(rt2x00dev,
+        length = rt2x00dev->ops->lib->get_tx_data_len(rt2x00dev, skb);
-                                                      max_packet, skb);
        /*
         * Initialize URB and send the frame to the device.
@@ -223,7 +221,9 @@ static void rt2x00usb_interrupt_rxdone(struct urb *urb)
        struct data_ring *ring = entry->ring;
        struct rt2x00_dev *rt2x00dev = ring->rt2x00dev;
        struct sk_buff *skb;
+        struct ieee80211_hdr *hdr;
        struct rxdata_entry_desc desc;
+        int header_size;
        int frame_size;
        if (!test_bit(DEVICE_ENABLED_RADIO, &rt2x00dev->flags) ||
@@ -245,19 +245,37 @@ static void rt2x00usb_interrupt_rxdone(struct urb *urb)
         * Allocate a new sk buffer to replace the current one.
         * If allocation fails, we should drop the current frame
         * so we can recycle the existing sk buffer for the new frame.
+         * As alignment we use 2 and not NET_IP_ALIGN because we need
+         * to be sure we have 2 bytes room in the head. (NET_IP_ALIGN
+         * can be 0 on some hardware). We use these 2 bytes for frame
+         * alignment later, we assume that the chance that
+         * header_size % 4 == 2 is bigger then header_size % 2 == 0
+         * and thus optimize alignment by reserving the 2 bytes in
+         * advance.
         */
        frame_size = entry->ring->data_size + entry->ring->desc_size;
-        skb = dev_alloc_skb(frame_size + NET_IP_ALIGN);
+        skb = dev_alloc_skb(frame_size + 2);
        if (!skb)
                goto skip_entry;
-        skb_reserve(skb, NET_IP_ALIGN);
+        skb_reserve(skb, 2);
        skb_put(skb, frame_size);
        /*
-         * Trim the skb_buffer to only contain the valid
+         * The data behind the ieee80211 header must be
-         * frame data (so ignore the device's descriptor).
+         * aligned on a 4 byte boundary.
+         * After that trim the entire buffer down to only
+         * contain the valid frame data excluding the device
+         * descriptor.
         */
+        hdr = (struct ieee80211_hdr *)entry->skb->data;
+        header_size =
+            ieee80211_get_hdrlen(le16_to_cpu(hdr->frame_control));
+        if (header_size % 4 == 0) {
+                skb_push(entry->skb, 2);
+                memmove(entry->skb->data, entry->skb->data + 2, skb->len - 2);
+        }
        skb_trim(entry->skb, desc.size);
        /*
@@ -490,6 +508,11 @@ int rt2x00usb_probe(struct usb_interface *usb_intf,
        rt2x00dev->ops = ops;
        rt2x00dev->hw = hw;
+        rt2x00dev->usb_maxpacket =
+            usb_maxpacket(usb_dev, usb_sndbulkpipe(usb_dev, 1), 1);
+        if (!rt2x00dev->usb_maxpacket)
+                rt2x00dev->usb_maxpacket = 1;
        retval = rt2x00usb_alloc_reg(rt2x00dev);
        if (retval)
                goto exit_free_device;
diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c
index 01dbef19d651..ecae968ce091 100644
--- a/drivers/net/wireless/rt2x00/rt61pci.c
+++ b/drivers/net/wireless/rt2x00/rt61pci.c
@@ -1738,6 +1738,7 @@ static void rt61pci_txdone(struct rt2x00_dev *rt2x00dev)
 {
        struct data_ring *ring;
        struct data_entry *entry;
+        struct data_entry *entry_done;
        struct data_desc *txd;
        u32 word;
        u32 reg;
@@ -1791,6 +1792,17 @@ static void rt61pci_txdone(struct rt2x00_dev *rt2x00dev)
                    !rt2x00_get_field32(word, TXD_W0_VALID))
                        return;
+                entry_done = rt2x00_get_data_entry_done(ring);
+                while (entry != entry_done) {
+                        /* Catch up. Just report any entries we missed as
+                         * failed. */
+                        WARNING(rt2x00dev,
+                                "TX status report missed for entry %p\n",
+                                entry_done);
+                        rt2x00lib_txdone(entry_done, TX_FAIL_OTHER, 0);
+                        entry_done = rt2x00_get_data_entry_done(ring);
+                }
                /*
                 * Obtain the status about this packet.
                 */
diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c
index dc640bf6b5eb..c0671c2e6e73 100644
--- a/drivers/net/wireless/rt2x00/rt73usb.c
+++ b/drivers/net/wireless/rt2x00/rt73usb.c
@@ -1251,7 +1251,7 @@ static void rt73usb_write_tx_desc(struct rt2x00_dev *rt2x00dev,
 }
 static int rt73usb_get_tx_data_len(struct rt2x00_dev *rt2x00dev,
-                                   int maxpacket, struct sk_buff *skb)
+                                   struct sk_buff *skb)
 {
        int length;
@@ -1260,7 +1260,7 @@ static int rt73usb_get_tx_data_len(struct rt2x00_dev *rt2x00dev,
         * but it must _not_ be a multiple of the USB packet size.
         */
        length = roundup(skb->len, 4);
-        length += (4 * !(length % maxpacket));
+        length += (4 * !(length % rt2x00dev->usb_maxpacket));
        return length;
 }
diff --git a/drivers/net/wireless/rtl8187_dev.c b/drivers/net/wireless/rtl8187_dev.c
index e454ae83e97a..bd1ab3b3afc0 100644
--- a/drivers/net/wireless/rtl8187_dev.c
+++ b/drivers/net/wireless/rtl8187_dev.c
@@ -38,6 +38,8 @@ static struct usb_device_id rtl8187_table[] __devinitdata = {
        {USB_DEVICE(0x0846, 0x6a00)},
        /* HP */
        {USB_DEVICE(0x03f0, 0xca02)},
+        /* Sitecom */
+        {USB_DEVICE(0x0df6, 0x000d)},
        {}
 };
diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c b/drivers/net/wireless/zd1211rw/zd_mac.c
index a903645e157a..5298a8bf1129 100644
--- a/drivers/net/wireless/zd1211rw/zd_mac.c
+++ b/drivers/net/wireless/zd1211rw/zd_mac.c
@@ -1130,6 +1130,8 @@ static void zd_mac_rx(struct zd_mac *mac, struct sk_buff *skb)
        __skb_trim(skb, skb->len -
                        (IEEE80211_FCS_LEN + sizeof(struct rx_status)));
+        ZD_ASSERT(IS_ALIGNED((unsigned long)skb->data, 4));
        update_qual_rssi(mac, skb->data, skb->len, stats.signal,
                         status->signal_strength);
@@ -1166,15 +1168,19 @@ static void do_rx(unsigned long mac_ptr)
 int zd_mac_rx_irq(struct zd_mac *mac, const u8 *buffer, unsigned int length)
 {
        struct sk_buff *skb;
+        unsigned int reserved =
+                ALIGN(max_t(unsigned int,
+                            sizeof(struct zd_rt_hdr), ZD_PLCP_HEADER_SIZE), 4) -
+                ZD_PLCP_HEADER_SIZE;
-        skb = dev_alloc_skb(sizeof(struct zd_rt_hdr) + length);
+        skb = dev_alloc_skb(reserved + length);
        if (!skb) {
                struct ieee80211_device *ieee = zd_mac_to_ieee80211(mac);
                dev_warn(zd_mac_dev(mac), "Could not allocate skb.\n");
                ieee->stats.rx_dropped++;
                return -ENOMEM;
        }
-        skb_reserve(skb, sizeof(struct zd_rt_hdr));
+        skb_reserve(skb, reserved);
        memcpy(__skb_put(skb, length), buffer, length);
        skb_queue_tail(&mac->rx_queue, skb);
        tasklet_schedule(&mac->rx_tasklet);
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index 2a8fc431099f..bca37bf0f545 100644
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -852,11 +852,6 @@ static int xennet_poll(struct napi_struct *napi, int budget)
        spin_lock(&np->rx_lock);
-        if (unlikely(!netif_carrier_ok(dev))) {
-                spin_unlock(&np->rx_lock);
-                return 0;
-        }
        skb_queue_head_init(&rxq);
        skb_queue_head_init(&errq);
        skb_queue_head_init(&tmpq);
diff --git a/drivers/net/yellowfin.c b/drivers/net/yellowfin.c
index 87f002ade531..fe6ff3e3d525 100644
--- a/drivers/net/yellowfin.c
+++ b/drivers/net/yellowfin.c
@@ -265,10 +265,10 @@ enum yellowfin_offsets {
 /* The Yellowfin Rx and Tx buffer descriptors.
   Elements are written as 32 bit for endian portability. */
 struct yellowfin_desc {
-        u32 dbdma_cmd;
+        __le32 dbdma_cmd;
-        u32 addr;
+        __le32 addr;
-        u32 branch_addr;
+        __le32 branch_addr;
-        u32 result_status;
+        __le32 result_status;
 };
 struct tx_status_words {
@@ -922,7 +922,7 @@ static irqreturn_t yellowfin_interrupt(int irq, void *dev_instance)
                        dev->stats.tx_packets++;
                        dev->stats.tx_bytes += skb->len;
                        /* Free the original skb. */
-                        pci_unmap_single(yp->pci_dev, yp->tx_ring[entry].addr,
+                        pci_unmap_single(yp->pci_dev, le32_to_cpu(yp->tx_ring[entry].addr),
                                skb->len, PCI_DMA_TODEVICE);
                        dev_kfree_skb_irq(skb);
                        yp->tx_skbuff[entry] = NULL;
@@ -1056,13 +1056,13 @@ static int yellowfin_rx(struct net_device *dev)
                if(!desc->result_status)
                        break;
-                pci_dma_sync_single_for_cpu(yp->pci_dev, desc->addr,
+                pci_dma_sync_single_for_cpu(yp->pci_dev, le32_to_cpu(desc->addr),
                        yp->rx_buf_sz, PCI_DMA_FROMDEVICE);
                desc_status = le32_to_cpu(desc->result_status) >> 16;
                buf_addr = rx_skb->data;
                data_size = (le32_to_cpu(desc->dbdma_cmd) -
                        le32_to_cpu(desc->result_status)) & 0xffff;
-                frame_status = le16_to_cpu(get_unaligned((s16*)&(buf_addr[data_size - 2])));
+                frame_status = le16_to_cpu(get_unaligned((__le16*)&(buf_addr[data_size - 2])));
                if (yellowfin_debug > 4)
                        printk(KERN_DEBUG "  yellowfin_rx() status was %4.4x.\n",
                                   frame_status);
@@ -1123,7 +1123,7 @@ static int yellowfin_rx(struct net_device *dev)
                        if (pkt_len > rx_copybreak) {
                                skb_put(skb = rx_skb, pkt_len);
                                pci_unmap_single(yp->pci_dev,
-                                        yp->rx_ring[entry].addr,
+                                        le32_to_cpu(yp->rx_ring[entry].addr),
                                        yp->rx_buf_sz,
                                        PCI_DMA_FROMDEVICE);
                                yp->rx_skbuff[entry] = NULL;
@@ -1134,9 +1134,10 @@ static int yellowfin_rx(struct net_device *dev)
                                skb_reserve(skb, 2);    /* 16 byte align the IP header */
                                skb_copy_to_linear_data(skb, rx_skb->data, pkt_len);
                                skb_put(skb, pkt_len);
-                                pci_dma_sync_single_for_device(yp->pci_dev, desc->addr,
+                                pci_dma_sync_single_for_device(yp->pci_dev,
-                                                                                           yp->rx_buf_sz,
+                                                                le32_to_cpu(desc->addr),
-                                                                                           PCI_DMA_FROMDEVICE);
+                                                                yp->rx_buf_sz,
+                                                                PCI_DMA_FROMDEVICE);
                        }
                        skb->protocol = eth_type_trans(skb, dev);
                        netif_rx(skb);
@@ -1252,7 +1253,7 @@ static int yellowfin_close(struct net_device *dev)
        /* Free all the skbuffs in the Rx queue. */
        for (i = 0; i < RX_RING_SIZE; i++) {
                yp->rx_ring[i].dbdma_cmd = cpu_to_le32(CMD_STOP);
-                yp->rx_ring[i].addr = 0xBADF00D0; /* An invalid address. */
+                yp->rx_ring[i].addr = cpu_to_le32(0xBADF00D0); /* An invalid address. */
                if (yp->rx_skbuff[i]) {
                        dev_kfree_skb(yp->rx_skbuff[i]);
                }