Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (69 commits) pptp: Accept packet with seq zero RDS: Remove some unused iWARP code net: fsl: fec: handle 10Mbps speed in RMII mode drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c: add missing iounmap drivers/net/ethernet/tundra/tsi108_eth.c: add missing iounmap ksz884x: fix mtu for VLAN net_sched: sfq: add optional RED on top of SFQ dp83640: Fix NOHZ local_softirq_pending 08 warning gianfar: Fix invalid TX frames returned on error queue when time stamping gianfar: Fix missing sock reference when processing TX time stamps phylib: introduce mdiobus_alloc_size() net: decrement memcg jump label when limit, not usage, is changed net: reintroduce missing rcu_assign_pointer() calls inet_diag: Rename inet_diag_req_compat into inet_diag_req inet_diag: Rename inet_diag_req into inet_diag_req_v2 bond_alb: don't disable softirq under bond_alb_xmit mac80211: fix rx->key NULL pointer dereference in promiscuous mode nl80211: fix old station flags compatibility mdio-octeon: use an unique MDIO bus name. mdio-gpio: use an unique MDIO bus name. ...
author: Linus Torvalds <torvalds@linux-foundation.org> 2012-01-12 23:30:02 -0500
committer: Linus Torvalds <torvalds@linux-foundation.org> 2012-01-12 23:30:02 -0500
commit: 7c17d86a8502c2e30c2eea777ed1b830aa3b447b (patch)
tree: 353f739a33f46f9861b479e64d2a59f9b5c85868 /drivers/net
parent: 2485a4b610171f4e1c4ab0d053569747795c1bbe (diff)
parent: 91dce7ddab99a29b600e3d792b847dc2cdbf0848 (diff)
42 files changed, 576 insertions, 394 deletions
diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c
index 106b88a04738..342626f4bc46 100644
--- a/drivers/net/bonding/bond_alb.c
+++ b/drivers/net/bonding/bond_alb.c
@@ -99,16 +99,26 @@ static inline u8 _simple_hash(const u8 *hash_start, int hash_size)
 /*********************** tlb specific functions ***************************/
-static inline void _lock_tx_hashtbl(struct bonding *bond)
+static inline void _lock_tx_hashtbl_bh(struct bonding *bond)
 {
        spin_lock_bh(&(BOND_ALB_INFO(bond).tx_hashtbl_lock));
 }
-static inline void _unlock_tx_hashtbl(struct bonding *bond)
+static inline void _unlock_tx_hashtbl_bh(struct bonding *bond)
 {
        spin_unlock_bh(&(BOND_ALB_INFO(bond).tx_hashtbl_lock));
 }
+static inline void _lock_tx_hashtbl(struct bonding *bond)
+{
+        spin_lock(&(BOND_ALB_INFO(bond).tx_hashtbl_lock));
+}
+static inline void _unlock_tx_hashtbl(struct bonding *bond)
+{
+        spin_unlock(&(BOND_ALB_INFO(bond).tx_hashtbl_lock));
+}
 /* Caller must hold tx_hashtbl lock */
 static inline void tlb_init_table_entry(struct tlb_client_info *entry, int save_load)
 {
@@ -129,14 +139,13 @@ static inline void tlb_init_slave(struct slave *slave)
        SLAVE_TLB_INFO(slave).head = TLB_NULL_INDEX;
 }
-/* Caller must hold bond lock for read */
+/* Caller must hold bond lock for read, BH disabled */
-static void tlb_clear_slave(struct bonding *bond, struct slave *slave, int save_load)
+static void __tlb_clear_slave(struct bonding *bond, struct slave *slave,
+                         int save_load)
 {
        struct tlb_client_info *tx_hash_table;
        u32 index;
-        _lock_tx_hashtbl(bond);
        /* clear slave from tx_hashtbl */
        tx_hash_table = BOND_ALB_INFO(bond).tx_hashtbl;
@@ -151,8 +160,15 @@ static void tlb_clear_slave(struct bonding *bond, struct slave *slave, int save_
        }
        tlb_init_slave(slave);
+}
-        _unlock_tx_hashtbl(bond);
+/* Caller must hold bond lock for read */
+static void tlb_clear_slave(struct bonding *bond, struct slave *slave,
+                         int save_load)
+{
+        _lock_tx_hashtbl_bh(bond);
+        __tlb_clear_slave(bond, slave, save_load);
+        _unlock_tx_hashtbl_bh(bond);
 }
 /* Must be called before starting the monitor timer */
@@ -169,7 +185,7 @@ static int tlb_initialize(struct bonding *bond)
                       bond->dev->name);
                return -1;
        }
-        _lock_tx_hashtbl(bond);
+        _lock_tx_hashtbl_bh(bond);
        bond_info->tx_hashtbl = new_hashtbl;
@@ -177,7 +193,7 @@ static int tlb_initialize(struct bonding *bond)
                tlb_init_table_entry(&bond_info->tx_hashtbl[i], 0);
        }
-        _unlock_tx_hashtbl(bond);
+        _unlock_tx_hashtbl_bh(bond);
        return 0;
 }
@@ -187,12 +203,12 @@ static void tlb_deinitialize(struct bonding *bond)
 {
        struct alb_bond_info *bond_info = &(BOND_ALB_INFO(bond));
-        _lock_tx_hashtbl(bond);
+        _lock_tx_hashtbl_bh(bond);
        kfree(bond_info->tx_hashtbl);
        bond_info->tx_hashtbl = NULL;
-        _unlock_tx_hashtbl(bond);
+        _unlock_tx_hashtbl_bh(bond);
 }
 static long long compute_gap(struct slave *slave)
@@ -226,15 +242,13 @@ static struct slave *tlb_get_least_loaded_slave(struct bonding *bond)
        return least_loaded;
 }
-/* Caller must hold bond lock for read */
+static struct slave *__tlb_choose_channel(struct bonding *bond, u32 hash_index,
-static struct slave *tlb_choose_channel(struct bonding *bond, u32 hash_index, u32 skb_len)
+                                                u32 skb_len)
 {
        struct alb_bond_info *bond_info = &(BOND_ALB_INFO(bond));
        struct tlb_client_info *hash_table;
        struct slave *assigned_slave;
-        _lock_tx_hashtbl(bond);
        hash_table = bond_info->tx_hashtbl;
        assigned_slave = hash_table[hash_index].tx_slave;
        if (!assigned_slave) {
@@ -263,22 +277,46 @@ static struct slave *tlb_choose_channel(struct bonding *bond, u32 hash_index, u3
                hash_table[hash_index].tx_bytes += skb_len;
        }
-        _unlock_tx_hashtbl(bond);
        return assigned_slave;
 }
+/* Caller must hold bond lock for read */
+static struct slave *tlb_choose_channel(struct bonding *bond, u32 hash_index,
+                                        u32 skb_len)
+{
+        struct slave *tx_slave;
+        /*
+         * We don't need to disable softirq here, becase
+         * tlb_choose_channel() is only called by bond_alb_xmit()
+         * which already has softirq disabled.
+         */
+        _lock_tx_hashtbl(bond);
+        tx_slave = __tlb_choose_channel(bond, hash_index, skb_len);
+        _unlock_tx_hashtbl(bond);
+        return tx_slave;
+}
 /*********************** rlb specific functions ***************************/
-static inline void _lock_rx_hashtbl(struct bonding *bond)
+static inline void _lock_rx_hashtbl_bh(struct bonding *bond)
 {
        spin_lock_bh(&(BOND_ALB_INFO(bond).rx_hashtbl_lock));
 }
-static inline void _unlock_rx_hashtbl(struct bonding *bond)
+static inline void _unlock_rx_hashtbl_bh(struct bonding *bond)
 {
        spin_unlock_bh(&(BOND_ALB_INFO(bond).rx_hashtbl_lock));
 }
+static inline void _lock_rx_hashtbl(struct bonding *bond)
+{
+        spin_lock(&(BOND_ALB_INFO(bond).rx_hashtbl_lock));
+}
+static inline void _unlock_rx_hashtbl(struct bonding *bond)
+{
+        spin_unlock(&(BOND_ALB_INFO(bond).rx_hashtbl_lock));
+}
 /* when an ARP REPLY is received from a client update its info
 * in the rx_hashtbl
 */
@@ -288,7 +326,7 @@ static void rlb_update_entry_from_arp(struct bonding *bond, struct arp_pkt *arp)
        struct rlb_client_info *client_info;
        u32 hash_index;
-        _lock_rx_hashtbl(bond);
+        _lock_rx_hashtbl_bh(bond);
        hash_index = _simple_hash((u8*)&(arp->ip_src), sizeof(arp->ip_src));
        client_info = &(bond_info->rx_hashtbl[hash_index]);
@@ -303,7 +341,7 @@ static void rlb_update_entry_from_arp(struct bonding *bond, struct arp_pkt *arp)
                bond_info->rx_ntt = 1;
        }
-        _unlock_rx_hashtbl(bond);
+        _unlock_rx_hashtbl_bh(bond);
 }
 static void rlb_arp_recv(struct sk_buff *skb, struct bonding *bond,
@@ -401,7 +439,7 @@ static void rlb_clear_slave(struct bonding *bond, struct slave *slave)
        u32 index, next_index;
        /* clear slave from rx_hashtbl */
-        _lock_rx_hashtbl(bond);
+        _lock_rx_hashtbl_bh(bond);
        rx_hash_table = bond_info->rx_hashtbl;
        index = bond_info->rx_hashtbl_head;
@@ -432,7 +470,7 @@ static void rlb_clear_slave(struct bonding *bond, struct slave *slave)
                }
        }
-        _unlock_rx_hashtbl(bond);
+        _unlock_rx_hashtbl_bh(bond);
        write_lock_bh(&bond->curr_slave_lock);
@@ -489,7 +527,7 @@ static void rlb_update_rx_clients(struct bonding *bond)
        struct rlb_client_info *client_info;
        u32 hash_index;
-        _lock_rx_hashtbl(bond);
+        _lock_rx_hashtbl_bh(bond);
        hash_index = bond_info->rx_hashtbl_head;
        for (; hash_index != RLB_NULL_INDEX; hash_index = client_info->next) {
@@ -507,7 +545,7 @@ static void rlb_update_rx_clients(struct bonding *bond)
         */
        bond_info->rlb_update_delay_counter = RLB_UPDATE_DELAY;
-        _unlock_rx_hashtbl(bond);
+        _unlock_rx_hashtbl_bh(bond);
 }
 /* The slave was assigned a new mac address - update the clients */
@@ -518,7 +556,7 @@ static void rlb_req_update_slave_clients(struct bonding *bond, struct slave *sla
        int ntt = 0;
        u32 hash_index;
-        _lock_rx_hashtbl(bond);
+        _lock_rx_hashtbl_bh(bond);
        hash_index = bond_info->rx_hashtbl_head;
        for (; hash_index != RLB_NULL_INDEX; hash_index = client_info->next) {
@@ -538,7 +576,7 @@ static void rlb_req_update_slave_clients(struct bonding *bond, struct slave *sla
                bond_info->rlb_update_retry_counter = RLB_UPDATE_RETRY;
        }
-        _unlock_rx_hashtbl(bond);
+        _unlock_rx_hashtbl_bh(bond);
 }
 /* mark all clients using src_ip to be updated */
@@ -709,7 +747,7 @@ static void rlb_rebalance(struct bonding *bond)
        int ntt;
        u32 hash_index;
-        _lock_rx_hashtbl(bond);
+        _lock_rx_hashtbl_bh(bond);
        ntt = 0;
        hash_index = bond_info->rx_hashtbl_head;
@@ -727,7 +765,7 @@ static void rlb_rebalance(struct bonding *bond)
        if (ntt) {
                bond_info->rx_ntt = 1;
        }
-        _unlock_rx_hashtbl(bond);
+        _unlock_rx_hashtbl_bh(bond);
 }
 /* Caller must hold rx_hashtbl lock */
@@ -751,7 +789,7 @@ static int rlb_initialize(struct bonding *bond)
                       bond->dev->name);
                return -1;
        }
-        _lock_rx_hashtbl(bond);
+        _lock_rx_hashtbl_bh(bond);
        bond_info->rx_hashtbl = new_hashtbl;
@@ -761,7 +799,7 @@ static int rlb_initialize(struct bonding *bond)
                rlb_init_table_entry(bond_info->rx_hashtbl + i);
        }
-        _unlock_rx_hashtbl(bond);
+        _unlock_rx_hashtbl_bh(bond);
        /* register to receive ARPs */
        bond->recv_probe = rlb_arp_recv;
@@ -773,13 +811,13 @@ static void rlb_deinitialize(struct bonding *bond)
 {
        struct alb_bond_info *bond_info = &(BOND_ALB_INFO(bond));
-        _lock_rx_hashtbl(bond);
+        _lock_rx_hashtbl_bh(bond);
        kfree(bond_info->rx_hashtbl);
        bond_info->rx_hashtbl = NULL;
        bond_info->rx_hashtbl_head = RLB_NULL_INDEX;
-        _unlock_rx_hashtbl(bond);
+        _unlock_rx_hashtbl_bh(bond);
 }
 static void rlb_clear_vlan(struct bonding *bond, unsigned short vlan_id)
@@ -787,7 +825,7 @@ static void rlb_clear_vlan(struct bonding *bond, unsigned short vlan_id)
        struct alb_bond_info *bond_info = &(BOND_ALB_INFO(bond));
        u32 curr_index;
-        _lock_rx_hashtbl(bond);
+        _lock_rx_hashtbl_bh(bond);
        curr_index = bond_info->rx_hashtbl_head;
        while (curr_index != RLB_NULL_INDEX) {
@@ -812,7 +850,7 @@ static void rlb_clear_vlan(struct bonding *bond, unsigned short vlan_id)
                curr_index = next_index;
        }
-        _unlock_rx_hashtbl(bond);
+        _unlock_rx_hashtbl_bh(bond);
 }
 /*********************** tlb/rlb shared functions *********************/
@@ -1320,7 +1358,9 @@ int bond_alb_xmit(struct sk_buff *skb, struct net_device *bond_dev)
                res = bond_dev_queue_xmit(bond, skb, tx_slave->dev);
        } else {
                if (tx_slave) {
-                        tlb_clear_slave(bond, tx_slave, 0);
+                        _lock_tx_hashtbl(bond);
+                        __tlb_clear_slave(bond, tx_slave, 0);
+                        _unlock_tx_hashtbl(bond);
                }
        }
diff --git a/drivers/net/ethernet/8390/ax88796.c b/drivers/net/ethernet/8390/ax88796.c
index 9e8ba4f5636b..0f92e3567f68 100644
--- a/drivers/net/ethernet/8390/ax88796.c
+++ b/drivers/net/ethernet/8390/ax88796.c
@@ -623,7 +623,8 @@ static int ax_mii_init(struct net_device *dev)
        ax->mii_bus->name = "ax88796_mii_bus";
        ax->mii_bus->parent = dev->dev.parent;
-        snprintf(ax->mii_bus->id, MII_BUS_ID_SIZE, "%x", pdev->id);
+        snprintf(ax->mii_bus->id, MII_BUS_ID_SIZE, "%s-%x",
+                pdev->name, pdev->id);
        ax->mii_bus->irq = kmalloc(sizeof(int) * PHY_MAX_ADDR, GFP_KERNEL);
        if (!ax->mii_bus->irq) {
diff --git a/drivers/net/ethernet/adi/bfin_mac.c b/drivers/net/ethernet/adi/bfin_mac.c
index b6d69c91db96..d812a103e032 100644
--- a/drivers/net/ethernet/adi/bfin_mac.c
+++ b/drivers/net/ethernet/adi/bfin_mac.c
@@ -1670,7 +1670,8 @@ static int __devinit bfin_mii_bus_probe(struct platform_device *pdev)
        miibus->name = "bfin_mii_bus";
        miibus->phy_mask = mii_bus_pd->phy_mask;
-        snprintf(miibus->id, MII_BUS_ID_SIZE, "0");
+        snprintf(miibus->id, MII_BUS_ID_SIZE, "%s-%x",
+                pdev->name, pdev->id);
        miibus->irq = kmalloc(sizeof(int)*PHY_MAX_ADDR, GFP_KERNEL);
        if (!miibus->irq)
                goto out_err_irq_alloc;
diff --git a/drivers/net/ethernet/amd/au1000_eth.c b/drivers/net/ethernet/amd/au1000_eth.c
index cc9262be69c8..8b95dd314253 100644
--- a/drivers/net/ethernet/amd/au1000_eth.c
+++ b/drivers/net/ethernet/amd/au1000_eth.c
@@ -1171,7 +1171,8 @@ static int __devinit au1000_probe(struct platform_device *pdev)
        aup->mii_bus->write = au1000_mdiobus_write;
        aup->mii_bus->reset = au1000_mdiobus_reset;
        aup->mii_bus->name = "au1000_eth_mii";
-        snprintf(aup->mii_bus->id, MII_BUS_ID_SIZE, "%x", aup->mac_id);
+        snprintf(aup->mii_bus->id, MII_BUS_ID_SIZE, "%s-%x",
+                pdev->name, aup->mac_id);
        aup->mii_bus->irq = kmalloc(sizeof(int)*PHY_MAX_ADDR, GFP_KERNEL);
        if (aup->mii_bus->irq == NULL)
                goto err_out;
diff --git a/drivers/net/ethernet/broadcom/bcm63xx_enet.c b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
index d44331eb07fe..986019b2c849 100644
--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
+++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
@@ -1727,7 +1727,7 @@ static int __devinit bcm_enet_probe(struct platform_device *pdev)
                bus->priv = priv;
                bus->read = bcm_enet_mdio_read_phylib;
                bus->write = bcm_enet_mdio_write_phylib;
-                sprintf(bus->id, "%d", priv->mac_id);
+                sprintf(bus->id, "%s-%d", pdev->name, priv->mac_id);
                /* only probe bus where we think the PHY is, because
                 * the mdio read operation return 0 instead of 0xffff
diff --git a/drivers/net/ethernet/broadcom/sb1250-mac.c b/drivers/net/ethernet/broadcom/sb1250-mac.c
index 8fa7abc53ec6..084904ceaa30 100644
--- a/drivers/net/ethernet/broadcom/sb1250-mac.c
+++ b/drivers/net/ethernet/broadcom/sb1250-mac.c
@@ -2259,7 +2259,8 @@ static int sbmac_init(struct platform_device *pldev, long long base)
        }
        sc->mii_bus->name = sbmac_mdio_string;
-        snprintf(sc->mii_bus->id, MII_BUS_ID_SIZE, "%x", idx);
+        snprintf(sc->mii_bus->id, MII_BUS_ID_SIZE, "%s-%x",
+                pldev->name, idx);
        sc->mii_bus->priv = sc;
        sc->mii_bus->read = sbmac_mii_read;
        sc->mii_bus->write = sbmac_mii_write;
diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c
index f3d5c65d99cf..23200680d4c1 100644
--- a/drivers/net/ethernet/cadence/macb.c
+++ b/drivers/net/ethernet/cadence/macb.c
@@ -243,7 +243,8 @@ static int macb_mii_init(struct macb *bp)
        bp->mii_bus->read = &macb_mdio_read;
        bp->mii_bus->write = &macb_mdio_write;
        bp->mii_bus->reset = &macb_mdio_reset;
-        snprintf(bp->mii_bus->id, MII_BUS_ID_SIZE, "%x", bp->pdev->id);
+        snprintf(bp->mii_bus->id, MII_BUS_ID_SIZE, "%s-%x",
+                bp->pdev->name, bp->pdev->id);
        bp->mii_bus->priv = bp;
        bp->mii_bus->parent = &bp->dev->dev;
        pdata = bp->pdev->dev.platform_data;
diff --git a/drivers/net/ethernet/dnet.c b/drivers/net/ethernet/dnet.c
index ce88c0f399f6..925c9bafc9b9 100644
--- a/drivers/net/ethernet/dnet.c
+++ b/drivers/net/ethernet/dnet.c
@@ -325,7 +325,8 @@ static int dnet_mii_init(struct dnet *bp)
        bp->mii_bus->write = &dnet_mdio_write;
        bp->mii_bus->reset = &dnet_mdio_reset;
-        snprintf(bp->mii_bus->id, MII_BUS_ID_SIZE, "%x", 0);
+        snprintf(bp->mii_bus->id, MII_BUS_ID_SIZE, "%s-%x",
+                bp->pdev->name, bp->pdev->id);
        bp->mii_bus->priv = bp;
diff --git a/drivers/net/ethernet/freescale/fec.c b/drivers/net/ethernet/freescale/fec.c
index ddcbbb34d1b9..7b25e9cf13f6 100644
--- a/drivers/net/ethernet/freescale/fec.c
+++ b/drivers/net/ethernet/freescale/fec.c
@@ -476,6 +476,7 @@ fec_restart(struct net_device *ndev, int duplex)
        } else {
 #ifdef FEC_MIIGSK_ENR
                if (id_entry->driver_data & FEC_QUIRK_USE_GASKET) {
+                        u32 cfgr;
                        /* disable the gasket and wait */
                        writel(0, fep->hwp + FEC_MIIGSK_ENR);
                        while (readl(fep->hwp + FEC_MIIGSK_ENR) & 4)
@@ -486,9 +487,11 @@ fec_restart(struct net_device *ndev, int duplex)
                         *   RMII, 50 MHz, no loopback, no echo
                         *   MII, 25 MHz, no loopback, no echo
                         */
-                        writel((fep->phy_interface == PHY_INTERFACE_MODE_RMII) ?
+                        cfgr = (fep->phy_interface == PHY_INTERFACE_MODE_RMII)
-                                        1 : 0, fep->hwp + FEC_MIIGSK_CFGR);
+                                ? BM_MIIGSK_CFGR_RMII : BM_MIIGSK_CFGR_MII;
+                        if (fep->phy_dev && fep->phy_dev->speed == SPEED_10)
+                                cfgr |= BM_MIIGSK_CFGR_FRCONT_10M;
+                        writel(cfgr, fep->hwp + FEC_MIIGSK_CFGR);
                        /* re-enable the gasket */
                        writel(2, fep->hwp + FEC_MIIGSK_ENR);
@@ -1077,7 +1080,8 @@ static int fec_enet_mii_init(struct platform_device *pdev)
        fep->mii_bus->read = fec_enet_mdio_read;
        fep->mii_bus->write = fec_enet_mdio_write;
        fep->mii_bus->reset = fec_enet_mdio_reset;
-        snprintf(fep->mii_bus->id, MII_BUS_ID_SIZE, "%x", fep->dev_id + 1);
+        snprintf(fep->mii_bus->id, MII_BUS_ID_SIZE, "%s-%x",
+                pdev->name, fep->dev_id + 1);
        fep->mii_bus->priv = fep;
        fep->mii_bus->parent = &pdev->dev;
diff --git a/drivers/net/ethernet/freescale/fec.h b/drivers/net/ethernet/freescale/fec.h
index 8b2c6d797e6d..8408c627b195 100644
--- a/drivers/net/ethernet/freescale/fec.h
+++ b/drivers/net/ethernet/freescale/fec.h
@@ -47,6 +47,10 @@
 #define FEC_MIIGSK_CFGR         0x300 /* MIIGSK Configuration reg */
 #define FEC_MIIGSK_ENR          0x308 /* MIIGSK Enable reg */
+#define BM_MIIGSK_CFGR_MII              0x00
+#define BM_MIIGSK_CFGR_RMII             0x01
+#define BM_MIIGSK_CFGR_FRCONT_10M       0x40
 #else
 #define FEC_ECNTRL              0x000 /* Ethernet control reg */
diff --git a/drivers/net/ethernet/freescale/gianfar.c b/drivers/net/ethernet/freescale/gianfar.c
index e01cdaa722a9..39d160d353a4 100644
--- a/drivers/net/ethernet/freescale/gianfar.c
+++ b/drivers/net/ethernet/freescale/gianfar.c
@@ -1984,7 +1984,8 @@ static inline struct txfcb *gfar_add_fcb(struct sk_buff *skb)
        return fcb;
 }
-static inline void gfar_tx_checksum(struct sk_buff *skb, struct txfcb *fcb)
+static inline void gfar_tx_checksum(struct sk_buff *skb, struct txfcb *fcb,
+                int fcb_length)
 {
        u8 flags = 0;
@@ -2006,7 +2007,7 @@ static inline void gfar_tx_checksum(struct sk_buff *skb, struct txfcb *fcb)
         * frame (skb->data) and the start of the IP hdr.
         * l4os is the distance between the start of the
         * l3 hdr and the l4 hdr */
-        fcb->l3os = (u16)(skb_network_offset(skb) - GMAC_FCB_LEN);
+        fcb->l3os = (u16)(skb_network_offset(skb) - fcb_length);
        fcb->l4os = skb_network_header_len(skb);
        fcb->flags = flags;
@@ -2046,7 +2047,7 @@ static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev)
        int i, rq = 0, do_tstamp = 0;
        u32 bufaddr;
        unsigned long flags;
-        unsigned int nr_frags, nr_txbds, length;
+        unsigned int nr_frags, nr_txbds, length, fcb_length = GMAC_FCB_LEN;
        /*
         * TOE=1 frames larger than 2500 bytes may see excess delays
@@ -2070,22 +2071,28 @@ static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev)
        /* check if time stamp should be generated */
        if (unlikely(skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP &&
-                     priv->hwts_tx_en))
+                        priv->hwts_tx_en)) {
                do_tstamp = 1;
+                fcb_length = GMAC_FCB_LEN + GMAC_TXPAL_LEN;
+        }
        /* make space for additional header when fcb is needed */
        if (((skb->ip_summed == CHECKSUM_PARTIAL) ||
                        vlan_tx_tag_present(skb) ||
                        unlikely(do_tstamp)) &&
-                        (skb_headroom(skb) < GMAC_FCB_LEN)) {
+                        (skb_headroom(skb) < fcb_length)) {
                struct sk_buff *skb_new;
-                skb_new = skb_realloc_headroom(skb, GMAC_FCB_LEN);
+                skb_new = skb_realloc_headroom(skb, fcb_length);
                if (!skb_new) {
                        dev->stats.tx_errors++;
                        kfree_skb(skb);
                        return NETDEV_TX_OK;
                }
+                /* Steal sock reference for processing TX time stamps */
+                swap(skb_new->sk, skb->sk);
+                swap(skb_new->destructor, skb->destructor);
                kfree_skb(skb);
                skb = skb_new;
        }
@@ -2154,6 +2161,12 @@ static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev)
                lstatus = txbdp_start->lstatus;
        }
+        /* Add TxPAL between FCB and frame if required */
+        if (unlikely(do_tstamp)) {
+                skb_push(skb, GMAC_TXPAL_LEN);
+                memset(skb->data, 0, GMAC_TXPAL_LEN);
+        }
        /* Set up checksumming */
        if (CHECKSUM_PARTIAL == skb->ip_summed) {
                fcb = gfar_add_fcb(skb);
@@ -2164,7 +2177,7 @@ static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev)
                        skb_checksum_help(skb);
                } else {
                        lstatus |= BD_LFLAG(TXBD_TOE);
-                        gfar_tx_checksum(skb, fcb);
+                        gfar_tx_checksum(skb, fcb, fcb_length);
                }
        }
@@ -2196,9 +2209,9 @@ static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev)
         * the full frame length.
         */
        if (unlikely(do_tstamp)) {
-                txbdp_tstamp->bufPtr = txbdp_start->bufPtr + GMAC_FCB_LEN;
+                txbdp_tstamp->bufPtr = txbdp_start->bufPtr + fcb_length;
                txbdp_tstamp->lstatus |= BD_LFLAG(TXBD_READY) |
-                                (skb_headlen(skb) - GMAC_FCB_LEN);
+                                (skb_headlen(skb) - fcb_length);
                lstatus |= BD_LFLAG(TXBD_CRC | TXBD_READY) | GMAC_FCB_LEN;
        } else {
                lstatus |= BD_LFLAG(TXBD_CRC | TXBD_READY) | skb_headlen(skb);
@@ -2490,7 +2503,7 @@ static int gfar_clean_tx_ring(struct gfar_priv_tx_q *tx_queue)
                if (unlikely(skb_shinfo(skb)->tx_flags & SKBTX_IN_PROGRESS)) {
                        next = next_txbd(bdp, base, tx_ring_size);
-                        buflen = next->length + GMAC_FCB_LEN;
+                        buflen = next->length + GMAC_FCB_LEN + GMAC_TXPAL_LEN;
                } else
                        buflen = bdp->length;
@@ -2502,6 +2515,7 @@ static int gfar_clean_tx_ring(struct gfar_priv_tx_q *tx_queue)
                        u64 *ns = (u64*) (((u32)skb->data + 0x10) & ~0x7);
                        memset(&shhwtstamps, 0, sizeof(shhwtstamps));
                        shhwtstamps.hwtstamp = ns_to_ktime(*ns);
+                        skb_pull(skb, GMAC_FCB_LEN + GMAC_TXPAL_LEN);
                        skb_tstamp_tx(skb, &shhwtstamps);
                        bdp->lstatus &= BD_LFLAG(TXBD_WRAP);
                        bdp = next;
diff --git a/drivers/net/ethernet/freescale/gianfar.h b/drivers/net/ethernet/freescale/gianfar.h
index fe7ac3a83194..40c33a7554c0 100644
--- a/drivers/net/ethernet/freescale/gianfar.h
+++ b/drivers/net/ethernet/freescale/gianfar.h
@@ -63,6 +63,9 @@ struct ethtool_rx_list {
 /* Length for FCB */
 #define GMAC_FCB_LEN 8
+/* Length for TxPAL */
+#define GMAC_TXPAL_LEN 16
 /* Default padding amount */
 #define DEFAULT_PADDING 2
diff --git a/drivers/net/ethernet/lantiq_etop.c b/drivers/net/ethernet/lantiq_etop.c
index 0b3567ab8121..85e2c6cd9708 100644
--- a/drivers/net/ethernet/lantiq_etop.c
+++ b/drivers/net/ethernet/lantiq_etop.c
@@ -98,6 +98,7 @@ struct ltq_etop_chan {
 struct ltq_etop_priv {
        struct net_device *netdev;
+        struct platform_device *pdev;
        struct ltq_eth_data *pldata;
        struct resource *res;
@@ -436,7 +437,8 @@ ltq_etop_mdio_init(struct net_device *dev)
        priv->mii_bus->read = ltq_etop_mdio_rd;
        priv->mii_bus->write = ltq_etop_mdio_wr;
        priv->mii_bus->name = "ltq_mii";
-        snprintf(priv->mii_bus->id, MII_BUS_ID_SIZE, "%x", 0);
+        snprintf(priv->mii_bus->id, MII_BUS_ID_SIZE, "%s-%x",
+                priv->pdev->name, priv->pdev->id);
        priv->mii_bus->irq = kmalloc(sizeof(int) * PHY_MAX_ADDR, GFP_KERNEL);
        if (!priv->mii_bus->irq) {
                err = -ENOMEM;
@@ -734,6 +736,7 @@ ltq_etop_probe(struct platform_device *pdev)
        dev->ethtool_ops = &ltq_etop_ethtool_ops;
        priv = netdev_priv(dev);
        priv->res = res;
+        priv->pdev = pdev;
        priv->pldata = dev_get_platdata(&pdev->dev);
        priv->netdev = dev;
        spin_lock_init(&priv->lock);
diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c
index 80aab4e5d695..9c049d2cb97d 100644
--- a/drivers/net/ethernet/marvell/mv643xx_eth.c
+++ b/drivers/net/ethernet/marvell/mv643xx_eth.c
@@ -2613,7 +2613,8 @@ static int mv643xx_eth_shared_probe(struct platform_device *pdev)
                msp->smi_bus->name = "mv643xx_eth smi";
                msp->smi_bus->read = smi_bus_read;
                msp->smi_bus->write = smi_bus_write,
-                snprintf(msp->smi_bus->id, MII_BUS_ID_SIZE, "%d", pdev->id);
+                snprintf(msp->smi_bus->id, MII_BUS_ID_SIZE, "%s-%d",
+                        pdev->name, pdev->id);
                msp->smi_bus->parent = &pdev->dev;
                msp->smi_bus->phy_mask = 0xffffffff;
                if (mdiobus_register(msp->smi_bus) < 0)
diff --git a/drivers/net/ethernet/marvell/pxa168_eth.c b/drivers/net/ethernet/marvell/pxa168_eth.c
index 5ec409e3da09..953ba5851f7b 100644
--- a/drivers/net/ethernet/marvell/pxa168_eth.c
+++ b/drivers/net/ethernet/marvell/pxa168_eth.c
@@ -1552,7 +1552,8 @@ static int pxa168_eth_probe(struct platform_device *pdev)
        pep->smi_bus->name = "pxa168_eth smi";
        pep->smi_bus->read = pxa168_smi_read;
        pep->smi_bus->write = pxa168_smi_write;
-        snprintf(pep->smi_bus->id, MII_BUS_ID_SIZE, "%d", pdev->id);
+        snprintf(pep->smi_bus->id, MII_BUS_ID_SIZE, "%s-%d",
+                pdev->name, pdev->id);
        pep->smi_bus->parent = &pdev->dev;
        pep->smi_bus->phy_mask = 0xffffffff;
        err = mdiobus_register(pep->smi_bus);
diff --git a/drivers/net/ethernet/micrel/ksz884x.c b/drivers/net/ethernet/micrel/ksz884x.c
index 6ed09a85f035..e52cd310ae76 100644
--- a/drivers/net/ethernet/micrel/ksz884x.c
+++ b/drivers/net/ethernet/micrel/ksz884x.c
@@ -746,7 +746,7 @@
 #define MAC_ADDR_ORDER(i)               (ETH_ALEN - 1 - (i))
 #define MAX_ETHERNET_BODY_SIZE          1500
-#define ETHERNET_HEADER_SIZE            14
+#define ETHERNET_HEADER_SIZE            (14 + VLAN_HLEN)
 #define MAX_ETHERNET_PACKET_SIZE        \
        (MAX_ETHERNET_BODY_SIZE + ETHERNET_HEADER_SIZE)
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
index fc9bda9bc36c..6ece4295d78f 100644
--- a/drivers/net/ethernet/renesas/sh_eth.c
+++ b/drivers/net/ethernet/renesas/sh_eth.c
@@ -1702,7 +1702,8 @@ static int sh_mdio_init(struct net_device *ndev, int id,
        /* Hook up MII support for ethtool */
        mdp->mii_bus->name = "sh_mii";
        mdp->mii_bus->parent = &ndev->dev;
-        snprintf(mdp->mii_bus->id, MII_BUS_ID_SIZE, "%x", id);
+        snprintf(mdp->mii_bus->id, MII_BUS_ID_SIZE, "%s-%x",
+                mdp->pdev->name, pdid);
        /* PHY IRQ */
        mdp->mii_bus->irq = kmalloc(sizeof(int)*PHY_MAX_ADDR, GFP_KERNEL);
diff --git a/drivers/net/ethernet/s6gmac.c b/drivers/net/ethernet/s6gmac.c
index a7ff8ea342b4..22e9c0181ce8 100644
--- a/drivers/net/ethernet/s6gmac.c
+++ b/drivers/net/ethernet/s6gmac.c
@@ -1004,7 +1004,7 @@ static int __devinit s6gmac_probe(struct platform_device *pdev)
        mb->write = s6mii_write;
        mb->reset = s6mii_reset;
        mb->priv = pd;
-        snprintf(mb->id, MII_BUS_ID_SIZE, "0");
+        snprintf(mb->id, MII_BUS_ID_SIZE, "%s-%x", pdev->name, pdev->id);
        mb->phy_mask = ~(1 << 0);
        mb->irq = &pd->mii.irq[0];
        for (i = 0; i < PHY_MAX_ADDR; i++) {
diff --git a/drivers/net/ethernet/smsc/smsc911x.c b/drivers/net/ethernet/smsc/smsc911x.c
index 9d0b8ced0234..24d2df068d71 100644
--- a/drivers/net/ethernet/smsc/smsc911x.c
+++ b/drivers/net/ethernet/smsc/smsc911x.c
@@ -1044,7 +1044,8 @@ static int __devinit smsc911x_mii_init(struct platform_device *pdev,
        }
        pdata->mii_bus->name = SMSC_MDIONAME;
-        snprintf(pdata->mii_bus->id, MII_BUS_ID_SIZE, "%x", pdev->id);
+        snprintf(pdata->mii_bus->id, MII_BUS_ID_SIZE, "%s-%x",
+                pdev->name, pdev->id);
        pdata->mii_bus->priv = pdata;
        pdata->mii_bus->read = smsc911x_mii_read;
        pdata->mii_bus->write = smsc911x_mii_write;
diff --git a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
index 41e6b33e1b08..c07cfe989f6e 100644
--- a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
+++ b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
@@ -22,6 +22,7 @@
  Author: Giuseppe Cavallaro <peppe.cavallaro@st.com>
 *******************************************************************************/
+#include <linux/kernel.h>
 #include <linux/io.h>
 #include "mmc.h"
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 3738b4700548..96fa2da30763 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -307,7 +307,7 @@ static int stmmac_init_phy(struct net_device *dev)
        priv->speed = 0;
        priv->oldduplex = -1;
-        snprintf(bus_id, MII_BUS_ID_SIZE, "%x", priv->plat->bus_id);
+        snprintf(bus_id, MII_BUS_ID_SIZE, "stmmac-%x", priv->plat->bus_id);
        snprintf(phy_id, MII_BUS_ID_SIZE + 3, PHY_ID_FMT, bus_id,
                 priv->plat->phy_addr);
        pr_debug("stmmac_init_phy:  trying to attach to %s\n", phy_id);
@@ -772,7 +772,7 @@ static void stmmac_mmc_setup(struct stmmac_priv *priv)
                dwmac_mmc_ctrl(priv->ioaddr, mode);
                memset(&priv->mmc, 0, sizeof(struct stmmac_counters));
        } else
-                pr_info(" No MAC Management Counters available");
+                pr_info(" No MAC Management Counters available\n");
 }
 static u32 stmmac_get_synopsys_id(struct stmmac_priv *priv)
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
index 51f441233962..da4a1042523a 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
@@ -158,7 +158,8 @@ int stmmac_mdio_register(struct net_device *ndev)
        new_bus->read = &stmmac_mdio_read;
        new_bus->write = &stmmac_mdio_write;
        new_bus->reset = &stmmac_mdio_reset;
-        snprintf(new_bus->id, MII_BUS_ID_SIZE, "%x", mdio_bus_data->bus_id);
+        snprintf(new_bus->id, MII_BUS_ID_SIZE, "%s-%x",
+                new_bus->name, mdio_bus_data->bus_id);
        new_bus->priv = ndev;
        new_bus->irq = irqlist;
        new_bus->phy_mask = mdio_bus_data->phy_mask;
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
index 7b1594f4944e..1ac83243649a 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
@@ -62,7 +62,7 @@ static int stmmac_pltfr_probe(struct platform_device *pdev)
        priv = stmmac_dvr_probe(&(pdev->dev), plat_dat);
        if (!priv) {
                pr_err("%s: main drivr probe failed", __func__);
-                goto out_release_region;
+                goto out_unmap;
        }
        priv->ioaddr = addr;
diff --git a/drivers/net/ethernet/ti/cpmac.c b/drivers/net/ethernet/ti/cpmac.c
index aaac0c7ad111..4d9a28ffd3c3 100644
--- a/drivers/net/ethernet/ti/cpmac.c
+++ b/drivers/net/ethernet/ti/cpmac.c
@@ -1269,7 +1269,7 @@ int __devinit cpmac_init(void)
        }
        cpmac_mii->phy_mask = ~(mask | 0x80000000);
-        snprintf(cpmac_mii->id, MII_BUS_ID_SIZE, "1");
+        snprintf(cpmac_mii->id, MII_BUS_ID_SIZE, "cpmac-1");
        res = mdiobus_register(cpmac_mii);
        if (res)
diff --git a/drivers/net/ethernet/ti/davinci_mdio.c b/drivers/net/ethernet/ti/davinci_mdio.c
index 7615040df756..ef7c9c17bfff 100644
--- a/drivers/net/ethernet/ti/davinci_mdio.c
+++ b/drivers/net/ethernet/ti/davinci_mdio.c
@@ -313,7 +313,8 @@ static int __devinit davinci_mdio_probe(struct platform_device *pdev)
        data->bus->reset        = davinci_mdio_reset,
        data->bus->parent       = dev;
        data->bus->priv         = data;
-        snprintf(data->bus->id, MII_BUS_ID_SIZE, "%x", pdev->id);
+        snprintf(data->bus->id, MII_BUS_ID_SIZE, "%s-%x",
+                pdev->name, pdev->id);
        data->clk = clk_get(dev, NULL);
        if (IS_ERR(data->clk)) {
diff --git a/drivers/net/ethernet/tundra/tsi108_eth.c b/drivers/net/ethernet/tundra/tsi108_eth.c
index a9ce01bafd20..164fb775d7b3 100644
--- a/drivers/net/ethernet/tundra/tsi108_eth.c
+++ b/drivers/net/ethernet/tundra/tsi108_eth.c
@@ -1604,7 +1604,7 @@ tsi108_init_one(struct platform_device *pdev)
        data->phyregs = ioremap(einfo->phyregs, 0x400);
        if (NULL == data->phyregs) {
                err = -ENOMEM;
-                goto regs_fail;
+                goto phyregs_fail;
        }
 /* MII setup */
        data->mii_if.dev = dev;
@@ -1663,9 +1663,11 @@ tsi108_init_one(struct platform_device *pdev)
        return 0;
 register_fail:
-        iounmap(data->regs);
        iounmap(data->phyregs);
+phyregs_fail:
+        iounmap(data->regs);
 regs_fail:
        free_netdev(dev);
        return err;
diff --git a/drivers/net/ethernet/via/via-rhine.c b/drivers/net/ethernet/via/via-rhine.c
index 5c4983b2870a..10b18eb63d25 100644
--- a/drivers/net/ethernet/via/via-rhine.c
+++ b/drivers/net/ethernet/via/via-rhine.c
@@ -39,10 +39,9 @@
 /* A few user-configurable values.
   These may be modified when a driver module is loaded. */
+static int debug = 0;
-#define DEBUG
+#define RHINE_MSG_DEFAULT \
-static int debug = 1;   /* 1 normal messages, 0 quiet .. 7 verbose. */
+        (0x0000)
-static int max_interrupt_work = 20;
 /* Set the copy breakpoint for the copy-only-tiny-frames scheme.
   Setting to > 1518 effectively disables this feature. */
@@ -128,12 +127,10 @@ MODULE_AUTHOR("Donald Becker <becker@scyld.com>");
 MODULE_DESCRIPTION("VIA Rhine PCI Fast Ethernet driver");
 MODULE_LICENSE("GPL");
-module_param(max_interrupt_work, int, 0);
 module_param(debug, int, 0);
 module_param(rx_copybreak, int, 0);
 module_param(avoid_D3, bool, 0);
-MODULE_PARM_DESC(max_interrupt_work, "VIA Rhine maximum events handled per interrupt");
+MODULE_PARM_DESC(debug, "VIA Rhine debug message flags");
-MODULE_PARM_DESC(debug, "VIA Rhine debug level (0-7)");
 MODULE_PARM_DESC(rx_copybreak, "VIA Rhine copy breakpoint for copy-only-tiny-frames");
 MODULE_PARM_DESC(avoid_D3, "Avoid power state D3 (work-around for broken BIOSes)");
@@ -351,16 +348,25 @@ static const int mmio_verify_registers[] = {
 /* Bits in the interrupt status/mask registers. */
 enum intr_status_bits {
-        IntrRxDone=0x0001, IntrRxErr=0x0004, IntrRxEmpty=0x0020,
+        IntrRxDone      = 0x0001,
-        IntrTxDone=0x0002, IntrTxError=0x0008, IntrTxUnderrun=0x0210,
+        IntrTxDone      = 0x0002,
-        IntrPCIErr=0x0040,
+        IntrRxErr       = 0x0004,
-        IntrStatsMax=0x0080, IntrRxEarly=0x0100,
+        IntrTxError     = 0x0008,
-        IntrRxOverflow=0x0400, IntrRxDropped=0x0800, IntrRxNoBuf=0x1000,
+        IntrRxEmpty     = 0x0020,
-        IntrTxAborted=0x2000, IntrLinkChange=0x4000,
+        IntrPCIErr      = 0x0040,
-        IntrRxWakeUp=0x8000,
+        IntrStatsMax    = 0x0080,
-        IntrNormalSummary=0x0003, IntrAbnormalSummary=0xC260,
+        IntrRxEarly     = 0x0100,
-        IntrTxDescRace=0x080000,        /* mapped from IntrStatus2 */
+        IntrTxUnderrun  = 0x0210,
-        IntrTxErrSummary=0x082218,
+        IntrRxOverflow  = 0x0400,
+        IntrRxDropped   = 0x0800,
+        IntrRxNoBuf     = 0x1000,
+        IntrTxAborted   = 0x2000,
+        IntrLinkChange  = 0x4000,
+        IntrRxWakeUp    = 0x8000,
+        IntrTxDescRace          = 0x080000,     /* mapped from IntrStatus2 */
+        IntrNormalSummary       = IntrRxDone | IntrTxDone,
+        IntrTxErrSummary        = IntrTxDescRace | IntrTxAborted | IntrTxError |
+                                  IntrTxUnderrun,
 };
 /* Bits in WOLcrSet/WOLcrClr and PwrcsrSet/PwrcsrClr */
@@ -439,8 +445,13 @@ struct rhine_private {
        struct net_device *dev;
        struct napi_struct napi;
        spinlock_t lock;
+        struct mutex task_lock;
+        bool task_enable;
+        struct work_struct slow_event_task;
        struct work_struct reset_task;
+        u32 msg_enable;
        /* Frequently used values: keep some adjacent for cache effect. */
        u32 quirks;
        struct rx_desc *rx_head_desc;
@@ -476,41 +487,50 @@ static int  mdio_read(struct net_device *dev, int phy_id, int location);
 static void mdio_write(struct net_device *dev, int phy_id, int location, int value);
 static int  rhine_open(struct net_device *dev);
 static void rhine_reset_task(struct work_struct *work);
+static void rhine_slow_event_task(struct work_struct *work);
 static void rhine_tx_timeout(struct net_device *dev);
 static netdev_tx_t rhine_start_tx(struct sk_buff *skb,
                                  struct net_device *dev);
 static irqreturn_t rhine_interrupt(int irq, void *dev_instance);
 static void rhine_tx(struct net_device *dev);
 static int rhine_rx(struct net_device *dev, int limit);
-static void rhine_error(struct net_device *dev, int intr_status);
 static void rhine_set_rx_mode(struct net_device *dev);
 static struct net_device_stats *rhine_get_stats(struct net_device *dev);
 static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
 static const struct ethtool_ops netdev_ethtool_ops;
 static int  rhine_close(struct net_device *dev);
-static void rhine_shutdown (struct pci_dev *pdev);
 static int rhine_vlan_rx_add_vid(struct net_device *dev, unsigned short vid);
 static int rhine_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid);
-static void rhine_set_cam(void __iomem *ioaddr, int idx, u8 *addr);
+static void rhine_restart_tx(struct net_device *dev);
-static void rhine_set_vlan_cam(void __iomem *ioaddr, int idx, u8 *addr);
-static void rhine_set_cam_mask(void __iomem *ioaddr, u32 mask);
+static void rhine_wait_bit(struct rhine_private *rp, u8 reg, u8 mask, bool high)
-static void rhine_set_vlan_cam_mask(void __iomem *ioaddr, u32 mask);
+{
-static void rhine_init_cam_filter(struct net_device *dev);
+        void __iomem *ioaddr = rp->base;
-static void rhine_update_vcam(struct net_device *dev);
+        int i;
-#define RHINE_WAIT_FOR(condition)                               \
+        for (i = 0; i < 1024; i++) {
-do {                                                            \
+                if (high ^ !!(ioread8(ioaddr + reg) & mask))
-        int i = 1024;                                           \
+                        break;
-        while (!(condition) && --i)                             \
+                udelay(10);
-                ;                                               \
+        }
-        if (debug > 1 && i < 512)                               \
+        if (i > 64) {
-                pr_info("%4d cycles used @ %s:%d\n",            \
+                netif_dbg(rp, hw, rp->dev, "%s bit wait (%02x/%02x) cycle "
-                        1024 - i, __func__, __LINE__);          \
+                          "count: %04d\n", high ? "high" : "low", reg, mask, i);
-} while (0)
+        }
+}
-static inline u32 get_intr_status(struct net_device *dev)
+static void rhine_wait_bit_high(struct rhine_private *rp, u8 reg, u8 mask)
+{
+        rhine_wait_bit(rp, reg, mask, true);
+}
+static void rhine_wait_bit_low(struct rhine_private *rp, u8 reg, u8 mask)
+{
+        rhine_wait_bit(rp, reg, mask, false);
+}
+static u32 rhine_get_events(struct rhine_private *rp)
 {
-        struct rhine_private *rp = netdev_priv(dev);
        void __iomem *ioaddr = rp->base;
        u32 intr_status;
@@ -521,6 +541,16 @@ static inline u32 get_intr_status(struct net_device *dev)
        return intr_status;
 }
+static void rhine_ack_events(struct rhine_private *rp, u32 mask)
+{
+        void __iomem *ioaddr = rp->base;
+        if (rp->quirks & rqStatusWBRace)
+                iowrite8(mask >> 16, ioaddr + IntrStatus2);
+        iowrite16(mask, ioaddr + IntrStatus);
+        mmiowb();
+}
 /*
 * Get power related registers into sane state.
 * Notify user about past WOL event.
@@ -585,6 +615,7 @@ static void rhine_chip_reset(struct net_device *dev)
 {
        struct rhine_private *rp = netdev_priv(dev);
        void __iomem *ioaddr = rp->base;
+        u8 cmd1;
        iowrite8(Cmd1Reset, ioaddr + ChipCmd1);
        IOSYNC;
@@ -597,13 +628,12 @@ static void rhine_chip_reset(struct net_device *dev)
                        iowrite8(0x40, ioaddr + MiscCmd);
                /* Reset can take somewhat longer (rare) */
-                RHINE_WAIT_FOR(!(ioread8(ioaddr + ChipCmd1) & Cmd1Reset));
+                rhine_wait_bit_low(rp, ChipCmd1, Cmd1Reset);
        }
-        if (debug > 1)
+        cmd1 = ioread8(ioaddr + ChipCmd1);
-                netdev_info(dev, "Reset %s\n",
+        netif_info(rp, hw, dev, "Reset %s\n", (cmd1 & Cmd1Reset) ?
-                            (ioread8(ioaddr + ChipCmd1) & Cmd1Reset) ?
+                   "failed" : "succeeded");
-                            "failed" : "succeeded");
 }
 #ifdef USE_MMIO
@@ -629,9 +659,15 @@ static void __devinit rhine_reload_eeprom(long pioaddr, struct net_device *dev)
 {
        struct rhine_private *rp = netdev_priv(dev);
        void __iomem *ioaddr = rp->base;
+        int i;
        outb(0x20, pioaddr + MACRegEEcsr);
-        RHINE_WAIT_FOR(!(inb(pioaddr + MACRegEEcsr) & 0x20));
+        for (i = 0; i < 1024; i++) {
+                if (!(inb(pioaddr + MACRegEEcsr) & 0x20))
+                        break;
+        }
+        if (i > 512)
+                pr_info("%4d cycles used @ %s:%d\n", i, __func__, __LINE__);
 #ifdef USE_MMIO
        /*
@@ -657,23 +693,127 @@ static void rhine_poll(struct net_device *dev)
 }
 #endif
+static void rhine_kick_tx_threshold(struct rhine_private *rp)
+{
+        if (rp->tx_thresh < 0xe0) {
+                void __iomem *ioaddr = rp->base;
+                rp->tx_thresh += 0x20;
+                BYTE_REG_BITS_SET(rp->tx_thresh, 0x80, ioaddr + TxConfig);
+        }
+}
+static void rhine_tx_err(struct rhine_private *rp, u32 status)
+{
+        struct net_device *dev = rp->dev;
+        if (status & IntrTxAborted) {
+                netif_info(rp, tx_err, dev,
+                           "Abort %08x, frame dropped\n", status);
+        }
+        if (status & IntrTxUnderrun) {
+                rhine_kick_tx_threshold(rp);
+                netif_info(rp, tx_err ,dev, "Transmitter underrun, "
+                           "Tx threshold now %02x\n", rp->tx_thresh);
+        }
+        if (status & IntrTxDescRace)
+                netif_info(rp, tx_err, dev, "Tx descriptor write-back race\n");
+        if ((status & IntrTxError) &&
+            (status & (IntrTxAborted | IntrTxUnderrun | IntrTxDescRace)) == 0) {
+                rhine_kick_tx_threshold(rp);
+                netif_info(rp, tx_err, dev, "Unspecified error. "
+                           "Tx threshold now %02x\n", rp->tx_thresh);
+        }
+        rhine_restart_tx(dev);
+}
+static void rhine_update_rx_crc_and_missed_errord(struct rhine_private *rp)
+{
+        void __iomem *ioaddr = rp->base;
+        struct net_device_stats *stats = &rp->dev->stats;
+        stats->rx_crc_errors    += ioread16(ioaddr + RxCRCErrs);
+        stats->rx_missed_errors += ioread16(ioaddr + RxMissed);
+        /*
+         * Clears the "tally counters" for CRC errors and missed frames(?).
+         * It has been reported that some chips need a write of 0 to clear
+         * these, for others the counters are set to 1 when written to and
+         * instead cleared when read. So we clear them both ways ...
+         */
+        iowrite32(0, ioaddr + RxMissed);
+        ioread16(ioaddr + RxCRCErrs);
+        ioread16(ioaddr + RxMissed);
+}
+#define RHINE_EVENT_NAPI_RX     (IntrRxDone | \
+                                 IntrRxErr | \
+                                 IntrRxEmpty | \
+                                 IntrRxOverflow | \
+                                 IntrRxDropped | \
+                                 IntrRxNoBuf | \
+                                 IntrRxWakeUp)
+#define RHINE_EVENT_NAPI_TX_ERR (IntrTxError | \
+                                 IntrTxAborted | \
+                                 IntrTxUnderrun | \
+                                 IntrTxDescRace)
+#define RHINE_EVENT_NAPI_TX     (IntrTxDone | RHINE_EVENT_NAPI_TX_ERR)
+#define RHINE_EVENT_NAPI        (RHINE_EVENT_NAPI_RX | \
+                                 RHINE_EVENT_NAPI_TX | \
+                                 IntrStatsMax)
+#define RHINE_EVENT_SLOW        (IntrPCIErr | IntrLinkChange)
+#define RHINE_EVENT             (RHINE_EVENT_NAPI | RHINE_EVENT_SLOW)
 static int rhine_napipoll(struct napi_struct *napi, int budget)
 {
        struct rhine_private *rp = container_of(napi, struct rhine_private, napi);
        struct net_device *dev = rp->dev;
        void __iomem *ioaddr = rp->base;
-        int work_done;
+        u16 enable_mask = RHINE_EVENT & 0xffff;
+        int work_done = 0;
+        u32 status;
+        status = rhine_get_events(rp);
+        rhine_ack_events(rp, status & ~RHINE_EVENT_SLOW);
+        if (status & RHINE_EVENT_NAPI_RX)
+                work_done += rhine_rx(dev, budget);
+        if (status & RHINE_EVENT_NAPI_TX) {
+                if (status & RHINE_EVENT_NAPI_TX_ERR) {
+                        /* Avoid scavenging before Tx engine turned off */
+                        rhine_wait_bit_low(rp, ChipCmd, CmdTxOn);
+                        if (ioread8(ioaddr + ChipCmd) & CmdTxOn)
+                                netif_warn(rp, tx_err, dev, "Tx still on\n");
+                }
-        work_done = rhine_rx(dev, budget);
+                rhine_tx(dev);
+                if (status & RHINE_EVENT_NAPI_TX_ERR)
+                        rhine_tx_err(rp, status);
+        }
+        if (status & IntrStatsMax) {
+                spin_lock(&rp->lock);
+                rhine_update_rx_crc_and_missed_errord(rp);
+                spin_unlock(&rp->lock);
+        }
+        if (status & RHINE_EVENT_SLOW) {
+                enable_mask &= ~RHINE_EVENT_SLOW;
+                schedule_work(&rp->slow_event_task);
+        }
        if (work_done < budget) {
                napi_complete(napi);
+                iowrite16(enable_mask, ioaddr + IntrEnable);
-                iowrite16(IntrRxDone | IntrRxErr | IntrRxEmpty| IntrRxOverflow |
+                mmiowb();
-                          IntrRxDropped | IntrRxNoBuf | IntrTxAborted |
-                          IntrTxDone | IntrTxError | IntrTxUnderrun |
-                          IntrPCIErr | IntrStatsMax | IntrLinkChange,
-                          ioaddr + IntrEnable);
        }
        return work_done;
 }
@@ -797,6 +937,7 @@ static int __devinit rhine_init_one(struct pci_dev *pdev,
        rp->quirks = quirks;
        rp->pioaddr = pioaddr;
        rp->pdev = pdev;
+        rp->msg_enable = netif_msg_init(debug, RHINE_MSG_DEFAULT);
        rc = pci_request_regions(pdev, DRV_NAME);
        if (rc)
@@ -856,7 +997,9 @@ static int __devinit rhine_init_one(struct pci_dev *pdev,
        dev->irq = pdev->irq;
        spin_lock_init(&rp->lock);
+        mutex_init(&rp->task_lock);
        INIT_WORK(&rp->reset_task, rhine_reset_task);
+        INIT_WORK(&rp->slow_event_task, rhine_slow_event_task);
        rp->mii_if.dev = dev;
        rp->mii_if.mdio_read = mdio_read;
@@ -916,8 +1059,8 @@ static int __devinit rhine_init_one(struct pci_dev *pdev,
                }
        }
        rp->mii_if.phy_id = phy_id;
-        if (debug > 1 && avoid_D3)
+        if (avoid_D3)
-                netdev_info(dev, "No D3 power state at shutdown\n");
+                netif_info(rp, probe, dev, "No D3 power state at shutdown\n");
        return 0;
@@ -1093,7 +1236,7 @@ static void rhine_check_media(struct net_device *dev, unsigned int init_media)
        struct rhine_private *rp = netdev_priv(dev);
        void __iomem *ioaddr = rp->base;
-        mii_check_media(&rp->mii_if, debug, init_media);
+        mii_check_media(&rp->mii_if, netif_msg_link(rp), init_media);
        if (rp->mii_if.full_duplex)
            iowrite8(ioread8(ioaddr + ChipCmd1) | Cmd1FDuplex,
@@ -1101,24 +1244,26 @@ static void rhine_check_media(struct net_device *dev, unsigned int init_media)
        else
            iowrite8(ioread8(ioaddr + ChipCmd1) & ~Cmd1FDuplex,
                   ioaddr + ChipCmd1);
-        if (debug > 1)
-                netdev_info(dev, "force_media %d, carrier %d\n",
+        netif_info(rp, link, dev, "force_media %d, carrier %d\n",
-                            rp->mii_if.force_media, netif_carrier_ok(dev));
+                   rp->mii_if.force_media, netif_carrier_ok(dev));
 }
 /* Called after status of force_media possibly changed */
 static void rhine_set_carrier(struct mii_if_info *mii)
 {
+        struct net_device *dev = mii->dev;
+        struct rhine_private *rp = netdev_priv(dev);
        if (mii->force_media) {
                /* autoneg is off: Link is always assumed to be up */
-                if (!netif_carrier_ok(mii->dev))
+                if (!netif_carrier_ok(dev))
-                        netif_carrier_on(mii->dev);
+                        netif_carrier_on(dev);
-        }
+        } else  /* Let MMI library update carrier status */
-        else    /* Let MMI library update carrier status */
+                rhine_check_media(dev, 0);
-                rhine_check_media(mii->dev, 0);
-        if (debug > 1)
+        netif_info(rp, link, dev, "force_media %d, carrier %d\n",
-                netdev_info(mii->dev, "force_media %d, carrier %d\n",
+                   mii->force_media, netif_carrier_ok(dev));
-                            mii->force_media, netif_carrier_ok(mii->dev));
 }
 /**
@@ -1266,10 +1411,10 @@ static int rhine_vlan_rx_add_vid(struct net_device *dev, unsigned short vid)
 {
        struct rhine_private *rp = netdev_priv(dev);
-        spin_lock_irq(&rp->lock);
+        spin_lock_bh(&rp->lock);
        set_bit(vid, rp->active_vlans);
        rhine_update_vcam(dev);
-        spin_unlock_irq(&rp->lock);
+        spin_unlock_bh(&rp->lock);
        return 0;
 }
@@ -1277,10 +1422,10 @@ static int rhine_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)
 {
        struct rhine_private *rp = netdev_priv(dev);
-        spin_lock_irq(&rp->lock);
+        spin_lock_bh(&rp->lock);
        clear_bit(vid, rp->active_vlans);
        rhine_update_vcam(dev);
-        spin_unlock_irq(&rp->lock);
+        spin_unlock_bh(&rp->lock);
        return 0;
 }
@@ -1310,12 +1455,7 @@ static void init_registers(struct net_device *dev)
        napi_enable(&rp->napi);
-        /* Enable interrupts by setting the interrupt mask. */
+        iowrite16(RHINE_EVENT & 0xffff, ioaddr + IntrEnable);
-        iowrite16(IntrRxDone | IntrRxErr | IntrRxEmpty| IntrRxOverflow |
-               IntrRxDropped | IntrRxNoBuf | IntrTxAborted |
-               IntrTxDone | IntrTxError | IntrTxUnderrun |
-               IntrPCIErr | IntrStatsMax | IntrLinkChange,
-               ioaddr + IntrEnable);
        iowrite16(CmdStart | CmdTxOn | CmdRxOn | (Cmd1NoTxPoll << 8),
               ioaddr + ChipCmd);
@@ -1323,23 +1463,27 @@ static void init_registers(struct net_device *dev)
 }
 /* Enable MII link status auto-polling (required for IntrLinkChange) */
-static void rhine_enable_linkmon(void __iomem *ioaddr)
+static void rhine_enable_linkmon(struct rhine_private *rp)
 {
+        void __iomem *ioaddr = rp->base;
        iowrite8(0, ioaddr + MIICmd);
        iowrite8(MII_BMSR, ioaddr + MIIRegAddr);
        iowrite8(0x80, ioaddr + MIICmd);
-        RHINE_WAIT_FOR((ioread8(ioaddr + MIIRegAddr) & 0x20));
+        rhine_wait_bit_high(rp, MIIRegAddr, 0x20);
        iowrite8(MII_BMSR | 0x40, ioaddr + MIIRegAddr);
 }
 /* Disable MII link status auto-polling (required for MDIO access) */
-static void rhine_disable_linkmon(void __iomem *ioaddr, u32 quirks)
+static void rhine_disable_linkmon(struct rhine_private *rp)
 {
+        void __iomem *ioaddr = rp->base;
        iowrite8(0, ioaddr + MIICmd);
-        if (quirks & rqRhineI) {
+        if (rp->quirks & rqRhineI) {
                iowrite8(0x01, ioaddr + MIIRegAddr);    // MII_BMSR
                /* Can be called from ISR. Evil. */
@@ -1348,13 +1492,13 @@ static void rhine_disable_linkmon(void __iomem *ioaddr, u32 quirks)
                /* 0x80 must be set immediately before turning it off */
                iowrite8(0x80, ioaddr + MIICmd);
-                RHINE_WAIT_FOR(ioread8(ioaddr + MIIRegAddr) & 0x20);
+                rhine_wait_bit_high(rp, MIIRegAddr, 0x20);
                /* Heh. Now clear 0x80 again. */
                iowrite8(0, ioaddr + MIICmd);
        }
        else
-                RHINE_WAIT_FOR(ioread8(ioaddr + MIIRegAddr) & 0x80);
+                rhine_wait_bit_high(rp, MIIRegAddr, 0x80);
 }
 /* Read and write over the MII Management Data I/O (MDIO) interface. */
@@ -1365,16 +1509,16 @@ static int mdio_read(struct net_device *dev, int phy_id, int regnum)
        void __iomem *ioaddr = rp->base;
        int result;
-        rhine_disable_linkmon(ioaddr, rp->quirks);
+        rhine_disable_linkmon(rp);
        /* rhine_disable_linkmon already cleared MIICmd */
        iowrite8(phy_id, ioaddr + MIIPhyAddr);
        iowrite8(regnum, ioaddr + MIIRegAddr);
        iowrite8(0x40, ioaddr + MIICmd);                /* Trigger read */
-        RHINE_WAIT_FOR(!(ioread8(ioaddr + MIICmd) & 0x40));
+        rhine_wait_bit_low(rp, MIICmd, 0x40);
        result = ioread16(ioaddr + MIIData);
-        rhine_enable_linkmon(ioaddr);
+        rhine_enable_linkmon(rp);
        return result;
 }
@@ -1383,16 +1527,33 @@ static void mdio_write(struct net_device *dev, int phy_id, int regnum, int value
        struct rhine_private *rp = netdev_priv(dev);
        void __iomem *ioaddr = rp->base;
-        rhine_disable_linkmon(ioaddr, rp->quirks);
+        rhine_disable_linkmon(rp);
        /* rhine_disable_linkmon already cleared MIICmd */
        iowrite8(phy_id, ioaddr + MIIPhyAddr);
        iowrite8(regnum, ioaddr + MIIRegAddr);
        iowrite16(value, ioaddr + MIIData);
        iowrite8(0x20, ioaddr + MIICmd);                /* Trigger write */
-        RHINE_WAIT_FOR(!(ioread8(ioaddr + MIICmd) & 0x20));
+        rhine_wait_bit_low(rp, MIICmd, 0x20);
-        rhine_enable_linkmon(ioaddr);
+        rhine_enable_linkmon(rp);
+}
+static void rhine_task_disable(struct rhine_private *rp)
+{
+        mutex_lock(&rp->task_lock);
+        rp->task_enable = false;
+        mutex_unlock(&rp->task_lock);
+        cancel_work_sync(&rp->slow_event_task);
+        cancel_work_sync(&rp->reset_task);
+}
+static void rhine_task_enable(struct rhine_private *rp)
+{
+        mutex_lock(&rp->task_lock);
+        rp->task_enable = true;
+        mutex_unlock(&rp->task_lock);
 }
 static int rhine_open(struct net_device *dev)
@@ -1406,8 +1567,7 @@ static int rhine_open(struct net_device *dev)
        if (rc)
                return rc;
-        if (debug > 1)
+        netif_dbg(rp, ifup, dev, "%s() irq %d\n", __func__, rp->pdev->irq);
-                netdev_dbg(dev, "%s() irq %d\n", __func__, rp->pdev->irq);
        rc = alloc_ring(dev);
        if (rc) {
@@ -1417,11 +1577,12 @@ static int rhine_open(struct net_device *dev)
        alloc_rbufs(dev);
        alloc_tbufs(dev);
        rhine_chip_reset(dev);
+        rhine_task_enable(rp);
        init_registers(dev);
-        if (debug > 2)
-                netdev_dbg(dev, "%s() Done - status %04x MII status: %04x\n",
+        netif_dbg(rp, ifup, dev, "%s() Done - status %04x MII status: %04x\n",
-                           __func__, ioread16(ioaddr + ChipCmd),
+                  __func__, ioread16(ioaddr + ChipCmd),
-                           mdio_read(dev, rp->mii_if.phy_id, MII_BMSR));
+                  mdio_read(dev, rp->mii_if.phy_id, MII_BMSR));
        netif_start_queue(dev);
@@ -1434,11 +1595,12 @@ static void rhine_reset_task(struct work_struct *work)
                                                reset_task);
        struct net_device *dev = rp->dev;
-        /* protect against concurrent rx interrupts */
+        mutex_lock(&rp->task_lock);
-        disable_irq(rp->pdev->irq);
-        napi_disable(&rp->napi);
+        if (!rp->task_enable)
+                goto out_unlock;
+        napi_disable(&rp->napi);
        spin_lock_bh(&rp->lock);
        /* clear all descriptors */
@@ -1452,11 +1614,13 @@ static void rhine_reset_task(struct work_struct *work)
        init_registers(dev);
        spin_unlock_bh(&rp->lock);
-        enable_irq(rp->pdev->irq);
        dev->trans_start = jiffies; /* prevent tx timeout */
        dev->stats.tx_errors++;
        netif_wake_queue(dev);
+out_unlock:
+        mutex_unlock(&rp->task_lock);
 }
 static void rhine_tx_timeout(struct net_device *dev)
@@ -1477,7 +1641,6 @@ static netdev_tx_t rhine_start_tx(struct sk_buff *skb,
        struct rhine_private *rp = netdev_priv(dev);
        void __iomem *ioaddr = rp->base;
        unsigned entry;
-        unsigned long flags;
        /* Caution: the write order is important here, set the field
           with the "ownership" bits last. */
@@ -1529,7 +1692,6 @@ static netdev_tx_t rhine_start_tx(struct sk_buff *skb,
                rp->tx_ring[entry].tx_status = 0;
        /* lock eth irq */
-        spin_lock_irqsave(&rp->lock, flags);
        wmb();
        rp->tx_ring[entry].tx_status |= cpu_to_le32(DescOwn);
        wmb();
@@ -1550,78 +1712,43 @@ static netdev_tx_t rhine_start_tx(struct sk_buff *skb,
        if (rp->cur_tx == rp->dirty_tx + TX_QUEUE_LEN)
                netif_stop_queue(dev);
-        spin_unlock_irqrestore(&rp->lock, flags);
+        netif_dbg(rp, tx_queued, dev, "Transmit frame #%d queued in slot %d\n",
+                  rp->cur_tx - 1, entry);
-        if (debug > 4) {
-                netdev_dbg(dev, "Transmit frame #%d queued in slot %d\n",
-                           rp->cur_tx-1, entry);
-        }
        return NETDEV_TX_OK;
 }
+static void rhine_irq_disable(struct rhine_private *rp)
+{
+        iowrite16(0x0000, rp->base + IntrEnable);
+        mmiowb();
+}
 /* The interrupt handler does all of the Rx thread work and cleans up
   after the Tx thread. */
 static irqreturn_t rhine_interrupt(int irq, void *dev_instance)
 {
        struct net_device *dev = dev_instance;
        struct rhine_private *rp = netdev_priv(dev);
-        void __iomem *ioaddr = rp->base;
+        u32 status;
-        u32 intr_status;
-        int boguscnt = max_interrupt_work;
        int handled = 0;
-        while ((intr_status = get_intr_status(dev))) {
+        status = rhine_get_events(rp);
-                handled = 1;
-                /* Acknowledge all of the current interrupt sources ASAP. */
-                if (intr_status & IntrTxDescRace)
-                        iowrite8(0x08, ioaddr + IntrStatus2);
-                iowrite16(intr_status & 0xffff, ioaddr + IntrStatus);
-                IOSYNC;
-                if (debug > 4)
+        netif_dbg(rp, intr, dev, "Interrupt, status %08x\n", status);
-                        netdev_dbg(dev, "Interrupt, status %08x\n",
-                                   intr_status);
-                if (intr_status & (IntrRxDone | IntrRxErr | IntrRxDropped |
-                                   IntrRxWakeUp | IntrRxEmpty | IntrRxNoBuf)) {
-                        iowrite16(IntrTxAborted |
-                                  IntrTxDone | IntrTxError | IntrTxUnderrun |
-                                  IntrPCIErr | IntrStatsMax | IntrLinkChange,
-                                  ioaddr + IntrEnable);
-                        napi_schedule(&rp->napi);
-                }
-                if (intr_status & (IntrTxErrSummary | IntrTxDone)) {
+        if (status & RHINE_EVENT) {
-                        if (intr_status & IntrTxErrSummary) {
+                handled = 1;
-                                /* Avoid scavenging before Tx engine turned off */
-                                RHINE_WAIT_FOR(!(ioread8(ioaddr+ChipCmd) & CmdTxOn));
-                                if (debug > 2 &&
-                                    ioread8(ioaddr+ChipCmd) & CmdTxOn)
-                                        netdev_warn(dev,
-                                                    "%s: Tx engine still on\n",
-                                                    __func__);
-                        }
-                        rhine_tx(dev);
-                }
-                /* Abnormal error summary/uncommon events handlers. */
+                rhine_irq_disable(rp);
-                if (intr_status & (IntrPCIErr | IntrLinkChange |
+                napi_schedule(&rp->napi);
-                                   IntrStatsMax | IntrTxError | IntrTxAborted |
+        }
-                                   IntrTxUnderrun | IntrTxDescRace))
-                        rhine_error(dev, intr_status);
-                if (--boguscnt < 0) {
+        if (status & ~(IntrLinkChange | IntrStatsMax | RHINE_EVENT_NAPI)) {
-                        netdev_warn(dev, "Too much work at interrupt, status=%#08x\n",
+                netif_err(rp, intr, dev, "Something Wicked happened! %08x\n",
-                                    intr_status);
+                          status);
-                        break;
-                }
        }
-        if (debug > 3)
-                netdev_dbg(dev, "exiting interrupt, status=%08x\n",
-                           ioread16(ioaddr + IntrStatus));
        return IRQ_RETVAL(handled);
 }
@@ -1632,20 +1759,16 @@ static void rhine_tx(struct net_device *dev)
        struct rhine_private *rp = netdev_priv(dev);
        int txstatus = 0, entry = rp->dirty_tx % TX_RING_SIZE;
-        spin_lock(&rp->lock);
        /* find and cleanup dirty tx descriptors */
        while (rp->dirty_tx != rp->cur_tx) {
                txstatus = le32_to_cpu(rp->tx_ring[entry].tx_status);
-                if (debug > 6)
+                netif_dbg(rp, tx_done, dev, "Tx scavenge %d status %08x\n",
-                        netdev_dbg(dev, "Tx scavenge %d status %08x\n",
+                          entry, txstatus);
-                                   entry, txstatus);
                if (txstatus & DescOwn)
                        break;
                if (txstatus & 0x8000) {
-                        if (debug > 1)
+                        netif_dbg(rp, tx_done, dev,
-                                netdev_dbg(dev, "Transmit error, Tx status %08x\n",
+                                  "Transmit error, Tx status %08x\n", txstatus);
-                                           txstatus);
                        dev->stats.tx_errors++;
                        if (txstatus & 0x0400)
                                dev->stats.tx_carrier_errors++;
@@ -1667,10 +1790,8 @@ static void rhine_tx(struct net_device *dev)
                                dev->stats.collisions += (txstatus >> 3) & 0x0F;
                        else
                                dev->stats.collisions += txstatus & 0x0F;
-                        if (debug > 6)
+                        netif_dbg(rp, tx_done, dev, "collisions: %1.1x:%1.1x\n",
-                                netdev_dbg(dev, "collisions: %1.1x:%1.1x\n",
+                                  (txstatus >> 3) & 0xF, txstatus & 0xF);
-                                           (txstatus >> 3) & 0xF,
-                                           txstatus & 0xF);
                        dev->stats.tx_bytes += rp->tx_skbuff[entry]->len;
                        dev->stats.tx_packets++;
                }
@@ -1687,8 +1808,6 @@ static void rhine_tx(struct net_device *dev)
        }
        if ((rp->cur_tx - rp->dirty_tx) < TX_QUEUE_LEN - 4)
                netif_wake_queue(dev);
-        spin_unlock(&rp->lock);
 }
 /**
@@ -1713,11 +1832,8 @@ static int rhine_rx(struct net_device *dev, int limit)
        int count;
        int entry = rp->cur_rx % RX_RING_SIZE;
-        if (debug > 4) {
+        netif_dbg(rp, rx_status, dev, "%s(), entry %d status %08x\n", __func__,
-                netdev_dbg(dev, "%s(), entry %d status %08x\n",
+                  entry, le32_to_cpu(rp->rx_head_desc->rx_status));
-                           __func__, entry,
-                           le32_to_cpu(rp->rx_head_desc->rx_status));
-        }
        /* If EOP is set on the next entry, it's a new packet. Send it up. */
        for (count = 0; count < limit; ++count) {
@@ -1729,9 +1845,8 @@ static int rhine_rx(struct net_device *dev, int limit)
                if (desc_status & DescOwn)
                        break;
-                if (debug > 4)
+                netif_dbg(rp, rx_status, dev, "%s() status %08x\n", __func__,
-                        netdev_dbg(dev, "%s() status is %08x\n",
+                          desc_status);
-                                   __func__, desc_status);
                if ((desc_status & (RxWholePkt | RxErr)) != RxWholePkt) {
                        if ((desc_status & RxWholePkt) != RxWholePkt) {
@@ -1747,9 +1862,9 @@ static int rhine_rx(struct net_device *dev, int limit)
                                dev->stats.rx_length_errors++;
                        } else if (desc_status & RxErr) {
                                /* There was a error. */
-                                if (debug > 2)
+                                netif_dbg(rp, rx_err, dev,
-                                        netdev_dbg(dev, "%s() Rx error was %08x\n",
+                                          "%s() Rx error %08x\n", __func__,
-                                                   __func__, desc_status);
+                                          desc_status);
                                dev->stats.rx_errors++;
                                if (desc_status & 0x0030)
                                        dev->stats.rx_length_errors++;
@@ -1839,19 +1954,6 @@ static int rhine_rx(struct net_device *dev, int limit)
        return count;
 }
-/*
- * Clears the "tally counters" for CRC errors and missed frames(?).
- * It has been reported that some chips need a write of 0 to clear
- * these, for others the counters are set to 1 when written to and
- * instead cleared when read. So we clear them both ways ...
- */
-static inline void clear_tally_counters(void __iomem *ioaddr)
-{
-        iowrite32(0, ioaddr + RxMissed);
-        ioread16(ioaddr + RxCRCErrs);
-        ioread16(ioaddr + RxMissed);
-}
 static void rhine_restart_tx(struct net_device *dev) {
        struct rhine_private *rp = netdev_priv(dev);
        void __iomem *ioaddr = rp->base;
@@ -1862,7 +1964,7 @@ static void rhine_restart_tx(struct net_device *dev) {
         * If new errors occurred, we need to sort them out before doing Tx.
         * In that case the ISR will be back here RSN anyway.
         */
-        intr_status = get_intr_status(dev);
+        intr_status = rhine_get_events(rp);
        if ((intr_status & IntrTxErrSummary) == 0) {
@@ -1883,79 +1985,50 @@ static void rhine_restart_tx(struct net_device *dev) {
        }
        else {
                /* This should never happen */
-                if (debug > 1)
+                netif_warn(rp, tx_err, dev, "another error occurred %08x\n",
-                        netdev_warn(dev, "%s() Another error occurred %08x\n",
+                           intr_status);
-                                   __func__, intr_status);
        }
 }
-static void rhine_error(struct net_device *dev, int intr_status)
+static void rhine_slow_event_task(struct work_struct *work)
 {
-        struct rhine_private *rp = netdev_priv(dev);
+        struct rhine_private *rp =
-        void __iomem *ioaddr = rp->base;
+                container_of(work, struct rhine_private, slow_event_task);
+        struct net_device *dev = rp->dev;
+        u32 intr_status;
-        spin_lock(&rp->lock);
+        mutex_lock(&rp->task_lock);
+        if (!rp->task_enable)
+                goto out_unlock;
+        intr_status = rhine_get_events(rp);
+        rhine_ack_events(rp, intr_status & RHINE_EVENT_SLOW);
        if (intr_status & IntrLinkChange)
                rhine_check_media(dev, 0);
-        if (intr_status & IntrStatsMax) {
-                dev->stats.rx_crc_errors += ioread16(ioaddr + RxCRCErrs);
-                dev->stats.rx_missed_errors += ioread16(ioaddr + RxMissed);
-                clear_tally_counters(ioaddr);
-        }
-        if (intr_status & IntrTxAborted) {
-                if (debug > 1)
-                        netdev_info(dev, "Abort %08x, frame dropped\n",
-                                    intr_status);
-        }
-        if (intr_status & IntrTxUnderrun) {
-                if (rp->tx_thresh < 0xE0)
-                        BYTE_REG_BITS_SET((rp->tx_thresh += 0x20), 0x80, ioaddr + TxConfig);
-                if (debug > 1)
-                        netdev_info(dev, "Transmitter underrun, Tx threshold now %02x\n",
-                                    rp->tx_thresh);
-        }
-        if (intr_status & IntrTxDescRace) {
-                if (debug > 2)
-                        netdev_info(dev, "Tx descriptor write-back race\n");
-        }
-        if ((intr_status & IntrTxError) &&
-            (intr_status & (IntrTxAborted |
-             IntrTxUnderrun | IntrTxDescRace)) == 0) {
-                if (rp->tx_thresh < 0xE0) {
-                        BYTE_REG_BITS_SET((rp->tx_thresh += 0x20), 0x80, ioaddr + TxConfig);
-                }
-                if (debug > 1)
-                        netdev_info(dev, "Unspecified error. Tx threshold now %02x\n",
-                                    rp->tx_thresh);
-        }
-        if (intr_status & (IntrTxAborted | IntrTxUnderrun | IntrTxDescRace |
-                           IntrTxError))
-                rhine_restart_tx(dev);
-        if (intr_status & ~(IntrLinkChange | IntrStatsMax | IntrTxUnderrun |
-                            IntrTxError | IntrTxAborted | IntrNormalSummary |
-                            IntrTxDescRace)) {
-                if (debug > 1)
-                        netdev_err(dev, "Something Wicked happened! %08x\n",
-                                   intr_status);
-        }
-        spin_unlock(&rp->lock);
+        if (intr_status & IntrPCIErr)
+                netif_warn(rp, hw, dev, "PCI error\n");
+        napi_disable(&rp->napi);
+        rhine_irq_disable(rp);
+        /* Slow and safe. Consider __napi_schedule as a replacement ? */
+        napi_enable(&rp->napi);
+        napi_schedule(&rp->napi);
+out_unlock:
+        mutex_unlock(&rp->task_lock);
 }
 static struct net_device_stats *rhine_get_stats(struct net_device *dev)
 {
        struct rhine_private *rp = netdev_priv(dev);
-        void __iomem *ioaddr = rp->base;
-        unsigned long flags;
-        spin_lock_irqsave(&rp->lock, flags);
+        spin_lock_bh(&rp->lock);
-        dev->stats.rx_crc_errors += ioread16(ioaddr + RxCRCErrs);
+        rhine_update_rx_crc_and_missed_errord(rp);
-        dev->stats.rx_missed_errors += ioread16(ioaddr + RxMissed);
+        spin_unlock_bh(&rp->lock);
-        clear_tally_counters(ioaddr);
-        spin_unlock_irqrestore(&rp->lock, flags);
        return &dev->stats;
 }
@@ -2022,9 +2095,9 @@ static int netdev_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
        struct rhine_private *rp = netdev_priv(dev);
        int rc;
-        spin_lock_irq(&rp->lock);
+        mutex_lock(&rp->task_lock);
        rc = mii_ethtool_gset(&rp->mii_if, cmd);
-        spin_unlock_irq(&rp->lock);
+        mutex_unlock(&rp->task_lock);
        return rc;
 }
@@ -2034,10 +2107,10 @@ static int netdev_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
        struct rhine_private *rp = netdev_priv(dev);
        int rc;
-        spin_lock_irq(&rp->lock);
+        mutex_lock(&rp->task_lock);
        rc = mii_ethtool_sset(&rp->mii_if, cmd);
-        spin_unlock_irq(&rp->lock);
        rhine_set_carrier(&rp->mii_if);
+        mutex_unlock(&rp->task_lock);
        return rc;
 }
@@ -2058,12 +2131,16 @@ static u32 netdev_get_link(struct net_device *dev)
 static u32 netdev_get_msglevel(struct net_device *dev)
 {
-        return debug;
+        struct rhine_private *rp = netdev_priv(dev);
+        return rp->msg_enable;
 }
 static void netdev_set_msglevel(struct net_device *dev, u32 value)
 {
-        debug = value;
+        struct rhine_private *rp = netdev_priv(dev);
+        rp->msg_enable = value;
 }
 static void rhine_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
@@ -2119,10 +2196,10 @@ static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
        if (!netif_running(dev))
                return -EINVAL;
-        spin_lock_irq(&rp->lock);
+        mutex_lock(&rp->task_lock);
        rc = generic_mii_ioctl(&rp->mii_if, if_mii(rq), cmd, NULL);
-        spin_unlock_irq(&rp->lock);
        rhine_set_carrier(&rp->mii_if);
+        mutex_unlock(&rp->task_lock);
        return rc;
 }
@@ -2132,27 +2209,21 @@ static int rhine_close(struct net_device *dev)
        struct rhine_private *rp = netdev_priv(dev);
        void __iomem *ioaddr = rp->base;
+        rhine_task_disable(rp);
        napi_disable(&rp->napi);
-        cancel_work_sync(&rp->reset_task);
        netif_stop_queue(dev);
-        spin_lock_irq(&rp->lock);
+        netif_dbg(rp, ifdown, dev, "Shutting down ethercard, status was %04x\n",
+                  ioread16(ioaddr + ChipCmd));
-        if (debug > 1)
-                netdev_dbg(dev, "Shutting down ethercard, status was %04x\n",
-                           ioread16(ioaddr + ChipCmd));
        /* Switch to loopback mode to avoid hardware races. */
        iowrite8(rp->tx_thresh | 0x02, ioaddr + TxConfig);
-        /* Disable interrupts by clearing the interrupt mask. */
+        rhine_irq_disable(rp);
-        iowrite16(0x0000, ioaddr + IntrEnable);
        /* Stop the chip's Tx and Rx processes. */
        iowrite16(CmdStop, ioaddr + ChipCmd);
-        spin_unlock_irq(&rp->lock);
        free_irq(rp->pdev->irq, dev);
        free_rbufs(dev);
        free_tbufs(dev);
@@ -2192,6 +2263,8 @@ static void rhine_shutdown (struct pci_dev *pdev)
        if (rp->quirks & rq6patterns)
                iowrite8(0x04, ioaddr + WOLcgClr);
+        spin_lock(&rp->lock);
        if (rp->wolopts & WAKE_MAGIC) {
                iowrite8(WOLmagic, ioaddr + WOLcrSet);
                /*
@@ -2216,58 +2289,46 @@ static void rhine_shutdown (struct pci_dev *pdev)
                iowrite8(ioread8(ioaddr + StickyHW) | 0x04, ioaddr + StickyHW);
        }
-        /* Hit power state D3 (sleep) */
+        spin_unlock(&rp->lock);
-        if (!avoid_D3)
-                iowrite8(ioread8(ioaddr + StickyHW) | 0x03, ioaddr + StickyHW);
-        /* TODO: Check use of pci_enable_wake() */
+        if (system_state == SYSTEM_POWER_OFF && !avoid_D3) {
+                iowrite8(ioread8(ioaddr + StickyHW) | 0x03, ioaddr + StickyHW);
+                pci_wake_from_d3(pdev, true);
+                pci_set_power_state(pdev, PCI_D3hot);
+        }
 }
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
-static int rhine_suspend(struct pci_dev *pdev, pm_message_t state)
+static int rhine_suspend(struct device *device)
 {
+        struct pci_dev *pdev = to_pci_dev(device);
        struct net_device *dev = pci_get_drvdata(pdev);
        struct rhine_private *rp = netdev_priv(dev);
-        unsigned long flags;
        if (!netif_running(dev))
                return 0;
+        rhine_task_disable(rp);
+        rhine_irq_disable(rp);
        napi_disable(&rp->napi);
        netif_device_detach(dev);
-        pci_save_state(pdev);
-        spin_lock_irqsave(&rp->lock, flags);
        rhine_shutdown(pdev);
-        spin_unlock_irqrestore(&rp->lock, flags);
-        free_irq(dev->irq, dev);
        return 0;
 }
-static int rhine_resume(struct pci_dev *pdev)
+static int rhine_resume(struct device *device)
 {
+        struct pci_dev *pdev = to_pci_dev(device);
        struct net_device *dev = pci_get_drvdata(pdev);
        struct rhine_private *rp = netdev_priv(dev);
-        unsigned long flags;
-        int ret;
        if (!netif_running(dev))
                return 0;
-        if (request_irq(dev->irq, rhine_interrupt, IRQF_SHARED, dev->name, dev))
-                netdev_err(dev, "request_irq failed\n");
-        ret = pci_set_power_state(pdev, PCI_D0);
-        if (debug > 1)
-                netdev_info(dev, "Entering power state D0 %s (%d)\n",
-                            ret ? "failed" : "succeeded", ret);
-        pci_restore_state(pdev);
-        spin_lock_irqsave(&rp->lock, flags);
 #ifdef USE_MMIO
        enable_mmio(rp->pioaddr, rp->quirks);
 #endif
@@ -2276,25 +2337,32 @@ static int rhine_resume(struct pci_dev *pdev)
        free_rbufs(dev);
        alloc_tbufs(dev);
        alloc_rbufs(dev);
+        rhine_task_enable(rp);
+        spin_lock_bh(&rp->lock);
        init_registers(dev);
-        spin_unlock_irqrestore(&rp->lock, flags);
+        spin_unlock_bh(&rp->lock);
        netif_device_attach(dev);
        return 0;
 }
-#endif /* CONFIG_PM */
+static SIMPLE_DEV_PM_OPS(rhine_pm_ops, rhine_suspend, rhine_resume);
+#define RHINE_PM_OPS    (&rhine_pm_ops)
+#else
+#define RHINE_PM_OPS    NULL
+#endif /* !CONFIG_PM_SLEEP */
 static struct pci_driver rhine_driver = {
        .name           = DRV_NAME,
        .id_table       = rhine_pci_tbl,
        .probe          = rhine_init_one,
        .remove         = __devexit_p(rhine_remove_one),
-#ifdef CONFIG_PM
+        .shutdown       = rhine_shutdown,
-        .suspend        = rhine_suspend,
+        .driver.pm      = RHINE_PM_OPS,
-        .resume         = rhine_resume,
-#endif /* CONFIG_PM */
-        .shutdown =     rhine_shutdown,
 };
 static struct dmi_system_id __initdata rhine_dmi_table[] = {
diff --git a/drivers/net/ethernet/xscale/ixp4xx_eth.c b/drivers/net/ethernet/xscale/ixp4xx_eth.c
index f45c85a84261..72a854f05bb8 100644
--- a/drivers/net/ethernet/xscale/ixp4xx_eth.c
+++ b/drivers/net/ethernet/xscale/ixp4xx_eth.c
@@ -529,7 +529,7 @@ static int ixp4xx_mdio_register(void)
        mdio_bus->name = "IXP4xx MII Bus";
        mdio_bus->read = &ixp4xx_mdio_read;
        mdio_bus->write = &ixp4xx_mdio_write;
-        strcpy(mdio_bus->id, "0");
+        snprintf(mdio_bus->id, MII_BUS_ID_SIZE, "ixp4xx-eth-0");
        if ((err = mdiobus_register(mdio_bus)))
                mdiobus_free(mdio_bus);
diff --git a/drivers/net/phy/dp83640.c b/drivers/net/phy/dp83640.c
index 9663e0ba6003..ba3c59147aa7 100644
--- a/drivers/net/phy/dp83640.c
+++ b/drivers/net/phy/dp83640.c
@@ -1159,7 +1159,7 @@ static void rx_timestamp_work(struct work_struct *work)
                        }
                }
                spin_unlock_irqrestore(&dp83640->rx_lock, flags);
-                netif_rx(skb);
+                netif_rx_ni(skb);
        }
        /* Clear out expired time stamps. */
diff --git a/drivers/net/phy/fixed.c b/drivers/net/phy/fixed.c
index 1fa4d73c3cca..633680d0828e 100644
--- a/drivers/net/phy/fixed.c
+++ b/drivers/net/phy/fixed.c
@@ -220,7 +220,7 @@ static int __init fixed_mdio_bus_init(void)
                goto err_mdiobus_reg;
        }
-        snprintf(fmb->mii_bus->id, MII_BUS_ID_SIZE, "0");
+        snprintf(fmb->mii_bus->id, MII_BUS_ID_SIZE, "fixed-0");
        fmb->mii_bus->name = "Fixed MDIO Bus";
        fmb->mii_bus->priv = fmb;
        fmb->mii_bus->parent = &pdev->dev;
diff --git a/drivers/net/phy/mdio-gpio.c b/drivers/net/phy/mdio-gpio.c
index 89c5a3eccc12..50e8e5e74465 100644
--- a/drivers/net/phy/mdio-gpio.c
+++ b/drivers/net/phy/mdio-gpio.c
@@ -116,7 +116,7 @@ static struct mii_bus * __devinit mdio_gpio_bus_init(struct device *dev,
                if (!new_bus->irq[i])
                        new_bus->irq[i] = PHY_POLL;
-        snprintf(new_bus->id, MII_BUS_ID_SIZE, "%x", bus_id);
+        snprintf(new_bus->id, MII_BUS_ID_SIZE, "gpio-%x", bus_id);
        if (gpio_request(bitbang->mdc, "mdc"))
                goto out_free_bus;
diff --git a/drivers/net/phy/mdio-octeon.c b/drivers/net/phy/mdio-octeon.c
index bd12ba941be5..826d961f39f7 100644
--- a/drivers/net/phy/mdio-octeon.c
+++ b/drivers/net/phy/mdio-octeon.c
@@ -118,7 +118,8 @@ static int __devinit octeon_mdiobus_probe(struct platform_device *pdev)
        bus->mii_bus->priv = bus;
        bus->mii_bus->irq = bus->phy_irq;
        bus->mii_bus->name = "mdio-octeon";
-        snprintf(bus->mii_bus->id, MII_BUS_ID_SIZE, "%x", bus->unit);
+        snprintf(bus->mii_bus->id, MII_BUS_ID_SIZE, "%s-%x",
+                bus->mii_bus->name, bus->unit);
        bus->mii_bus->parent = &pdev->dev;
        bus->mii_bus->read = octeon_mdiobus_read;
diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c
index 6c58da2b882c..88cc5db9affd 100644
--- a/drivers/net/phy/mdio_bus.c
+++ b/drivers/net/phy/mdio_bus.c
@@ -37,22 +37,36 @@
 #include <asm/uaccess.h>
 /**
- * mdiobus_alloc - allocate a mii_bus structure
+ * mdiobus_alloc_size - allocate a mii_bus structure
 *
 * Description: called by a bus driver to allocate an mii_bus
 * structure to fill in.
+ *
+ * 'size' is an an extra amount of memory to allocate for private storage.
+ * If non-zero, then bus->priv is points to that memory.
 */
-struct mii_bus *mdiobus_alloc(void)
+struct mii_bus *mdiobus_alloc_size(size_t size)
 {
        struct mii_bus *bus;
+        size_t aligned_size = ALIGN(sizeof(*bus), NETDEV_ALIGN);
+        size_t alloc_size;
+        /* If we alloc extra space, it should be aligned */
+        if (size)
+                alloc_size = aligned_size + size;
+        else
+                alloc_size = sizeof(*bus);
-        bus = kzalloc(sizeof(*bus), GFP_KERNEL);
+        bus = kzalloc(alloc_size, GFP_KERNEL);
-        if (bus != NULL)
+        if (bus) {
                bus->state = MDIOBUS_ALLOCATED;
+                if (size)
+                        bus->priv = (void *)bus + aligned_size;
+        }
        return bus;
 }
-EXPORT_SYMBOL(mdiobus_alloc);
+EXPORT_SYMBOL(mdiobus_alloc_size);
 /**
 * mdiobus_release - mii_bus device release callback
diff --git a/drivers/net/ppp/pptp.c b/drivers/net/ppp/pptp.c
index c1c9293c2bbf..df884dde2a51 100644
--- a/drivers/net/ppp/pptp.c
+++ b/drivers/net/ppp/pptp.c
@@ -585,8 +585,8 @@ static int pptp_create(struct net *net, struct socket *sock)
        po = pppox_sk(sk);
        opt = &po->proto.pptp;
-        opt->seq_sent = 0; opt->seq_recv = 0;
+        opt->seq_sent = 0; opt->seq_recv = 0xffffffff;
-        opt->ack_recv = 0; opt->ack_sent = 0;
+        opt->ack_recv = 0; opt->ack_sent = 0xffffffff;
        error = 0;
 out:
diff --git a/drivers/net/usb/asix.c b/drivers/net/usb/asix.c
index d0937c4634c9..8e84f5bdd6ca 100644
--- a/drivers/net/usb/asix.c
+++ b/drivers/net/usb/asix.c
@@ -978,6 +978,7 @@ static int ax88772_link_reset(struct usbnet *dev)
 static int ax88772_reset(struct usbnet *dev)
 {
+        struct asix_data *data = (struct asix_data *)&dev->data;
        int ret, embd_phy;
        u16 rx_ctl;
@@ -1055,6 +1056,13 @@ static int ax88772_reset(struct usbnet *dev)
                goto out;
        }
+        /* Rewrite MAC address */
+        memcpy(data->mac_addr, dev->net->dev_addr, ETH_ALEN);
+        ret = asix_write_cmd(dev, AX_CMD_WRITE_NODE_ID, 0, 0, ETH_ALEN,
+                                                        data->mac_addr);
+        if (ret < 0)
+                goto out;
        /* Set RX_CTL to default values with 2k buffer, and enable cactus */
        ret = asix_write_rx_ctl(dev, AX_DEFAULT_RX_CTL);
        if (ret < 0)
@@ -1320,6 +1328,13 @@ static int ax88178_reset(struct usbnet *dev)
        if (ret < 0)
                return ret;
+        /* Rewrite MAC address */
+        memcpy(data->mac_addr, dev->net->dev_addr, ETH_ALEN);
+        ret = asix_write_cmd(dev, AX_CMD_WRITE_NODE_ID, 0, 0, ETH_ALEN,
+                                                        data->mac_addr);
+        if (ret < 0)
+                return ret;
        ret = asix_write_rx_ctl(dev, AX_DEFAULT_RX_CTL);
        if (ret < 0)
                return ret;
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_phy.c b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
index 2589b38b689a..2b0bfb8cca02 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
@@ -46,7 +46,7 @@ static const int m2ThreshExt_off = 127;
 * @chan:
 *
 * This is the function to change channel on single-chip devices, that is
- * all devices after ar9280.
+ * for AR9300 family of chipsets.
 *
 * This function takes the channel value in MHz and sets
 * hardware channel value. Assumes writes have been enabled to analog bus.
diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h
index b30e9fc6433f..171ccf7c972f 100644
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
@@ -679,7 +679,6 @@ void ath9k_deinit_device(struct ath_softc *sc);
 void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw);
 void ath9k_reload_chainmask_settings(struct ath_softc *sc);
-void ath_radio_disable(struct ath_softc *sc, struct ieee80211_hw *hw);
 bool ath9k_uses_beacons(int type);
 #ifdef CONFIG_ATH9K_PCI
diff --git a/drivers/net/wireless/ath/ath9k/calib.c b/drivers/net/wireless/ath/ath9k/calib.c
index 172e33db7f4c..2f4b48e6fb03 100644
--- a/drivers/net/wireless/ath/ath9k/calib.c
+++ b/drivers/net/wireless/ath/ath9k/calib.c
@@ -400,6 +400,7 @@ bool ath9k_hw_getnf(struct ath_hw *ah, struct ath9k_channel *chan)
        ah->noise = ath9k_hw_getchan_noise(ah, chan);
        return true;
 }
+EXPORT_SYMBOL(ath9k_hw_getnf);
 void ath9k_init_nfcal_hist_buffer(struct ath_hw *ah,
                                  struct ath9k_channel *chan)
diff --git a/drivers/net/wireless/ath/ath9k/calib.h b/drivers/net/wireless/ath/ath9k/calib.h
index 05b9dbf81850..3b33996d97df 100644
--- a/drivers/net/wireless/ath/ath9k/calib.h
+++ b/drivers/net/wireless/ath/ath9k/calib.h
@@ -19,7 +19,6 @@
 #include "hw.h"
-#define AR_PHY_CCA_FILTERWINDOW_LENGTH_INIT     3
 #define AR_PHY_CCA_FILTERWINDOW_LENGTH          5
 #define NUM_NF_READINGS       6
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index e267c92dbfb8..4a00806e2852 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -1629,7 +1629,6 @@ static int ath9k_config(struct ieee80211_hw *hw, u32 changed)
        if (changed & IEEE80211_CONF_CHANGE_CHANNEL) {
                struct ieee80211_channel *curchan = hw->conf.channel;
-                struct ath9k_channel old_chan;
                int pos = curchan->hw_value;
                int old_pos = -1;
                unsigned long flags;
@@ -1654,11 +1653,8 @@ static int ath9k_config(struct ieee80211_hw *hw, u32 changed)
                 * Preserve the current channel values, before updating
                 * the same channel
                 */
-                if (old_pos == pos) {
+                if (ah->curchan && (old_pos == pos))
-                        memcpy(&old_chan, &sc->sc_ah->channels[pos],
+                        ath9k_hw_getnf(ah, ah->curchan);
-                                sizeof(struct ath9k_channel));
-                        ah->curchan = &old_chan;
-                }
                ath9k_cmn_update_ichannel(&sc->sc_ah->channels[pos],
                                          curchan, conf->channel_type);
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
index 5a002a21f108..f7eeee1dcdb6 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
@@ -3119,8 +3119,10 @@ static int brcmf_sdbrcm_write_vars(struct brcmf_sdio *bus)
                /* Verify NVRAM bytes */
                brcmf_dbg(INFO, "Compare NVRAM dl & ul; varsize=%d\n", varsize);
                nvram_ularray = kmalloc(varsize, GFP_ATOMIC);
-                if (!nvram_ularray)
+                if (!nvram_ularray) {
+                        kfree(vbuffer);
                        return -ENOMEM;
+                }
                /* Upload image to verify downloaded contents. */
                memset(nvram_ularray, 0xaa, varsize);
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/fw.c b/drivers/net/wireless/rtlwifi/rtl8192se/fw.c
index 6f91a148c222..3fda6b1dcf46 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/fw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/fw.c
@@ -196,6 +196,8 @@ static bool _rtl92s_firmware_downloadcode(struct ieee80211_hw *hw,
                /* Allocate skb buffer to contain firmware */
                /* info and tx descriptor info. */
                skb = dev_alloc_skb(frag_length);
+                if (!skb)
+                        return false;
                skb_reserve(skb, extra_descoffset);
                seg_ptr = (u8 *)skb_put(skb, (u32)(frag_length -
                                        extra_descoffset));
@@ -573,6 +575,8 @@ static bool _rtl92s_firmware_set_h2c_cmd(struct ieee80211_hw *hw, u8 h2c_cmd,
        len = _rtl92s_get_h2c_cmdlen(MAX_TRANSMIT_BUFFER_SIZE, 1, &cmd_len);
        skb = dev_alloc_skb(len);
+        if (!skb)
+                return false;
        cb_desc = (struct rtl_tcb_desc *)(skb->cb);
        cb_desc->queue_index = TXCMD_QUEUE;
        cb_desc->cmd_or_init = DESC_PACKET_TYPE_NORMAL;
author	Linus Torvalds <torvalds@linux-foundation.org>	2012-01-12 23:30:02 -0500
committer	Linus Torvalds <torvalds@linux-foundation.org>	2012-01-12 23:30:02 -0500
commit	7c17d86a8502c2e30c2eea777ed1b830aa3b447b (patch)
tree	353f739a33f46f9861b479e64d2a59f9b5c85868 /drivers/net
parent	2485a4b610171f4e1c4ab0d053569747795c1bbe (diff)
parent	91dce7ddab99a29b600e3d792b847dc2cdbf0848 (diff)