95 files changed, 1091 insertions, 640 deletions
diff --git a/drivers/net/can/slcan.c b/drivers/net/can/slcan.c
index 034c16b60e96..adc3708d8829 100644
--- a/drivers/net/can/slcan.c
+++ b/drivers/net/can/slcan.c
@@ -56,7 +56,7 @@
 #include <linux/kernel.h>
 #include <linux/can.h>
-static __initdata const char banner[] =
+static __initconst const char banner[] =
        KERN_INFO "slcan: serial line CAN interface driver\n";
 MODULE_ALIAS_LDISC(N_SLCAN);
diff --git a/drivers/net/can/vcan.c b/drivers/net/can/vcan.c
index 4f93c0be0053..0a2a5ee79a17 100644
--- a/drivers/net/can/vcan.c
+++ b/drivers/net/can/vcan.c
@@ -49,7 +49,7 @@
 #include <linux/slab.h>
 #include <net/rtnetlink.h>
-static __initdata const char banner[] =
+static __initconst const char banner[] =
        KERN_INFO "vcan: Virtual CAN interface driver\n";
 MODULE_DESCRIPTION("virtual CAN interface");
diff --git a/drivers/net/ethernet/8390/ne3210.c b/drivers/net/ethernet/8390/ne3210.c
index a2f8b2b8e27c..e3f57427d5c5 100644
--- a/drivers/net/ethernet/8390/ne3210.c
+++ b/drivers/net/ethernet/8390/ne3210.c
@@ -81,7 +81,7 @@ static void ne3210_block_output(struct net_device *dev, int count, const unsigne
 static unsigned char irq_map[] __initdata = {15, 12, 11, 10, 9, 7, 5, 3};
 static unsigned int shmem_map[] __initdata = {0xff0, 0xfe0, 0xfff0, 0xd8, 0xffe0, 0xffc0, 0xd0, 0x0};
-static const char *ifmap[] __initdata = {"UTP", "?", "BNC", "AUI"};
+static const char * const ifmap[] __initconst = {"UTP", "?", "BNC", "AUI"};
 static int ifmap_val[] __initdata = {
                IF_PORT_10BASET,
                IF_PORT_UNKNOWN,
diff --git a/drivers/net/ethernet/adaptec/starfire.c b/drivers/net/ethernet/adaptec/starfire.c
index d920a529ba22..5b65992c2a0a 100644
--- a/drivers/net/ethernet/adaptec/starfire.c
+++ b/drivers/net/ethernet/adaptec/starfire.c
@@ -295,7 +295,7 @@ MODULE_DEVICE_TABLE(pci, starfire_pci_tbl);
 static const struct chip_info {
        const char *name;
        int drv_flags;
-} netdrv_tbl[] __devinitdata = {
+} netdrv_tbl[] __devinitconst = {
        { "Adaptec Starfire 6915", CanHaveMII },
 };
diff --git a/drivers/net/ethernet/amd/amd8111e.c b/drivers/net/ethernet/amd/amd8111e.c
index 64d0d9c1afa2..3491d4312fc9 100644
--- a/drivers/net/ethernet/amd/amd8111e.c
+++ b/drivers/net/ethernet/amd/amd8111e.c
@@ -1845,6 +1845,7 @@ static int __devinit amd8111e_probe_one(struct pci_dev *pdev,
        if((pm_cap = pci_find_capability(pdev, PCI_CAP_ID_PM))==0){
                printk(KERN_ERR "amd8111e: No Power Management capability, "
                       "exiting.\n");
+                err = -ENODEV;
                goto err_free_reg;
        }
@@ -1852,6 +1853,7 @@ static int __devinit amd8111e_probe_one(struct pci_dev *pdev,
        if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32)) < 0) {
                printk(KERN_ERR "amd8111e: DMA not supported,"
                        "exiting.\n");
+                err = -ENODEV;
                goto err_free_reg;
        }
diff --git a/drivers/net/ethernet/amd/au1000_eth.c b/drivers/net/ethernet/amd/au1000_eth.c
index 397596b078d9..f195acfa2df7 100644
--- a/drivers/net/ethernet/amd/au1000_eth.c
+++ b/drivers/net/ethernet/amd/au1000_eth.c
@@ -1174,8 +1174,10 @@ static int __devinit au1000_probe(struct platform_device *pdev)
        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)
+        if (aup->mii_bus->irq == NULL) {
+                err = -ENOMEM;
                goto err_out;
+        }
        for (i = 0; i < PHY_MAX_ADDR; ++i)
                aup->mii_bus->irq[i] = PHY_POLL;
@@ -1190,7 +1192,8 @@ static int __devinit au1000_probe(struct platform_device *pdev)
                goto err_mdiobus_reg;
        }
-        if (au1000_mii_probe(dev) != 0)
+        err = au1000_mii_probe(dev);
+        if (err != 0)
                goto err_out;
        pDBfree = NULL;
@@ -1205,6 +1208,7 @@ static int __devinit au1000_probe(struct platform_device *pdev)
        }
        aup->pDBfree = pDBfree;
+        err = -ENODEV;
        for (i = 0; i < NUM_RX_DMA; i++) {
                pDB = au1000_GetFreeDB(aup);
                if (!pDB)
@@ -1213,6 +1217,8 @@ static int __devinit au1000_probe(struct platform_device *pdev)
                aup->rx_dma_ring[i]->buff_stat = (unsigned)pDB->dma_addr;
                aup->rx_db_inuse[i] = pDB;
        }
+        err = -ENODEV;
        for (i = 0; i < NUM_TX_DMA; i++) {
                pDB = au1000_GetFreeDB(aup);
                if (!pDB)
diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
index 55a2e3795055..d19f82f7597a 100644
--- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
+++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
@@ -702,7 +702,7 @@ struct atl1c_platform_patch {
        u32 patch_flag;
 #define ATL1C_LINK_PATCH        0x1
 };
-static const struct atl1c_platform_patch plats[] __devinitdata = {
+static const struct atl1c_platform_patch plats[] __devinitconst = {
 {0x2060, 0xC1, 0x1019, 0x8152, 0x1},
 {0x2060, 0xC1, 0x1019, 0x2060, 0x1},
 {0x2060, 0xC1, 0x1019, 0xE000, 0x1},
diff --git a/drivers/net/ethernet/atheros/atlx/atl2.c b/drivers/net/ethernet/atheros/atlx/atl2.c
index 57d64b80fd72..623dd8635c46 100644
--- a/drivers/net/ethernet/atheros/atlx/atl2.c
+++ b/drivers/net/ethernet/atheros/atlx/atl2.c
@@ -2845,7 +2845,7 @@ static void atl2_force_ps(struct atl2_hw *hw)
 */
 #define ATL2_PARAM(X, desc) \
-    static const int __devinitdata X[ATL2_MAX_NIC + 1] = ATL2_PARAM_INIT; \
+    static const int __devinitconst X[ATL2_MAX_NIC + 1] = ATL2_PARAM_INIT; \
    MODULE_PARM(X, "1-" __MODULE_STRING(ATL2_MAX_NIC) "i"); \
    MODULE_PARM_DESC(X, desc);
 #else
diff --git a/drivers/net/ethernet/broadcom/bcm63xx_enet.h b/drivers/net/ethernet/broadcom/bcm63xx_enet.h
index 0e3048b788c2..133d5857b9e2 100644
--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.h
+++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.h
@@ -10,6 +10,7 @@
 #include <bcm63xx_regs.h>
 #include <bcm63xx_irq.h>
 #include <bcm63xx_io.h>
+#include <bcm63xx_iudma.h>
 /* default number of descriptor */
 #define BCMENET_DEF_RX_DESC     64
@@ -31,35 +32,6 @@
 #define BCMENET_MAX_MTU         2046
 /*
- * rx/tx dma descriptor
- */
-struct bcm_enet_desc {
-        u32 len_stat;
-        u32 address;
-};
-#define DMADESC_LENGTH_SHIFT    16
-#define DMADESC_LENGTH_MASK     (0xfff << DMADESC_LENGTH_SHIFT)
-#define DMADESC_OWNER_MASK      (1 << 15)
-#define DMADESC_EOP_MASK        (1 << 14)
-#define DMADESC_SOP_MASK        (1 << 13)
-#define DMADESC_ESOP_MASK       (DMADESC_EOP_MASK | DMADESC_SOP_MASK)
-#define DMADESC_WRAP_MASK       (1 << 12)
-#define DMADESC_UNDER_MASK      (1 << 9)
-#define DMADESC_APPEND_CRC      (1 << 8)
-#define DMADESC_OVSIZE_MASK     (1 << 4)
-#define DMADESC_RXER_MASK       (1 << 2)
-#define DMADESC_CRC_MASK        (1 << 1)
-#define DMADESC_OV_MASK         (1 << 0)
-#define DMADESC_ERR_MASK        (DMADESC_UNDER_MASK | \
-                                DMADESC_OVSIZE_MASK | \
-                                DMADESC_RXER_MASK | \
-                                DMADESC_CRC_MASK | \
-                                DMADESC_OV_MASK)
-/*
 * MIB Counters register definitions
 */
 #define ETH_MIB_TX_GD_OCTETS                    0
diff --git a/drivers/net/ethernet/calxeda/xgmac.c b/drivers/net/ethernet/calxeda/xgmac.c
index 2b4b4f529ab4..16814b34d4b6 100644
--- a/drivers/net/ethernet/calxeda/xgmac.c
+++ b/drivers/net/ethernet/calxeda/xgmac.c
@@ -375,7 +375,6 @@ struct xgmac_priv {
        unsigned int tx_tail;
        void __iomem *base;
-        struct sk_buff_head rx_recycle;
        unsigned int dma_buf_sz;
        dma_addr_t dma_rx_phy;
        dma_addr_t dma_tx_phy;
@@ -672,9 +671,7 @@ static void xgmac_rx_refill(struct xgmac_priv *priv)
                p = priv->dma_rx + entry;
                if (priv->rx_skbuff[entry] == NULL) {
-                        skb = __skb_dequeue(&priv->rx_recycle);
+                        skb = netdev_alloc_skb(priv->dev, priv->dma_buf_sz);
-                        if (skb == NULL)
-                                skb = netdev_alloc_skb(priv->dev, priv->dma_buf_sz);
                        if (unlikely(skb == NULL))
                                break;
@@ -887,17 +884,7 @@ static void xgmac_tx_complete(struct xgmac_priv *priv)
                                       desc_get_buf_len(p), DMA_TO_DEVICE);
                }
-                /*
+                dev_kfree_skb(skb);
-                 * If there's room in the queue (limit it to size)
-                 * we add this skb back into the pool,
-                 * if it's the right size.
-                 */
-                if ((skb_queue_len(&priv->rx_recycle) <
-                        DMA_RX_RING_SZ) &&
-                        skb_recycle_check(skb, priv->dma_buf_sz))
-                        __skb_queue_head(&priv->rx_recycle, skb);
-                else
-                        dev_kfree_skb(skb);
        }
        if (dma_ring_space(priv->tx_head, priv->tx_tail, DMA_TX_RING_SZ) >
@@ -1016,7 +1003,6 @@ static int xgmac_open(struct net_device *dev)
                        dev->dev_addr);
        }
-        skb_queue_head_init(&priv->rx_recycle);
        memset(&priv->xstats, 0, sizeof(struct xgmac_extra_stats));
        /* Initialize the XGMAC and descriptors */
@@ -1053,7 +1039,6 @@ static int xgmac_stop(struct net_device *dev)
                napi_disable(&priv->napi);
        writel(0, priv->base + XGMAC_DMA_INTR_ENA);
-        skb_queue_purge(&priv->rx_recycle);
        /* Disable the MAC core */
        xgmac_mac_disable(priv->base);
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
index 31752b24434e..a4da893ac1e1 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
@@ -696,6 +696,7 @@ int t4_seeprom_wp(struct adapter *adapter, bool enable);
 int get_vpd_params(struct adapter *adapter, struct vpd_params *p);
 int t4_load_fw(struct adapter *adapter, const u8 *fw_data, unsigned int size);
 unsigned int t4_flash_cfg_addr(struct adapter *adapter);
+int t4_load_cfg(struct adapter *adapter, const u8 *cfg_data, unsigned int size);
 int t4_check_fw_version(struct adapter *adapter);
 int t4_prep_adapter(struct adapter *adapter);
 int t4_port_init(struct adapter *adap, int mbox, int pf, int vf);
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
index 6b9f6bb2f7ed..604f4f87f550 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
@@ -443,7 +443,10 @@ int dbfifo_int_thresh = 10; /* 10 == 640 entry threshold */
 module_param(dbfifo_int_thresh, int, 0644);
 MODULE_PARM_DESC(dbfifo_int_thresh, "doorbell fifo interrupt threshold");
-int dbfifo_drain_delay = 1000; /* usecs to sleep while draining the dbfifo */
+/*
+ * usecs to sleep while draining the dbfifo
+ */
+static int dbfifo_drain_delay = 1000;
 module_param(dbfifo_drain_delay, int, 0644);
 MODULE_PARM_DESC(dbfifo_drain_delay,
                 "usecs to sleep while draining the dbfifo");
@@ -636,7 +639,7 @@ static void name_msix_vecs(struct adapter *adap)
 static int request_msix_queue_irqs(struct adapter *adap)
 {
        struct sge *s = &adap->sge;
-        int err, ethqidx, ofldqidx = 0, rdmaqidx = 0, msi = 2;
+        int err, ethqidx, ofldqidx = 0, rdmaqidx = 0, msi_index = 2;
        err = request_irq(adap->msix_info[1].vec, t4_sge_intr_msix, 0,
                          adap->msix_info[1].desc, &s->fw_evtq);
@@ -644,56 +647,60 @@ static int request_msix_queue_irqs(struct adapter *adap)
                return err;
        for_each_ethrxq(s, ethqidx) {
-                err = request_irq(adap->msix_info[msi].vec, t4_sge_intr_msix, 0,
+                err = request_irq(adap->msix_info[msi_index].vec,
-                                  adap->msix_info[msi].desc,
+                                  t4_sge_intr_msix, 0,
+                                  adap->msix_info[msi_index].desc,
                                  &s->ethrxq[ethqidx].rspq);
                if (err)
                        goto unwind;
-                msi++;
+                msi_index++;
        }
        for_each_ofldrxq(s, ofldqidx) {
-                err = request_irq(adap->msix_info[msi].vec, t4_sge_intr_msix, 0,
+                err = request_irq(adap->msix_info[msi_index].vec,
-                                  adap->msix_info[msi].desc,
+                                  t4_sge_intr_msix, 0,
+                                  adap->msix_info[msi_index].desc,
                                  &s->ofldrxq[ofldqidx].rspq);
                if (err)
                        goto unwind;
-                msi++;
+                msi_index++;
        }
        for_each_rdmarxq(s, rdmaqidx) {
-                err = request_irq(adap->msix_info[msi].vec, t4_sge_intr_msix, 0,
+                err = request_irq(adap->msix_info[msi_index].vec,
-                                  adap->msix_info[msi].desc,
+                                  t4_sge_intr_msix, 0,
+                                  adap->msix_info[msi_index].desc,
                                  &s->rdmarxq[rdmaqidx].rspq);
                if (err)
                        goto unwind;
-                msi++;
+                msi_index++;
        }
        return 0;
 unwind:
        while (--rdmaqidx >= 0)
-                free_irq(adap->msix_info[--msi].vec,
+                free_irq(adap->msix_info[--msi_index].vec,
                         &s->rdmarxq[rdmaqidx].rspq);
        while (--ofldqidx >= 0)
-                free_irq(adap->msix_info[--msi].vec,
+                free_irq(adap->msix_info[--msi_index].vec,
                         &s->ofldrxq[ofldqidx].rspq);
        while (--ethqidx >= 0)
-                free_irq(adap->msix_info[--msi].vec, &s->ethrxq[ethqidx].rspq);
+                free_irq(adap->msix_info[--msi_index].vec,
+                         &s->ethrxq[ethqidx].rspq);
        free_irq(adap->msix_info[1].vec, &s->fw_evtq);
        return err;
 }
 static void free_msix_queue_irqs(struct adapter *adap)
 {
-        int i, msi = 2;
+        int i, msi_index = 2;
        struct sge *s = &adap->sge;
        free_irq(adap->msix_info[1].vec, &s->fw_evtq);
        for_each_ethrxq(s, i)
-                free_irq(adap->msix_info[msi++].vec, &s->ethrxq[i].rspq);
+                free_irq(adap->msix_info[msi_index++].vec, &s->ethrxq[i].rspq);
        for_each_ofldrxq(s, i)
-                free_irq(adap->msix_info[msi++].vec, &s->ofldrxq[i].rspq);
+                free_irq(adap->msix_info[msi_index++].vec, &s->ofldrxq[i].rspq);
        for_each_rdmarxq(s, i)
-                free_irq(adap->msix_info[msi++].vec, &s->rdmarxq[i].rspq);
+                free_irq(adap->msix_info[msi_index++].vec, &s->rdmarxq[i].rspq);
 }
 /**
@@ -2535,9 +2542,8 @@ static int read_eq_indices(struct adapter *adap, u16 qid, u16 *pidx, u16 *cidx)
        ret = t4_mem_win_read_len(adap, addr, (__be32 *)&indices, 8);
        if (!ret) {
-                indices = be64_to_cpu(indices);
+                *cidx = (be64_to_cpu(indices) >> 25) & 0xffff;
-                *cidx = (indices >> 25) & 0xffff;
+                *pidx = (be64_to_cpu(indices) >> 9) & 0xffff;
-                *pidx = (indices >> 9) & 0xffff;
        }
        return ret;
 }
@@ -3634,10 +3640,10 @@ static int adap_init0_no_config(struct adapter *adapter, int reset)
         * field selections will fit in the 36-bit budget.
         */
        if (tp_vlan_pri_map != TP_VLAN_PRI_MAP_DEFAULT) {
-                int i, bits = 0;
+                int j, bits = 0;
-                for (i = TP_VLAN_PRI_MAP_FIRST; i <= TP_VLAN_PRI_MAP_LAST; i++)
+                for (j = TP_VLAN_PRI_MAP_FIRST; j <= TP_VLAN_PRI_MAP_LAST; j++)
-                        switch (tp_vlan_pri_map & (1 << i)) {
+                        switch (tp_vlan_pri_map & (1 << j)) {
                        case 0:
                                /* compressed filter field not enabled */
                                break;
diff --git a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
index 137a24438d9c..32eec15fe4c2 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
@@ -380,9 +380,11 @@ static int t4_mem_win_rw(struct adapter *adap, u32 addr, __be32 *data, int dir)
        /* Collecting data 4 bytes at a time upto MEMWIN0_APERTURE */
        for (i = 0; i < MEMWIN0_APERTURE; i = i+0x4) {
                if (dir)
-                        *data++ = t4_read_reg(adap, (MEMWIN0_BASE + i));
+                        *data++ = (__force __be32) t4_read_reg(adap,
+                                                        (MEMWIN0_BASE + i));
                else
-                        t4_write_reg(adap, (MEMWIN0_BASE + i), *data++);
+                        t4_write_reg(adap, (MEMWIN0_BASE + i),
+                                     (__force u32) *data++);
        }
        return 0;
@@ -417,7 +419,7 @@ static int t4_memory_rw(struct adapter *adap, int mtype, u32 addr, u32 len,
        if ((addr & 0x3) || (len & 0x3))
                return -EINVAL;
-        data = vmalloc(MEMWIN0_APERTURE/sizeof(__be32));
+        data = vmalloc(MEMWIN0_APERTURE);
        if (!data)
                return -ENOMEM;
@@ -744,7 +746,7 @@ static int t4_read_flash(struct adapter *adapter, unsigned int addr,
                if (ret)
                        return ret;
                if (byte_oriented)
-                        *data = htonl(*data);
+                        *data = (__force __u32) (htonl(*data));
        }
        return 0;
 }
@@ -992,7 +994,7 @@ int t4_load_fw(struct adapter *adap, const u8 *fw_data, unsigned int size)
        int ret, addr;
        unsigned int i;
        u8 first_page[SF_PAGE_SIZE];
-        const u32 *p = (const u32 *)fw_data;
+        const __be32 *p = (const __be32 *)fw_data;
        const struct fw_hdr *hdr = (const struct fw_hdr *)fw_data;
        unsigned int sf_sec_size = adap->params.sf_size / adap->params.sf_nsec;
        unsigned int fw_img_start = adap->params.sf_fw_start;
@@ -2315,7 +2317,8 @@ int t4_mem_win_read_len(struct adapter *adap, u32 addr, __be32 *data, int len)
        t4_read_reg(adap, PCIE_MEM_ACCESS_OFFSET);
        for (i = 0; i < len; i += 4)
-                *data++ = t4_read_reg(adap, (MEMWIN0_BASE + off + i));
+                *data++ = (__force __be32) t4_read_reg(adap,
+                                                (MEMWIN0_BASE + off + i));
        return 0;
 }
diff --git a/drivers/net/ethernet/dec/tulip/de2104x.c b/drivers/net/ethernet/dec/tulip/de2104x.c
index 61cc09342865..77335853ac36 100644
--- a/drivers/net/ethernet/dec/tulip/de2104x.c
+++ b/drivers/net/ethernet/dec/tulip/de2104x.c
@@ -661,9 +661,6 @@ static netdev_tx_t de_start_xmit (struct sk_buff *skb,
   new frame, not around filling de->setup_frame.  This is non-deterministic
   when re-entered but still correct. */
-#undef set_bit_le
-#define set_bit_le(i,p) do { ((char *)(p))[(i)/8] |= (1<<((i)%8)); } while(0)
 static void build_setup_frame_hash(u16 *setup_frm, struct net_device *dev)
 {
        struct de_private *de = netdev_priv(dev);
@@ -673,12 +670,12 @@ static void build_setup_frame_hash(u16 *setup_frm, struct net_device *dev)
        u16 *eaddrs;
        memset(hash_table, 0, sizeof(hash_table));
-        set_bit_le(255, hash_table);                    /* Broadcast entry */
+        __set_bit_le(255, hash_table);                  /* Broadcast entry */
        /* This should work on big-endian machines as well. */
        netdev_for_each_mc_addr(ha, dev) {
                int index = ether_crc_le(ETH_ALEN, ha->addr) & 0x1ff;
-                set_bit_le(index, hash_table);
+                __set_bit_le(index, hash_table);
        }
        for (i = 0; i < 32; i++) {
diff --git a/drivers/net/ethernet/dec/tulip/dmfe.c b/drivers/net/ethernet/dec/tulip/dmfe.c
index 4d6fe604fa64..d23755ea9bc7 100644
--- a/drivers/net/ethernet/dec/tulip/dmfe.c
+++ b/drivers/net/ethernet/dec/tulip/dmfe.c
@@ -446,13 +446,17 @@ static int __devinit dmfe_init_one (struct pci_dev *pdev,
        /* Allocate Tx/Rx descriptor memory */
        db->desc_pool_ptr = pci_alloc_consistent(pdev, sizeof(struct tx_desc) *
                        DESC_ALL_CNT + 0x20, &db->desc_pool_dma_ptr);
-        if (!db->desc_pool_ptr)
+        if (!db->desc_pool_ptr) {
+                err = -ENOMEM;
                goto err_out_res;
+        }
        db->buf_pool_ptr = pci_alloc_consistent(pdev, TX_BUF_ALLOC *
                        TX_DESC_CNT + 4, &db->buf_pool_dma_ptr);
-        if (!db->buf_pool_ptr)
+        if (!db->buf_pool_ptr) {
+                err = -ENOMEM;
                goto err_out_free_desc;
+        }
        db->first_tx_desc = (struct tx_desc *) db->desc_pool_ptr;
        db->first_tx_desc_dma = db->desc_pool_dma_ptr;
@@ -462,8 +466,10 @@ static int __devinit dmfe_init_one (struct pci_dev *pdev,
        db->chip_id = ent->driver_data;
        /* IO type range. */
        db->ioaddr = pci_iomap(pdev, 0, 0);
-        if (!db->ioaddr)
+        if (!db->ioaddr) {
+                err = -ENOMEM;
                goto err_out_free_buf;
+        }
        db->chip_revision = pdev->revision;
        db->wol_mode = 0;
diff --git a/drivers/net/ethernet/dec/tulip/eeprom.c b/drivers/net/ethernet/dec/tulip/eeprom.c
index ed7d1dcd9566..44f7e8e82d85 100644
--- a/drivers/net/ethernet/dec/tulip/eeprom.c
+++ b/drivers/net/ethernet/dec/tulip/eeprom.c
@@ -79,7 +79,7 @@ static struct eeprom_fixup eeprom_fixups[] __devinitdata = {
  {NULL}};
-static const char *block_name[] __devinitdata = {
+static const char *const block_name[] __devinitconst = {
        "21140 non-MII",
        "21140 MII PHY",
        "21142 Serial PHY",
diff --git a/drivers/net/ethernet/dec/tulip/tulip_core.c b/drivers/net/ethernet/dec/tulip/tulip_core.c
index c4f37aca2269..885700a19978 100644
--- a/drivers/net/ethernet/dec/tulip/tulip_core.c
+++ b/drivers/net/ethernet/dec/tulip/tulip_core.c
@@ -1010,9 +1010,6 @@ static int private_ioctl (struct net_device *dev, struct ifreq *rq, int cmd)
   new frame, not around filling tp->setup_frame.  This is non-deterministic
   when re-entered but still correct. */
-#undef set_bit_le
-#define set_bit_le(i,p) do { ((char *)(p))[(i)/8] |= (1<<((i)%8)); } while(0)
 static void build_setup_frame_hash(u16 *setup_frm, struct net_device *dev)
 {
        struct tulip_private *tp = netdev_priv(dev);
@@ -1022,12 +1019,12 @@ static void build_setup_frame_hash(u16 *setup_frm, struct net_device *dev)
        u16 *eaddrs;
        memset(hash_table, 0, sizeof(hash_table));
-        set_bit_le(255, hash_table);                    /* Broadcast entry */
+        __set_bit_le(255, hash_table);                  /* Broadcast entry */
        /* This should work on big-endian machines as well. */
        netdev_for_each_mc_addr(ha, dev) {
                int index = ether_crc_le(ETH_ALEN, ha->addr) & 0x1ff;
-                set_bit_le(index, hash_table);
+                __set_bit_le(index, hash_table);
        }
        for (i = 0; i < 32; i++) {
                *setup_frm++ = hash_table[i];
diff --git a/drivers/net/ethernet/dec/tulip/winbond-840.c b/drivers/net/ethernet/dec/tulip/winbond-840.c
index 4d1ffca83c82..7c1ec4d7920b 100644
--- a/drivers/net/ethernet/dec/tulip/winbond-840.c
+++ b/drivers/net/ethernet/dec/tulip/winbond-840.c
@@ -236,7 +236,7 @@ struct pci_id_info {
        int drv_flags;          /* Driver use, intended as capability flags. */
 };
-static const struct pci_id_info pci_id_tbl[] __devinitdata = {
+static const struct pci_id_info pci_id_tbl[] __devinitconst = {
        {                               /* Sometime a Level-One switch card. */
          "Winbond W89c840",    CanHaveMII | HasBrokenTx | FDXOnNoMII},
        { "Winbond W89c840",    CanHaveMII | HasBrokenTx},
diff --git a/drivers/net/ethernet/dlink/sundance.c b/drivers/net/ethernet/dlink/sundance.c
index d7bb52a7bda1..3b83588e51f6 100644
--- a/drivers/net/ethernet/dlink/sundance.c
+++ b/drivers/net/ethernet/dlink/sundance.c
@@ -218,7 +218,7 @@ enum {
 struct pci_id_info {
        const char *name;
 };
-static const struct pci_id_info pci_id_tbl[] __devinitdata = {
+static const struct pci_id_info pci_id_tbl[] __devinitconst = {
        {"D-Link DFE-550TX FAST Ethernet Adapter"},
        {"D-Link DFE-550FX 100Mbps Fiber-optics Adapter"},
        {"D-Link DFE-580TX 4 port Server Adapter"},
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index eb3f2cb3b93b..d1b6cc587639 100644
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -2129,8 +2129,11 @@ void be_detect_error(struct be_adapter *adapter)
                ue_hi = (ue_hi & ~ue_hi_mask);
        }
-        if (ue_lo || ue_hi ||
+        /* On certain platforms BE hardware can indicate spurious UEs.
-                sliport_status & SLIPORT_STATUS_ERR_MASK) {
+         * Allow the h/w to stop working completely in case of a real UE.
+         * Hence not setting the hw_error for UE detection.
+         */
+        if (sliport_status & SLIPORT_STATUS_ERR_MASK) {
                adapter->hw_error = true;
                dev_err(&adapter->pdev->dev,
                        "Error detected in the card\n");
diff --git a/drivers/net/ethernet/fealnx.c b/drivers/net/ethernet/fealnx.c
index 9d71c9cc300b..0e4a0ac86aa8 100644
--- a/drivers/net/ethernet/fealnx.c
+++ b/drivers/net/ethernet/fealnx.c
@@ -150,7 +150,7 @@ struct chip_info {
        int flags;
 };
-static const struct chip_info skel_netdrv_tbl[] __devinitdata = {
+static const struct chip_info skel_netdrv_tbl[] __devinitconst = {
        { "100/10M Ethernet PCI Adapter",       HAS_MII_XCVR },
        { "100/10M Ethernet PCI Adapter",       HAS_CHIP_XCVR },
        { "1000/100/10M Ethernet PCI Adapter",  HAS_MII_XCVR },
diff --git a/drivers/net/ethernet/freescale/gianfar.c b/drivers/net/ethernet/freescale/gianfar.c
index a1b52ec3b930..1d03dcdd5e56 100644
--- a/drivers/net/ethernet/freescale/gianfar.c
+++ b/drivers/net/ethernet/freescale/gianfar.c
@@ -1765,7 +1765,6 @@ static void free_skb_resources(struct gfar_private *priv)
                          sizeof(struct rxbd8) * priv->total_rx_ring_size,
                          priv->tx_queue[0]->tx_bd_base,
                          priv->tx_queue[0]->tx_bd_dma_base);
-        skb_queue_purge(&priv->rx_recycle);
 }
 void gfar_start(struct net_device *dev)
@@ -1943,8 +1942,6 @@ static int gfar_enet_open(struct net_device *dev)
        enable_napi(priv);
-        skb_queue_head_init(&priv->rx_recycle);
        /* Initialize a bunch of registers */
        init_registers(dev);
@@ -2533,16 +2530,7 @@ static int gfar_clean_tx_ring(struct gfar_priv_tx_q *tx_queue)
                bytes_sent += skb->len;
-                /* If there's room in the queue (limit it to rx_buffer_size)
+                dev_kfree_skb_any(skb);
-                 * we add this skb back into the pool, if it's the right size
-                 */
-                if (skb_queue_len(&priv->rx_recycle) < rx_queue->rx_ring_size &&
-                    skb_recycle_check(skb, priv->rx_buffer_size +
-                                      RXBUF_ALIGNMENT)) {
-                        gfar_align_skb(skb);
-                        skb_queue_head(&priv->rx_recycle, skb);
-                } else
-                        dev_kfree_skb_any(skb);
                tx_queue->tx_skbuff[skb_dirtytx] = NULL;
@@ -2608,7 +2596,7 @@ static void gfar_new_rxbdp(struct gfar_priv_rx_q *rx_queue, struct rxbd8 *bdp,
 static struct sk_buff *gfar_alloc_skb(struct net_device *dev)
 {
        struct gfar_private *priv = netdev_priv(dev);
-        struct sk_buff *skb = NULL;
+        struct sk_buff *skb;
        skb = netdev_alloc_skb(dev, priv->rx_buffer_size + RXBUF_ALIGNMENT);
        if (!skb)
@@ -2621,14 +2609,7 @@ static struct sk_buff *gfar_alloc_skb(struct net_device *dev)
 struct sk_buff *gfar_new_skb(struct net_device *dev)
 {
-        struct gfar_private *priv = netdev_priv(dev);
+        return gfar_alloc_skb(dev);
-        struct sk_buff *skb = NULL;
-        skb = skb_dequeue(&priv->rx_recycle);
-        if (!skb)
-                skb = gfar_alloc_skb(dev);
-        return skb;
 }
 static inline void count_errors(unsigned short status, struct net_device *dev)
@@ -2787,7 +2768,7 @@ int gfar_clean_rx_ring(struct gfar_priv_rx_q *rx_queue, int rx_work_limit)
                        if (unlikely(!newskb))
                                newskb = skb;
                        else if (skb)
-                                skb_queue_head(&priv->rx_recycle, skb);
+                                dev_kfree_skb(skb);
                } else {
                        /* Increment the number of packets */
                        rx_queue->stats.rx_packets++;
diff --git a/drivers/net/ethernet/freescale/gianfar.h b/drivers/net/ethernet/freescale/gianfar.h
index 4141ef2ddafc..22eabc13ca99 100644
--- a/drivers/net/ethernet/freescale/gianfar.h
+++ b/drivers/net/ethernet/freescale/gianfar.h
@@ -1080,8 +1080,6 @@ struct gfar_private {
        u32 cur_filer_idx;
-        struct sk_buff_head rx_recycle;
        /* RX queue filer rule set*/
        struct ethtool_rx_list rx_list;
        struct mutex rx_queue_access;
diff --git a/drivers/net/ethernet/freescale/ucc_geth.c b/drivers/net/ethernet/freescale/ucc_geth.c
index 164288439220..0a70bb55d1b0 100644
--- a/drivers/net/ethernet/freescale/ucc_geth.c
+++ b/drivers/net/ethernet/freescale/ucc_geth.c
@@ -209,14 +209,12 @@ static struct list_head *dequeue(struct list_head *lh)
 static struct sk_buff *get_new_skb(struct ucc_geth_private *ugeth,
                u8 __iomem *bd)
 {
-        struct sk_buff *skb = NULL;
+        struct sk_buff *skb;
-        skb = __skb_dequeue(&ugeth->rx_recycle);
+        skb = netdev_alloc_skb(ugeth->ndev,
+                               ugeth->ug_info->uf_info.max_rx_buf_length +
+                               UCC_GETH_RX_DATA_BUF_ALIGNMENT);
        if (!skb)
-                skb = netdev_alloc_skb(ugeth->ndev,
-                                      ugeth->ug_info->uf_info.max_rx_buf_length +
-                                      UCC_GETH_RX_DATA_BUF_ALIGNMENT);
-        if (skb == NULL)
                return NULL;
        /* We need the data buffer to be aligned properly.  We will reserve
@@ -2020,8 +2018,6 @@ static void ucc_geth_memclean(struct ucc_geth_private *ugeth)
                iounmap(ugeth->ug_regs);
                ugeth->ug_regs = NULL;
        }
-        skb_queue_purge(&ugeth->rx_recycle);
 }
 static void ucc_geth_set_multi(struct net_device *dev)
@@ -2230,8 +2226,6 @@ static int ucc_struct_init(struct ucc_geth_private *ugeth)
                return -ENOMEM;
        }
-        skb_queue_head_init(&ugeth->rx_recycle);
        return 0;
 }
@@ -3274,12 +3268,7 @@ static int ucc_geth_rx(struct ucc_geth_private *ugeth, u8 rxQ, int rx_work_limit
                        if (netif_msg_rx_err(ugeth))
                                ugeth_err("%s, %d: ERROR!!! skb - 0x%08x",
                                           __func__, __LINE__, (u32) skb);
-                        if (skb) {
+                        dev_kfree_skb(skb);
-                                skb->data = skb->head + NET_SKB_PAD;
-                                skb->len = 0;
-                                skb_reset_tail_pointer(skb);
-                                __skb_queue_head(&ugeth->rx_recycle, skb);
-                        }
                        ugeth->rx_skbuff[rxQ][ugeth->skb_currx[rxQ]] = NULL;
                        dev->stats.rx_dropped++;
@@ -3349,13 +3338,7 @@ static int ucc_geth_tx(struct net_device *dev, u8 txQ)
                dev->stats.tx_packets++;
-                if (skb_queue_len(&ugeth->rx_recycle) < RX_BD_RING_LEN &&
+                dev_kfree_skb(skb);
-                             skb_recycle_check(skb,
-                                    ugeth->ug_info->uf_info.max_rx_buf_length +
-                                    UCC_GETH_RX_DATA_BUF_ALIGNMENT))
-                        __skb_queue_head(&ugeth->rx_recycle, skb);
-                else
-                        dev_kfree_skb(skb);
                ugeth->tx_skbuff[txQ][ugeth->skb_dirtytx[txQ]] = NULL;
                ugeth->skb_dirtytx[txQ] =
diff --git a/drivers/net/ethernet/freescale/ucc_geth.h b/drivers/net/ethernet/freescale/ucc_geth.h
index f71b3e7b12de..75f337163ce3 100644
--- a/drivers/net/ethernet/freescale/ucc_geth.h
+++ b/drivers/net/ethernet/freescale/ucc_geth.h
@@ -1214,8 +1214,6 @@ struct ucc_geth_private {
        /* index of the first skb which hasn't been transmitted yet. */
        u16 skb_dirtytx[NUM_TX_QUEUES];
-        struct sk_buff_head rx_recycle;
        struct ugeth_mii_info *mii_info;
        struct phy_device *phydev;
        phy_interface_t phy_interface;
diff --git a/drivers/net/ethernet/ibm/ehea/ehea.h b/drivers/net/ethernet/ibm/ehea/ehea.h
index b8e46cc31e53..6be7b9839f35 100644
--- a/drivers/net/ethernet/ibm/ehea/ehea.h
+++ b/drivers/net/ethernet/ibm/ehea/ehea.h
@@ -35,7 +35,6 @@
 #include <linux/if_vlan.h>
 #include <asm/ibmebus.h>
-#include <asm/abs_addr.h>
 #include <asm/io.h>
 #define DRV_NAME        "ehea"
diff --git a/drivers/net/ethernet/ibm/ehea/ehea_phyp.c b/drivers/net/ethernet/ibm/ehea/ehea_phyp.c
index 30f903332e92..d3a130ccdcc8 100644
--- a/drivers/net/ethernet/ibm/ehea/ehea_phyp.c
+++ b/drivers/net/ethernet/ibm/ehea/ehea_phyp.c
@@ -141,7 +141,7 @@ u64 ehea_h_query_ehea_qp(const u64 adapter_handle, const u8 qp_category,
                                       qp_category,             /* R5 */
                                       qp_handle,               /* R6 */
                                       sel_mask,                /* R7 */
-                                       virt_to_abs(cb_addr),    /* R8 */
+                                       __pa(cb_addr),           /* R8 */
                                       0, 0);
 }
@@ -415,7 +415,7 @@ u64 ehea_h_modify_ehea_qp(const u64 adapter_handle, const u8 cat,
                                 (u64) cat,                     /* R5 */
                                 qp_handle,                     /* R6 */
                                 sel_mask,                      /* R7 */
-                                 virt_to_abs(cb_addr),          /* R8 */
+                                 __pa(cb_addr),                 /* R8 */
                                 0, 0, 0, 0);                   /* R9-R12 */
        *inv_attr_id = outs[0];
@@ -528,7 +528,7 @@ u64 ehea_h_query_ehea(const u64 adapter_handle, void *cb_addr)
 {
        u64 hret, cb_logaddr;
-        cb_logaddr = virt_to_abs(cb_addr);
+        cb_logaddr = __pa(cb_addr);
        hret = ehea_plpar_hcall_norets(H_QUERY_HEA,
                                       adapter_handle,          /* R4 */
@@ -545,7 +545,7 @@ u64 ehea_h_query_ehea_port(const u64 adapter_handle, const u16 port_num,
                           void *cb_addr)
 {
        u64 port_info;
-        u64 cb_logaddr = virt_to_abs(cb_addr);
+        u64 cb_logaddr = __pa(cb_addr);
        u64 arr_index = 0;
        port_info = EHEA_BMASK_SET(H_MEHEAPORT_CAT, cb_cat)
@@ -567,7 +567,7 @@ u64 ehea_h_modify_ehea_port(const u64 adapter_handle, const u16 port_num,
        unsigned long outs[PLPAR_HCALL9_BUFSIZE];
        u64 port_info;
        u64 arr_index = 0;
-        u64 cb_logaddr = virt_to_abs(cb_addr);
+        u64 cb_logaddr = __pa(cb_addr);
        port_info = EHEA_BMASK_SET(H_MEHEAPORT_CAT, cb_cat)
                  | EHEA_BMASK_SET(H_MEHEAPORT_PN, port_num);
@@ -621,6 +621,6 @@ u64 ehea_h_error_data(const u64 adapter_handle, const u64 ressource_handle,
        return ehea_plpar_hcall_norets(H_ERROR_DATA,
                                       adapter_handle,          /* R4 */
                                       ressource_handle,        /* R5 */
-                                       virt_to_abs(rblock),     /* R6 */
+                                       __pa(rblock),            /* R6 */
                                       0, 0, 0, 0);             /* R7-R12 */
 }
diff --git a/drivers/net/ethernet/ibm/ehea/ehea_qmr.c b/drivers/net/ethernet/ibm/ehea/ehea_qmr.c
index cb66f574dc97..27f881758d16 100644
--- a/drivers/net/ethernet/ibm/ehea/ehea_qmr.c
+++ b/drivers/net/ethernet/ibm/ehea/ehea_qmr.c
@@ -163,7 +163,7 @@ struct ehea_cq *ehea_create_cq(struct ehea_adapter *adapter,
                        goto out_kill_hwq;
                }
-                rpage = virt_to_abs(vpage);
+                rpage = __pa(vpage);
                hret = ehea_h_register_rpage(adapter->handle,
                                             0, EHEA_CQ_REGISTER_ORIG,
                                             cq->fw_handle, rpage, 1);
@@ -290,7 +290,7 @@ struct ehea_eq *ehea_create_eq(struct ehea_adapter *adapter,
                        goto out_kill_hwq;
                }
-                rpage = virt_to_abs(vpage);
+                rpage = __pa(vpage);
                hret = ehea_h_register_rpage(adapter->handle, 0,
                                             EHEA_EQ_REGISTER_ORIG,
@@ -395,7 +395,7 @@ static int ehea_qp_alloc_register(struct ehea_qp *qp, struct hw_queue *hw_queue,
                        pr_err("hw_qpageit_get_inc failed\n");
                        goto out_kill_hwq;
                }
-                rpage = virt_to_abs(vpage);
+                rpage = __pa(vpage);
                hret = ehea_h_register_rpage(adapter->handle,
                                             0, h_call_q_selector,
                                             qp->fw_handle, rpage, 1);
@@ -790,7 +790,7 @@ u64 ehea_map_vaddr(void *caddr)
        if (!ehea_bmap)
                return EHEA_INVAL_ADDR;
-        index = virt_to_abs(caddr) >> SECTION_SIZE_BITS;
+        index = __pa(caddr) >> SECTION_SIZE_BITS;
        top = (index >> EHEA_TOP_INDEX_SHIFT) & EHEA_INDEX_MASK;
        if (!ehea_bmap->top[top])
                return EHEA_INVAL_ADDR;
@@ -812,7 +812,7 @@ static inline void *ehea_calc_sectbase(int top, int dir, int idx)
        unsigned long ret = idx;
        ret |= dir << EHEA_DIR_INDEX_SHIFT;
        ret |= top << EHEA_TOP_INDEX_SHIFT;
-        return abs_to_virt(ret << SECTION_SIZE_BITS);
+        return __va(ret << SECTION_SIZE_BITS);
 }
 static u64 ehea_reg_mr_section(int top, int dir, int idx, u64 *pt,
@@ -822,7 +822,7 @@ static u64 ehea_reg_mr_section(int top, int dir, int idx, u64 *pt,
        void *pg;
        u64 j, m, hret;
        unsigned long k = 0;
-        u64 pt_abs = virt_to_abs(pt);
+        u64 pt_abs = __pa(pt);
        void *sectbase = ehea_calc_sectbase(top, dir, idx);
@@ -830,7 +830,7 @@ static u64 ehea_reg_mr_section(int top, int dir, int idx, u64 *pt,
                for (m = 0; m < EHEA_MAX_RPAGE; m++) {
                        pg = sectbase + ((k++) * EHEA_PAGESIZE);
-                        pt[m] = virt_to_abs(pg);
+                        pt[m] = __pa(pg);
                }
                hret = ehea_h_register_rpage_mr(adapter->handle, mr->handle, 0,
                                                0, pt_abs, EHEA_MAX_RPAGE);
diff --git a/drivers/net/ethernet/intel/e1000e/e1000.h b/drivers/net/ethernet/intel/e1000e/e1000.h
index cb3356c9af80..04668b47a1df 100644
--- a/drivers/net/ethernet/intel/e1000e/e1000.h
+++ b/drivers/net/ethernet/intel/e1000e/e1000.h
@@ -175,13 +175,13 @@ struct e1000_info;
 /*
 * in the case of WTHRESH, it appears at least the 82571/2 hardware
 * writes back 4 descriptors when WTHRESH=5, and 3 descriptors when
- * WTHRESH=4, and since we want 64 bytes at a time written back, set
+ * WTHRESH=4, so a setting of 5 gives the most efficient bus
- * it to 5
+ * utilization but to avoid possible Tx stalls, set it to 1
 */
 #define E1000_TXDCTL_DMA_BURST_ENABLE                          \
        (E1000_TXDCTL_GRAN | /* set descriptor granularity */  \
         E1000_TXDCTL_COUNT_DESC |                             \
-         (5 << 16) | /* wthresh must be +1 more than desired */\
+         (1 << 16) | /* wthresh must be +1 more than desired */\
         (1 << 8)  | /* hthresh */                             \
         0x1f)       /* pthresh */
diff --git a/drivers/net/ethernet/intel/e1000e/hw.h b/drivers/net/ethernet/intel/e1000e/hw.h
index ed5b40985edb..d37bfd96c987 100644
--- a/drivers/net/ethernet/intel/e1000e/hw.h
+++ b/drivers/net/ethernet/intel/e1000e/hw.h
@@ -412,6 +412,8 @@ enum e1e_registers {
 #define E1000_DEV_ID_PCH2_LV_V                  0x1503
 #define E1000_DEV_ID_PCH_LPT_I217_LM            0x153A
 #define E1000_DEV_ID_PCH_LPT_I217_V             0x153B
+#define E1000_DEV_ID_PCH_LPTLP_I218_LM          0x155A
+#define E1000_DEV_ID_PCH_LPTLP_I218_V           0x1559
 #define E1000_REVISION_4 4
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index fb659dd8db03..f444eb0b76d8 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -2831,7 +2831,7 @@ static void e1000_configure_tx(struct e1000_adapter *adapter)
                 * set up some performance related parameters to encourage the
                 * hardware to use the bus more efficiently in bursts, depends
                 * on the tx_int_delay to be enabled,
-                 * wthresh = 5 ==> burst write a cacheline (64 bytes) at a time
+                 * wthresh = 1 ==> burst write is disabled to avoid Tx stalls
                 * hthresh = 1 ==> prefetch when one or more available
                 * pthresh = 0x1f ==> prefetch if internal cache 31 or less
                 * BEWARE: this seems to work but should be considered first if
@@ -6558,6 +6558,8 @@ static DEFINE_PCI_DEVICE_TABLE(e1000_pci_tbl) = {
        { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_LPT_I217_LM), board_pch_lpt },
        { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_LPT_I217_V), board_pch_lpt },
+        { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_LPTLP_I218_LM), board_pch_lpt },
+        { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_LPTLP_I218_V), board_pch_lpt },
        { 0, 0, 0, 0, 0, 0, 0 } /* terminate list */
 };
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe.h b/drivers/net/ethernet/intel/ixgbe/ixgbe.h
index 5bd26763554c..30efc9f0f47a 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe.h
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe.h
@@ -410,7 +410,7 @@ static inline u16 ixgbe_desc_unused(struct ixgbe_ring *ring)
 #define IXGBE_TX_CTXTDESC(R, i)     \
        (&(((struct ixgbe_adv_tx_context_desc *)((R)->desc))[i]))
-#define IXGBE_MAX_JUMBO_FRAME_SIZE        16128
+#define IXGBE_MAX_JUMBO_FRAME_SIZE      9728 /* Maximum Supported Size 9.5KB */
 #ifdef IXGBE_FCOE
 /* Use 3K as the baby jumbo frame size for FCoE */
 #define IXGBE_FCOE_JUMBO_FRAME_SIZE       3072
diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h b/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h
index 383b4e1cd175..4a9c9c285685 100644
--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h
+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h
@@ -175,7 +175,7 @@ struct ixgbevf_q_vector {
 #define IXGBEVF_TX_CTXTDESC(R, i)           \
        (&(((struct ixgbe_adv_tx_context_desc *)((R)->desc))[i]))
-#define IXGBE_MAX_JUMBO_FRAME_SIZE        16128
+#define IXGBE_MAX_JUMBO_FRAME_SIZE      9728 /* Maximum Supported Size 9.5KB */
 #define OTHER_VECTOR 1
 #define NON_Q_VECTORS (OTHER_VECTOR)
diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
index 0ee9bd4819f4..de1ad506665d 100644
--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
@@ -1747,6 +1747,7 @@ err_tx_ring_allocation:
 **/
 static int ixgbevf_set_interrupt_capability(struct ixgbevf_adapter *adapter)
 {
+        struct net_device *netdev = adapter->netdev;
        int err = 0;
        int vector, v_budget;
@@ -1775,6 +1776,12 @@ static int ixgbevf_set_interrupt_capability(struct ixgbevf_adapter *adapter)
        ixgbevf_acquire_msix_vectors(adapter, v_budget);
+        err = netif_set_real_num_tx_queues(netdev, adapter->num_tx_queues);
+        if (err)
+                goto out;
+        err = netif_set_real_num_rx_queues(netdev, adapter->num_rx_queues);
 out:
        return err;
 }
diff --git a/drivers/net/ethernet/jme.c b/drivers/net/ethernet/jme.c
index c911d883c27e..f8064df10cc4 100644
--- a/drivers/net/ethernet/jme.c
+++ b/drivers/net/ethernet/jme.c
@@ -27,6 +27,7 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/pci.h>
+#include <linux/pci-aspm.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/ethtool.h>
@@ -2973,6 +2974,9 @@ jme_init_one(struct pci_dev *pdev,
        /*
         * set up PCI device basics
         */
+        pci_disable_link_state(pdev, PCIE_LINK_STATE_L0S | PCIE_LINK_STATE_L1 |
+                               PCIE_LINK_STATE_CLKPM);
        rc = pci_enable_device(pdev);
        if (rc) {
                pr_err("Cannot enable PCI device\n");
diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c
index 087b9e0669f1..84c13263c514 100644
--- a/drivers/net/ethernet/marvell/mv643xx_eth.c
+++ b/drivers/net/ethernet/marvell/mv643xx_eth.c
@@ -412,7 +412,6 @@ struct mv643xx_eth_private {
        u8 work_rx_refill;
        int skb_size;
-        struct sk_buff_head rx_recycle;
        /*
         * RX state.
@@ -673,9 +672,7 @@ static int rxq_refill(struct rx_queue *rxq, int budget)
                struct rx_desc *rx_desc;
                int size;
-                skb = __skb_dequeue(&mp->rx_recycle);
+                skb = netdev_alloc_skb(mp->dev, mp->skb_size);
-                if (skb == NULL)
-                        skb = netdev_alloc_skb(mp->dev, mp->skb_size);
                if (skb == NULL) {
                        mp->oom = 1;
@@ -989,14 +986,7 @@ static int txq_reclaim(struct tx_queue *txq, int budget, int force)
                                       desc->byte_cnt, DMA_TO_DEVICE);
                }
-                if (skb != NULL) {
+                dev_kfree_skb(skb);
-                        if (skb_queue_len(&mp->rx_recycle) <
-                                        mp->rx_ring_size &&
-                            skb_recycle_check(skb, mp->skb_size))
-                                __skb_queue_head(&mp->rx_recycle, skb);
-                        else
-                                dev_kfree_skb(skb);
-                }
        }
        __netif_tx_unlock(nq);
@@ -2349,8 +2339,6 @@ static int mv643xx_eth_open(struct net_device *dev)
        napi_enable(&mp->napi);
-        skb_queue_head_init(&mp->rx_recycle);
        mp->int_mask = INT_EXT;
        for (i = 0; i < mp->rxq_count; i++) {
@@ -2445,8 +2433,6 @@ static int mv643xx_eth_stop(struct net_device *dev)
        mib_counters_update(mp);
        del_timer_sync(&mp->mib_counters_timer);
-        skb_queue_purge(&mp->rx_recycle);
        for (i = 0; i < mp->rxq_count; i++)
                rxq_deinit(mp->rxq + i);
        for (i = 0; i < mp->txq_count; i++)
diff --git a/drivers/net/ethernet/marvell/skge.c b/drivers/net/ethernet/marvell/skge.c
index 5a30bf823099..9b9c2ac5c4c2 100644
--- a/drivers/net/ethernet/marvell/skge.c
+++ b/drivers/net/ethernet/marvell/skge.c
@@ -3189,7 +3189,7 @@ static int skge_poll(struct napi_struct *napi, int to_do)
        if (work_done < to_do) {
                unsigned long flags;
-                napi_gro_flush(napi);
+                napi_gro_flush(napi, false);
                spin_lock_irqsave(&hw->hw_lock, flags);
                __napi_complete(napi);
                hw->intr_mask |= napimask[skge->port];
@@ -3945,8 +3945,10 @@ static int __devinit skge_probe(struct pci_dev *pdev,
                skge_board_name(hw), hw->chip_rev);
        dev = skge_devinit(hw, 0, using_dac);
-        if (!dev)
+        if (!dev) {
+                err = -ENOMEM;
                goto err_out_led_off;
+        }
        /* Some motherboards are broken and has zero in ROM. */
        if (!is_valid_ether_addr(dev->dev_addr))
@@ -4153,6 +4155,13 @@ static struct dmi_system_id skge_32bit_dma_boards[] = {
                        DMI_MATCH(DMI_BOARD_NAME, "nForce"),
                },
        },
+        {
+                .ident = "ASUS P5NSLI",
+                .matches = {
+                        DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK Computer INC."),
+                        DMI_MATCH(DMI_BOARD_NAME, "P5NSLI")
+                },
+        },
        {}
 };
diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c
index 2b0748dba8b8..78946feab4a2 100644
--- a/drivers/net/ethernet/marvell/sky2.c
+++ b/drivers/net/ethernet/marvell/sky2.c
@@ -4924,6 +4924,7 @@ static int __devinit sky2_probe(struct pci_dev *pdev,
        if (~reg == 0) {
                dev_err(&pdev->dev, "PCI configuration read error\n");
+                err = -EIO;
                goto err_out;
        }
@@ -4993,8 +4994,10 @@ static int __devinit sky2_probe(struct pci_dev *pdev,
        hw->st_size = hw->ports * roundup_pow_of_two(3*RX_MAX_PENDING + TX_MAX_PENDING);
        hw->st_le = pci_alloc_consistent(pdev, hw->st_size * sizeof(struct sky2_status_le),
                                         &hw->st_dma);
-        if (!hw->st_le)
+        if (!hw->st_le) {
+                err = -ENOMEM;
                goto err_out_reset;
+        }
        dev_info(&pdev->dev, "Yukon-2 %s chip revision %d\n",
                 sky2_name(hw->chip_id, buf1, sizeof(buf1)), hw->chip_rev);
diff --git a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
index ba6506ff4abb..926c911c0ac4 100644
--- a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
+++ b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
@@ -3094,6 +3094,8 @@ int mlx4_QP_FLOW_STEERING_ATTACH_wrapper(struct mlx4_dev *dev, int slave,
                if (validate_eth_header_mac(slave, rule_header, rlist))
                        return -EINVAL;
                break;
+        case MLX4_NET_TRANS_RULE_ID_IB:
+                break;
        case MLX4_NET_TRANS_RULE_ID_IPV4:
        case MLX4_NET_TRANS_RULE_ID_TCP:
        case MLX4_NET_TRANS_RULE_ID_UDP:
diff --git a/drivers/net/ethernet/natsemi/natsemi.c b/drivers/net/ethernet/natsemi/natsemi.c
index 5b61d12f8b91..dbaaa99a0d43 100644
--- a/drivers/net/ethernet/natsemi/natsemi.c
+++ b/drivers/net/ethernet/natsemi/natsemi.c
@@ -947,8 +947,8 @@ static int __devinit natsemi_probe1 (struct pci_dev *pdev,
        i = register_netdev(dev);
        if (i)
                goto err_register_netdev;
+        i = NATSEMI_CREATE_FILE(pdev, dspcfg_workaround);
-        if (NATSEMI_CREATE_FILE(pdev, dspcfg_workaround))
+        if (i)
                goto err_create_file;
        if (netif_msg_drv(np)) {
diff --git a/drivers/net/ethernet/natsemi/xtsonic.c b/drivers/net/ethernet/natsemi/xtsonic.c
index e01c0a07a93a..7dfe88398d7d 100644
--- a/drivers/net/ethernet/natsemi/xtsonic.c
+++ b/drivers/net/ethernet/natsemi/xtsonic.c
@@ -205,6 +205,7 @@ static int __init sonic_probe1(struct net_device *dev)
        if (lp->descriptors == NULL) {
                printk(KERN_ERR "%s: couldn't alloc DMA memory for "
                                " descriptors.\n", dev_name(lp->device));
+                err = -ENOMEM;
                goto out;
        }
diff --git a/drivers/net/ethernet/octeon/octeon_mgmt.c b/drivers/net/ethernet/octeon/octeon_mgmt.c
index a688a2ddcfd6..f97719c48516 100644
--- a/drivers/net/ethernet/octeon/octeon_mgmt.c
+++ b/drivers/net/ethernet/octeon/octeon_mgmt.c
@@ -3,13 +3,14 @@
 * License.  See the file "COPYING" in the main directory of this archive
 * for more details.
 *
- * Copyright (C) 2009 Cavium Networks
+ * Copyright (C) 2009-2012 Cavium, Inc
 */
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
 #include <linux/etherdevice.h>
 #include <linux/capability.h>
+#include <linux/net_tstamp.h>
 #include <linux/interrupt.h>
 #include <linux/netdevice.h>
 #include <linux/spinlock.h>
@@ -33,8 +34,7 @@
 #define OCTEON_MGMT_NAPI_WEIGHT 16
-/*
+/* Ring sizes that are powers of two allow for more efficient modulo
- * Ring sizes that are powers of two allow for more efficient modulo
 * opertions.
 */
 #define OCTEON_MGMT_RX_RING_SIZE 512
@@ -93,6 +93,7 @@ union mgmt_port_ring_entry {
 #define AGL_GMX_RX_ADR_CAM4             0x1a0
 #define AGL_GMX_RX_ADR_CAM5             0x1a8
+#define AGL_GMX_TX_CLK                  0x208
 #define AGL_GMX_TX_STATS_CTL            0x268
 #define AGL_GMX_TX_CTL                  0x270
 #define AGL_GMX_TX_STAT0                0x280
@@ -110,8 +111,10 @@ struct octeon_mgmt {
        struct net_device *netdev;
        u64 mix;
        u64 agl;
+        u64 agl_prt_ctl;
        int port;
        int irq;
+        bool has_rx_tstamp;
        u64 *tx_ring;
        dma_addr_t tx_ring_handle;
        unsigned int tx_next;
@@ -131,6 +134,7 @@ struct octeon_mgmt {
        spinlock_t lock;
        unsigned int last_duplex;
        unsigned int last_link;
+        unsigned int last_speed;
        struct device *dev;
        struct napi_struct napi;
        struct tasklet_struct tx_clean_tasklet;
@@ -140,6 +144,8 @@ struct octeon_mgmt {
        resource_size_t mix_size;
        resource_size_t agl_phys;
        resource_size_t agl_size;
+        resource_size_t agl_prt_ctl_phys;
+        resource_size_t agl_prt_ctl_size;
 };
 static void octeon_mgmt_set_rx_irq(struct octeon_mgmt *p, int enable)
@@ -166,22 +172,22 @@ static void octeon_mgmt_set_tx_irq(struct octeon_mgmt *p, int enable)
        spin_unlock_irqrestore(&p->lock, flags);
 }
-static inline void octeon_mgmt_enable_rx_irq(struct octeon_mgmt *p)
+static void octeon_mgmt_enable_rx_irq(struct octeon_mgmt *p)
 {
        octeon_mgmt_set_rx_irq(p, 1);
 }
-static inline void octeon_mgmt_disable_rx_irq(struct octeon_mgmt *p)
+static void octeon_mgmt_disable_rx_irq(struct octeon_mgmt *p)
 {
        octeon_mgmt_set_rx_irq(p, 0);
 }
-static inline void octeon_mgmt_enable_tx_irq(struct octeon_mgmt *p)
+static void octeon_mgmt_enable_tx_irq(struct octeon_mgmt *p)
 {
        octeon_mgmt_set_tx_irq(p, 1);
 }
-static inline void octeon_mgmt_disable_tx_irq(struct octeon_mgmt *p)
+static void octeon_mgmt_disable_tx_irq(struct octeon_mgmt *p)
 {
        octeon_mgmt_set_tx_irq(p, 0);
 }
@@ -233,6 +239,28 @@ static void octeon_mgmt_rx_fill_ring(struct net_device *netdev)
        }
 }
+static ktime_t ptp_to_ktime(u64 ptptime)
+{
+        ktime_t ktimebase;
+        u64 ptpbase;
+        unsigned long flags;
+        local_irq_save(flags);
+        /* Fill the icache with the code */
+        ktime_get_real();
+        /* Flush all pending operations */
+        mb();
+        /* Read the time and PTP clock as close together as
+         * possible. It is important that this sequence take the same
+         * amount of time to reduce jitter
+         */
+        ktimebase = ktime_get_real();
+        ptpbase = cvmx_read_csr(CVMX_MIO_PTP_CLOCK_HI);
+        local_irq_restore(flags);
+        return ktime_sub_ns(ktimebase, ptpbase - ptptime);
+}
 static void octeon_mgmt_clean_tx_buffers(struct octeon_mgmt *p)
 {
        union cvmx_mixx_orcnt mix_orcnt;
@@ -272,6 +300,20 @@ static void octeon_mgmt_clean_tx_buffers(struct octeon_mgmt *p)
                dma_unmap_single(p->dev, re.s.addr, re.s.len,
                                 DMA_TO_DEVICE);
+                /* Read the hardware TX timestamp if one was recorded */
+                if (unlikely(re.s.tstamp)) {
+                        struct skb_shared_hwtstamps ts;
+                        /* Read the timestamp */
+                        u64 ns = cvmx_read_csr(CVMX_MIXX_TSTAMP(p->port));
+                        /* Remove the timestamp from the FIFO */
+                        cvmx_write_csr(CVMX_MIXX_TSCTL(p->port), 0);
+                        /* Tell the kernel about the timestamp */
+                        ts.syststamp = ptp_to_ktime(ns);
+                        ts.hwtstamp = ns_to_ktime(ns);
+                        skb_tstamp_tx(skb, &ts);
+                }
                dev_kfree_skb_any(skb);
                cleaned++;
@@ -372,14 +414,23 @@ static int octeon_mgmt_receive_one(struct octeon_mgmt *p)
                /* A good packet, send it up. */
                skb_put(skb, re.s.len);
 good:
+                /* Process the RX timestamp if it was recorded */
+                if (p->has_rx_tstamp) {
+                        /* The first 8 bytes are the timestamp */
+                        u64 ns = *(u64 *)skb->data;
+                        struct skb_shared_hwtstamps *ts;
+                        ts = skb_hwtstamps(skb);
+                        ts->hwtstamp = ns_to_ktime(ns);
+                        ts->syststamp = ptp_to_ktime(ns);
+                        __skb_pull(skb, 8);
+                }
                skb->protocol = eth_type_trans(skb, netdev);
                netdev->stats.rx_packets++;
                netdev->stats.rx_bytes += skb->len;
                netif_receive_skb(skb);
                rc = 0;
        } else if (re.s.code == RING_ENTRY_CODE_MORE) {
-                /*
+                /* Packet split across skbs.  This can happen if we
-                 * Packet split across skbs.  This can happen if we
                 * increase the MTU.  Buffers that are already in the
                 * rx ring can then end up being too small.  As the rx
                 * ring is refilled, buffers sized for the new MTU
@@ -409,8 +460,7 @@ good:
        } else {
                /* Some other error, discard it. */
                dev_kfree_skb_any(skb);
-                /*
+                /* Error statistics are accumulated in
-                 * Error statistics are accumulated in
                 * octeon_mgmt_update_rx_stats.
                 */
        }
@@ -488,7 +538,7 @@ static void octeon_mgmt_reset_hw(struct octeon_mgmt *p)
        mix_ctl.s.reset = 1;
        cvmx_write_csr(p->mix + MIX_CTL, mix_ctl.u64);
        cvmx_read_csr(p->mix + MIX_CTL);
-        cvmx_wait(64);
+        octeon_io_clk_delay(64);
        mix_bist.u64 = cvmx_read_csr(p->mix + MIX_BIST);
        if (mix_bist.u64)
@@ -537,8 +587,7 @@ static void octeon_mgmt_set_rx_filtering(struct net_device *netdev)
                cam_mode = 0;
                available_cam_entries = 8;
        } else {
-                /*
+                /* One CAM entry for the primary address, leaves seven
-                 * One CAM entry for the primary address, leaves seven
                 * for the secondary addresses.
                 */
                available_cam_entries = 7 - netdev->uc.count;
@@ -595,12 +644,10 @@ static void octeon_mgmt_set_rx_filtering(struct net_device *netdev)
 static int octeon_mgmt_set_mac_address(struct net_device *netdev, void *addr)
 {
-        struct sockaddr *sa = addr;
+        int r = eth_mac_addr(netdev, addr);
-        if (!is_valid_ether_addr(sa->sa_data))
+        if (r)
-                return -EADDRNOTAVAIL;
+                return r;
-        memcpy(netdev->dev_addr, sa->sa_data, ETH_ALEN);
        octeon_mgmt_set_rx_filtering(netdev);
@@ -612,8 +659,7 @@ static int octeon_mgmt_change_mtu(struct net_device *netdev, int new_mtu)
        struct octeon_mgmt *p = netdev_priv(netdev);
        int size_without_fcs = new_mtu + OCTEON_MGMT_RX_HEADROOM;
-        /*
+        /* Limit the MTU to make sure the ethernet packets are between
-         * Limit the MTU to make sure the ethernet packets are between
         * 64 bytes and 16383 bytes.
         */
        if (size_without_fcs < 64 || size_without_fcs > 16383) {
@@ -656,53 +702,258 @@ static irqreturn_t octeon_mgmt_interrupt(int cpl, void *dev_id)
        return IRQ_HANDLED;
 }
+static int octeon_mgmt_ioctl_hwtstamp(struct net_device *netdev,
+                                      struct ifreq *rq, int cmd)
+{
+        struct octeon_mgmt *p = netdev_priv(netdev);
+        struct hwtstamp_config config;
+        union cvmx_mio_ptp_clock_cfg ptp;
+        union cvmx_agl_gmx_rxx_frm_ctl rxx_frm_ctl;
+        bool have_hw_timestamps = false;
+        if (copy_from_user(&config, rq->ifr_data, sizeof(config)))
+                return -EFAULT;
+        if (config.flags) /* reserved for future extensions */
+                return -EINVAL;
+        /* Check the status of hardware for tiemstamps */
+        if (OCTEON_IS_MODEL(OCTEON_CN6XXX)) {
+                /* Get the current state of the PTP clock */
+                ptp.u64 = cvmx_read_csr(CVMX_MIO_PTP_CLOCK_CFG);
+                if (!ptp.s.ext_clk_en) {
+                        /* The clock has not been configured to use an
+                         * external source.  Program it to use the main clock
+                         * reference.
+                         */
+                        u64 clock_comp = (NSEC_PER_SEC << 32) / octeon_get_io_clock_rate();
+                        if (!ptp.s.ptp_en)
+                                cvmx_write_csr(CVMX_MIO_PTP_CLOCK_COMP, clock_comp);
+                        pr_info("PTP Clock: Using sclk reference at %lld Hz\n",
+                                (NSEC_PER_SEC << 32) / clock_comp);
+                } else {
+                        /* The clock is already programmed to use a GPIO */
+                        u64 clock_comp = cvmx_read_csr(CVMX_MIO_PTP_CLOCK_COMP);
+                        pr_info("PTP Clock: Using GPIO %d at %lld Hz\n",
+                                ptp.s.ext_clk_in,
+                                (NSEC_PER_SEC << 32) / clock_comp);
+                }
+                /* Enable the clock if it wasn't done already */
+                if (!ptp.s.ptp_en) {
+                        ptp.s.ptp_en = 1;
+                        cvmx_write_csr(CVMX_MIO_PTP_CLOCK_CFG, ptp.u64);
+                }
+                have_hw_timestamps = true;
+        }
+        if (!have_hw_timestamps)
+                return -EINVAL;
+        switch (config.tx_type) {
+        case HWTSTAMP_TX_OFF:
+        case HWTSTAMP_TX_ON:
+                break;
+        default:
+                return -ERANGE;
+        }
+        switch (config.rx_filter) {
+        case HWTSTAMP_FILTER_NONE:
+                p->has_rx_tstamp = false;
+                rxx_frm_ctl.u64 = cvmx_read_csr(p->agl + AGL_GMX_RX_FRM_CTL);
+                rxx_frm_ctl.s.ptp_mode = 0;
+                cvmx_write_csr(p->agl + AGL_GMX_RX_FRM_CTL, rxx_frm_ctl.u64);
+                break;
+        case HWTSTAMP_FILTER_ALL:
+        case HWTSTAMP_FILTER_SOME:
+        case HWTSTAMP_FILTER_PTP_V1_L4_EVENT:
+        case HWTSTAMP_FILTER_PTP_V1_L4_SYNC:
+        case HWTSTAMP_FILTER_PTP_V1_L4_DELAY_REQ:
+        case HWTSTAMP_FILTER_PTP_V2_L4_EVENT:
+        case HWTSTAMP_FILTER_PTP_V2_L4_SYNC:
+        case HWTSTAMP_FILTER_PTP_V2_L4_DELAY_REQ:
+        case HWTSTAMP_FILTER_PTP_V2_L2_EVENT:
+        case HWTSTAMP_FILTER_PTP_V2_L2_SYNC:
+        case HWTSTAMP_FILTER_PTP_V2_L2_DELAY_REQ:
+        case HWTSTAMP_FILTER_PTP_V2_EVENT:
+        case HWTSTAMP_FILTER_PTP_V2_SYNC:
+        case HWTSTAMP_FILTER_PTP_V2_DELAY_REQ:
+                p->has_rx_tstamp = have_hw_timestamps;
+                config.rx_filter = HWTSTAMP_FILTER_ALL;
+                if (p->has_rx_tstamp) {
+                        rxx_frm_ctl.u64 = cvmx_read_csr(p->agl + AGL_GMX_RX_FRM_CTL);
+                        rxx_frm_ctl.s.ptp_mode = 1;
+                        cvmx_write_csr(p->agl + AGL_GMX_RX_FRM_CTL, rxx_frm_ctl.u64);
+                }
+                break;
+        default:
+                return -ERANGE;
+        }
+        if (copy_to_user(rq->ifr_data, &config, sizeof(config)))
+                return -EFAULT;
+        return 0;
+}
 static int octeon_mgmt_ioctl(struct net_device *netdev,
                             struct ifreq *rq, int cmd)
 {
        struct octeon_mgmt *p = netdev_priv(netdev);
-        if (!netif_running(netdev))
+        switch (cmd) {
+        case SIOCSHWTSTAMP:
+                return octeon_mgmt_ioctl_hwtstamp(netdev, rq, cmd);
+        default:
+                if (p->phydev)
+                        return phy_mii_ioctl(p->phydev, rq, cmd);
                return -EINVAL;
+        }
+}
-        if (!p->phydev)
+static void octeon_mgmt_disable_link(struct octeon_mgmt *p)
-                return -EINVAL;
+{
+        union cvmx_agl_gmx_prtx_cfg prtx_cfg;
-        return phy_mii_ioctl(p->phydev, rq, cmd);
+        /* Disable GMX before we make any changes. */
+        prtx_cfg.u64 = cvmx_read_csr(p->agl + AGL_GMX_PRT_CFG);
+        prtx_cfg.s.en = 0;
+        prtx_cfg.s.tx_en = 0;
+        prtx_cfg.s.rx_en = 0;
+        cvmx_write_csr(p->agl + AGL_GMX_PRT_CFG, prtx_cfg.u64);
+        if (OCTEON_IS_MODEL(OCTEON_CN6XXX)) {
+                int i;
+                for (i = 0; i < 10; i++) {
+                        prtx_cfg.u64 = cvmx_read_csr(p->agl + AGL_GMX_PRT_CFG);
+                        if (prtx_cfg.s.tx_idle == 1 || prtx_cfg.s.rx_idle == 1)
+                                break;
+                        mdelay(1);
+                        i++;
+                }
+        }
+}
+static void octeon_mgmt_enable_link(struct octeon_mgmt *p)
+{
+        union cvmx_agl_gmx_prtx_cfg prtx_cfg;
+        /* Restore the GMX enable state only if link is set */
+        prtx_cfg.u64 = cvmx_read_csr(p->agl + AGL_GMX_PRT_CFG);
+        prtx_cfg.s.tx_en = 1;
+        prtx_cfg.s.rx_en = 1;
+        prtx_cfg.s.en = 1;
+        cvmx_write_csr(p->agl + AGL_GMX_PRT_CFG, prtx_cfg.u64);
+}
+static void octeon_mgmt_update_link(struct octeon_mgmt *p)
+{
+        union cvmx_agl_gmx_prtx_cfg prtx_cfg;
+        prtx_cfg.u64 = cvmx_read_csr(p->agl + AGL_GMX_PRT_CFG);
+        if (!p->phydev->link)
+                prtx_cfg.s.duplex = 1;
+        else
+                prtx_cfg.s.duplex = p->phydev->duplex;
+        switch (p->phydev->speed) {
+        case 10:
+                prtx_cfg.s.speed = 0;
+                prtx_cfg.s.slottime = 0;
+                if (OCTEON_IS_MODEL(OCTEON_CN6XXX)) {
+                        prtx_cfg.s.burst = 1;
+                        prtx_cfg.s.speed_msb = 1;
+                }
+                break;
+        case 100:
+                prtx_cfg.s.speed = 0;
+                prtx_cfg.s.slottime = 0;
+                if (OCTEON_IS_MODEL(OCTEON_CN6XXX)) {
+                        prtx_cfg.s.burst = 1;
+                        prtx_cfg.s.speed_msb = 0;
+                }
+                break;
+        case 1000:
+                /* 1000 MBits is only supported on 6XXX chips */
+                if (OCTEON_IS_MODEL(OCTEON_CN6XXX)) {
+                        prtx_cfg.s.speed = 1;
+                        prtx_cfg.s.speed_msb = 0;
+                        /* Only matters for half-duplex */
+                        prtx_cfg.s.slottime = 1;
+                        prtx_cfg.s.burst = p->phydev->duplex;
+                }
+                break;
+        case 0:  /* No link */
+        default:
+                break;
+        }
+        /* Write the new GMX setting with the port still disabled. */
+        cvmx_write_csr(p->agl + AGL_GMX_PRT_CFG, prtx_cfg.u64);
+        /* Read GMX CFG again to make sure the config is completed. */
+        prtx_cfg.u64 = cvmx_read_csr(p->agl + AGL_GMX_PRT_CFG);
+        if (OCTEON_IS_MODEL(OCTEON_CN6XXX)) {
+                union cvmx_agl_gmx_txx_clk agl_clk;
+                union cvmx_agl_prtx_ctl prtx_ctl;
+                prtx_ctl.u64 = cvmx_read_csr(p->agl_prt_ctl);
+                agl_clk.u64 = cvmx_read_csr(p->agl + AGL_GMX_TX_CLK);
+                /* MII (both speeds) and RGMII 1000 speed. */
+                agl_clk.s.clk_cnt = 1;
+                if (prtx_ctl.s.mode == 0) { /* RGMII mode */
+                        if (p->phydev->speed == 10)
+                                agl_clk.s.clk_cnt = 50;
+                        else if (p->phydev->speed == 100)
+                                agl_clk.s.clk_cnt = 5;
+                }
+                cvmx_write_csr(p->agl + AGL_GMX_TX_CLK, agl_clk.u64);
+        }
 }
 static void octeon_mgmt_adjust_link(struct net_device *netdev)
 {
        struct octeon_mgmt *p = netdev_priv(netdev);
-        union cvmx_agl_gmx_prtx_cfg prtx_cfg;
        unsigned long flags;
        int link_changed = 0;
+        if (!p->phydev)
+                return;
        spin_lock_irqsave(&p->lock, flags);
-        if (p->phydev->link) {
-                if (!p->last_link)
-                        link_changed = 1;
+        if (!p->phydev->link && p->last_link)
-                if (p->last_duplex != p->phydev->duplex) {
+                link_changed = -1;
-                        p->last_duplex = p->phydev->duplex;
-                        prtx_cfg.u64 = cvmx_read_csr(p->agl + AGL_GMX_PRT_CFG);
+        if (p->phydev->link
-                        prtx_cfg.s.duplex = p->phydev->duplex;
+            && (p->last_duplex != p->phydev->duplex
-                        cvmx_write_csr(p->agl + AGL_GMX_PRT_CFG, prtx_cfg.u64);
+                || p->last_link != p->phydev->link
-                }
+                || p->last_speed != p->phydev->speed)) {
-        } else {
+                octeon_mgmt_disable_link(p);
-                if (p->last_link)
+                link_changed = 1;
-                        link_changed = -1;
+                octeon_mgmt_update_link(p);
+                octeon_mgmt_enable_link(p);
        }
        p->last_link = p->phydev->link;
+        p->last_speed = p->phydev->speed;
+        p->last_duplex = p->phydev->duplex;
        spin_unlock_irqrestore(&p->lock, flags);
        if (link_changed != 0) {
                if (link_changed > 0) {
-                        netif_carrier_on(netdev);
                        pr_info("%s: Link is up - %d/%s\n", netdev->name,
                                p->phydev->speed,
                                DUPLEX_FULL == p->phydev->duplex ?
                                "Full" : "Half");
                } else {
-                        netif_carrier_off(netdev);
                        pr_info("%s: Link is down\n", netdev->name);
                }
        }
@@ -723,9 +974,7 @@ static int octeon_mgmt_init_phy(struct net_device *netdev)
                                   PHY_INTERFACE_MODE_MII);
        if (!p->phydev)
-                return -1;
+                return -ENODEV;
-        phy_start_aneg(p->phydev);
        return 0;
 }
@@ -733,12 +982,10 @@ static int octeon_mgmt_init_phy(struct net_device *netdev)
 static int octeon_mgmt_open(struct net_device *netdev)
 {
        struct octeon_mgmt *p = netdev_priv(netdev);
-        int port = p->port;
        union cvmx_mixx_ctl mix_ctl;
        union cvmx_agl_gmx_inf_mode agl_gmx_inf_mode;
        union cvmx_mixx_oring1 oring1;
        union cvmx_mixx_iring1 iring1;
-        union cvmx_agl_gmx_prtx_cfg prtx_cfg;
        union cvmx_agl_gmx_rxx_frm_ctl rxx_frm_ctl;
        union cvmx_mixx_irhwm mix_irhwm;
        union cvmx_mixx_orhwm mix_orhwm;
@@ -785,9 +1032,30 @@ static int octeon_mgmt_open(struct net_device *netdev)
                } while (mix_ctl.s.reset);
        }
-        agl_gmx_inf_mode.u64 = 0;
+        if (OCTEON_IS_MODEL(OCTEON_CN5XXX)) {
-        agl_gmx_inf_mode.s.en = 1;
+                agl_gmx_inf_mode.u64 = 0;
-        cvmx_write_csr(CVMX_AGL_GMX_INF_MODE, agl_gmx_inf_mode.u64);
+                agl_gmx_inf_mode.s.en = 1;
+                cvmx_write_csr(CVMX_AGL_GMX_INF_MODE, agl_gmx_inf_mode.u64);
+        }
+        if (OCTEON_IS_MODEL(OCTEON_CN56XX_PASS1_X)
+                || OCTEON_IS_MODEL(OCTEON_CN52XX_PASS1_X)) {
+                /* Force compensation values, as they are not
+                 * determined properly by HW
+                 */
+                union cvmx_agl_gmx_drv_ctl drv_ctl;
+                drv_ctl.u64 = cvmx_read_csr(CVMX_AGL_GMX_DRV_CTL);
+                if (p->port) {
+                        drv_ctl.s.byp_en1 = 1;
+                        drv_ctl.s.nctl1 = 6;
+                        drv_ctl.s.pctl1 = 6;
+                } else {
+                        drv_ctl.s.byp_en = 1;
+                        drv_ctl.s.nctl = 6;
+                        drv_ctl.s.pctl = 6;
+                }
+                cvmx_write_csr(CVMX_AGL_GMX_DRV_CTL, drv_ctl.u64);
+        }
        oring1.u64 = 0;
        oring1.s.obase = p->tx_ring_handle >> 3;
@@ -799,18 +1067,12 @@ static int octeon_mgmt_open(struct net_device *netdev)
        iring1.s.isize = OCTEON_MGMT_RX_RING_SIZE;
        cvmx_write_csr(p->mix + MIX_IRING1, iring1.u64);
-        /* Disable packet I/O. */
-        prtx_cfg.u64 = cvmx_read_csr(p->agl + AGL_GMX_PRT_CFG);
-        prtx_cfg.s.en = 0;
-        cvmx_write_csr(p->agl + AGL_GMX_PRT_CFG, prtx_cfg.u64);
        memcpy(sa.sa_data, netdev->dev_addr, ETH_ALEN);
        octeon_mgmt_set_mac_address(netdev, &sa);
        octeon_mgmt_change_mtu(netdev, netdev->mtu);
-        /*
+        /* Enable the port HW. Packets are not allowed until
-         * Enable the port HW. Packets are not allowed until
         * cvmx_mgmt_port_enable() is called.
         */
        mix_ctl.u64 = 0;
@@ -819,27 +1081,70 @@ static int octeon_mgmt_open(struct net_device *netdev)
        mix_ctl.s.nbtarb = 0;       /* Arbitration mode */
        /* MII CB-request FIFO programmable high watermark */
        mix_ctl.s.mrq_hwm = 1;
+#ifdef __LITTLE_ENDIAN
+        mix_ctl.s.lendian = 1;
+#endif
        cvmx_write_csr(p->mix + MIX_CTL, mix_ctl.u64);
-        if (OCTEON_IS_MODEL(OCTEON_CN56XX_PASS1_X)
+        /* Read the PHY to find the mode of the interface. */
-            || OCTEON_IS_MODEL(OCTEON_CN52XX_PASS1_X)) {
+        if (octeon_mgmt_init_phy(netdev)) {
-                /*
+                dev_err(p->dev, "Cannot initialize PHY on MIX%d.\n", p->port);
-                 * Force compensation values, as they are not
+                goto err_noirq;
-                 * determined properly by HW
+        }
-                 */
-                union cvmx_agl_gmx_drv_ctl drv_ctl;
-                drv_ctl.u64 = cvmx_read_csr(CVMX_AGL_GMX_DRV_CTL);
+        /* Set the mode of the interface, RGMII/MII. */
-                if (port) {
+        if (OCTEON_IS_MODEL(OCTEON_CN6XXX) && p->phydev) {
-                        drv_ctl.s.byp_en1 = 1;
+                union cvmx_agl_prtx_ctl agl_prtx_ctl;
-                        drv_ctl.s.nctl1 = 6;
+                int rgmii_mode = (p->phydev->supported &
-                        drv_ctl.s.pctl1 = 6;
+                                  (SUPPORTED_1000baseT_Half | SUPPORTED_1000baseT_Full)) != 0;
-                } else {
-                        drv_ctl.s.byp_en = 1;
+                agl_prtx_ctl.u64 = cvmx_read_csr(p->agl_prt_ctl);
-                        drv_ctl.s.nctl = 6;
+                agl_prtx_ctl.s.mode = rgmii_mode ? 0 : 1;
-                        drv_ctl.s.pctl = 6;
+                cvmx_write_csr(p->agl_prt_ctl,  agl_prtx_ctl.u64);
+                /* MII clocks counts are based on the 125Mhz
+                 * reference, which has an 8nS period. So our delays
+                 * need to be multiplied by this factor.
+                 */
+#define NS_PER_PHY_CLK 8
+                /* Take the DLL and clock tree out of reset */
+                agl_prtx_ctl.u64 = cvmx_read_csr(p->agl_prt_ctl);
+                agl_prtx_ctl.s.clkrst = 0;
+                if (rgmii_mode) {
+                        agl_prtx_ctl.s.dllrst = 0;
+                        agl_prtx_ctl.s.clktx_byp = 0;
                }
-                cvmx_write_csr(CVMX_AGL_GMX_DRV_CTL, drv_ctl.u64);
+                cvmx_write_csr(p->agl_prt_ctl,  agl_prtx_ctl.u64);
+                cvmx_read_csr(p->agl_prt_ctl); /* Force write out before wait */
+                /* Wait for the DLL to lock. External 125 MHz
+                 * reference clock must be stable at this point.
+                 */
+                ndelay(256 * NS_PER_PHY_CLK);
+                /* Enable the interface */
+                agl_prtx_ctl.u64 = cvmx_read_csr(p->agl_prt_ctl);
+                agl_prtx_ctl.s.enable = 1;
+                cvmx_write_csr(p->agl_prt_ctl, agl_prtx_ctl.u64);
+                /* Read the value back to force the previous write */
+                agl_prtx_ctl.u64 = cvmx_read_csr(p->agl_prt_ctl);
+                /* Enable the compensation controller */
+                agl_prtx_ctl.s.comp = 1;
+                agl_prtx_ctl.s.drv_byp = 0;
+                cvmx_write_csr(p->agl_prt_ctl,  agl_prtx_ctl.u64);
+                /* Force write out before wait. */
+                cvmx_read_csr(p->agl_prt_ctl);
+                /* For compensation state to lock. */
+                ndelay(1040 * NS_PER_PHY_CLK);
+                /* Some Ethernet switches cannot handle standard
+                 * Interframe Gap, increase to 16 bytes.
+                 */
+                cvmx_write_csr(CVMX_AGL_GMX_TX_IFG, 0x88);
        }
        octeon_mgmt_rx_fill_ring(netdev);
@@ -870,7 +1175,7 @@ static int octeon_mgmt_open(struct net_device *netdev)
        /* Interrupt when we have 1 or more packets to clean.  */
        mix_orhwm.u64 = 0;
-        mix_orhwm.s.orhwm = 1;
+        mix_orhwm.s.orhwm = 0;
        cvmx_write_csr(p->mix + MIX_ORHWM, mix_orhwm.u64);
        /* Enable receive and transmit interrupts */
@@ -879,13 +1184,12 @@ static int octeon_mgmt_open(struct net_device *netdev)
        mix_intena.s.othena = 1;
        cvmx_write_csr(p->mix + MIX_INTENA, mix_intena.u64);
        /* Enable packet I/O. */
        rxx_frm_ctl.u64 = 0;
+        rxx_frm_ctl.s.ptp_mode = p->has_rx_tstamp ? 1 : 0;
        rxx_frm_ctl.s.pre_align = 1;
-        /*
+        /* When set, disables the length check for non-min sized pkts
-         * When set, disables the length check for non-min sized pkts
         * with padding in the client data.
         */
        rxx_frm_ctl.s.pad_len = 1;
@@ -903,33 +1207,26 @@ static int octeon_mgmt_open(struct net_device *netdev)
        rxx_frm_ctl.s.ctl_drp = 1;
        /* Strip off the preamble */
        rxx_frm_ctl.s.pre_strp = 1;
-        /*
+        /* This port is configured to send PREAMBLE+SFD to begin every
-         * This port is configured to send PREAMBLE+SFD to begin every
         * frame.  GMX checks that the PREAMBLE is sent correctly.
         */
        rxx_frm_ctl.s.pre_chk = 1;
        cvmx_write_csr(p->agl + AGL_GMX_RX_FRM_CTL, rxx_frm_ctl.u64);
-        /* Enable the AGL block */
+        /* Configure the port duplex, speed and enables */
-        agl_gmx_inf_mode.u64 = 0;
+        octeon_mgmt_disable_link(p);
-        agl_gmx_inf_mode.s.en = 1;
+        if (p->phydev)
-        cvmx_write_csr(CVMX_AGL_GMX_INF_MODE, agl_gmx_inf_mode.u64);
+                octeon_mgmt_update_link(p);
+        octeon_mgmt_enable_link(p);
-        /* Configure the port duplex and enables */
-        prtx_cfg.u64 = cvmx_read_csr(p->agl + AGL_GMX_PRT_CFG);
-        prtx_cfg.s.tx_en = 1;
-        prtx_cfg.s.rx_en = 1;
-        prtx_cfg.s.en = 1;
-        p->last_duplex = 1;
-        prtx_cfg.s.duplex = p->last_duplex;
-        cvmx_write_csr(p->agl + AGL_GMX_PRT_CFG, prtx_cfg.u64);
        p->last_link = 0;
-        netif_carrier_off(netdev);
+        p->last_speed = 0;
+        /* PHY is not present in simulator. The carrier is enabled
-        if (octeon_mgmt_init_phy(netdev)) {
+         * while initializing the phy for simulator, leave it enabled.
-                dev_err(p->dev, "Cannot initialize PHY.\n");
+         */
-                goto err_noirq;
+        if (p->phydev) {
+                netif_carrier_off(netdev);
+                phy_start_aneg(p->phydev);
        }
        netif_wake_queue(netdev);
@@ -959,6 +1256,7 @@ static int octeon_mgmt_stop(struct net_device *netdev)
        if (p->phydev)
                phy_disconnect(p->phydev);
+        p->phydev = NULL;
        netif_carrier_off(netdev);
@@ -991,6 +1289,7 @@ static int octeon_mgmt_xmit(struct sk_buff *skb, struct net_device *netdev)
        int rv = NETDEV_TX_BUSY;
        re.d64 = 0;
+        re.s.tstamp = ((skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP) != 0);
        re.s.len = skb->len;
        re.s.addr = dma_map_single(p->dev, skb->data,
                                   skb->len,
@@ -1031,6 +1330,7 @@ static int octeon_mgmt_xmit(struct sk_buff *skb, struct net_device *netdev)
        /* Ring the bell.  */
        cvmx_write_csr(p->mix + MIX_ORING2, 1);
+        netdev->trans_start = jiffies;
        rv = NETDEV_TX_OK;
 out:
        octeon_mgmt_update_tx_stats(netdev);
@@ -1068,7 +1368,7 @@ static int octeon_mgmt_get_settings(struct net_device *netdev,
        if (p->phydev)
                return phy_ethtool_gset(p->phydev, cmd);
-        return -EINVAL;
+        return -EOPNOTSUPP;
 }
 static int octeon_mgmt_set_settings(struct net_device *netdev,
@@ -1082,23 +1382,37 @@ static int octeon_mgmt_set_settings(struct net_device *netdev,
        if (p->phydev)
                return phy_ethtool_sset(p->phydev, cmd);
-        return -EINVAL;
+        return -EOPNOTSUPP;
+}
+static int octeon_mgmt_nway_reset(struct net_device *dev)
+{
+        struct octeon_mgmt *p = netdev_priv(dev);
+        if (!capable(CAP_NET_ADMIN))
+                return -EPERM;
+        if (p->phydev)
+                return phy_start_aneg(p->phydev);
+        return -EOPNOTSUPP;
 }
 static const struct ethtool_ops octeon_mgmt_ethtool_ops = {
        .get_drvinfo = octeon_mgmt_get_drvinfo,
-        .get_link = ethtool_op_get_link,
        .get_settings = octeon_mgmt_get_settings,
-        .set_settings = octeon_mgmt_set_settings
+        .set_settings = octeon_mgmt_set_settings,
+        .nway_reset = octeon_mgmt_nway_reset,
+        .get_link = ethtool_op_get_link,
 };
 static const struct net_device_ops octeon_mgmt_ops = {
        .ndo_open =                     octeon_mgmt_open,
        .ndo_stop =                     octeon_mgmt_stop,
        .ndo_start_xmit =               octeon_mgmt_xmit,
-        .ndo_set_rx_mode =              octeon_mgmt_set_rx_filtering,
+        .ndo_set_rx_mode =              octeon_mgmt_set_rx_filtering,
        .ndo_set_mac_address =          octeon_mgmt_set_mac_address,
-        .ndo_do_ioctl =                 octeon_mgmt_ioctl,
+        .ndo_do_ioctl =                 octeon_mgmt_ioctl,
        .ndo_change_mtu =               octeon_mgmt_change_mtu,
 #ifdef CONFIG_NET_POLL_CONTROLLER
        .ndo_poll_controller =          octeon_mgmt_poll_controller,
@@ -1113,6 +1427,7 @@ static int __devinit octeon_mgmt_probe(struct platform_device *pdev)
        const u8 *mac;
        struct resource *res_mix;
        struct resource *res_agl;
+        struct resource *res_agl_prt_ctl;
        int len;
        int result;
@@ -1120,6 +1435,8 @@ static int __devinit octeon_mgmt_probe(struct platform_device *pdev)
        if (netdev == NULL)
                return -ENOMEM;
+        SET_NETDEV_DEV(netdev, &pdev->dev);
        dev_set_drvdata(&pdev->dev, netdev);
        p = netdev_priv(netdev);
        netif_napi_add(netdev, &p->napi, octeon_mgmt_napi_poll,
@@ -1127,6 +1444,7 @@ static int __devinit octeon_mgmt_probe(struct platform_device *pdev)
        p->netdev = netdev;
        p->dev = &pdev->dev;
+        p->has_rx_tstamp = false;
        data = of_get_property(pdev->dev.of_node, "cell-index", &len);
        if (data && len == sizeof(*data)) {
@@ -1159,10 +1477,19 @@ static int __devinit octeon_mgmt_probe(struct platform_device *pdev)
                goto err;
        }
+        res_agl_prt_ctl = platform_get_resource(pdev, IORESOURCE_MEM, 3);
+        if (res_agl_prt_ctl == NULL) {
+                dev_err(&pdev->dev, "no 'reg' resource\n");
+                result = -ENXIO;
+                goto err;
+        }
        p->mix_phys = res_mix->start;
        p->mix_size = resource_size(res_mix);
        p->agl_phys = res_agl->start;
        p->agl_size = resource_size(res_agl);
+        p->agl_prt_ctl_phys = res_agl_prt_ctl->start;
+        p->agl_prt_ctl_size = resource_size(res_agl_prt_ctl);
        if (!devm_request_mem_region(&pdev->dev, p->mix_phys, p->mix_size,
@@ -1181,10 +1508,18 @@ static int __devinit octeon_mgmt_probe(struct platform_device *pdev)
                goto err;
        }
+        if (!devm_request_mem_region(&pdev->dev, p->agl_prt_ctl_phys,
+                                     p->agl_prt_ctl_size, res_agl_prt_ctl->name)) {
+                result = -ENXIO;
+                dev_err(&pdev->dev, "request_mem_region (%s) failed\n",
+                        res_agl_prt_ctl->name);
+                goto err;
+        }
        p->mix = (u64)devm_ioremap(&pdev->dev, p->mix_phys, p->mix_size);
        p->agl = (u64)devm_ioremap(&pdev->dev, p->agl_phys, p->agl_size);
+        p->agl_prt_ctl = (u64)devm_ioremap(&pdev->dev, p->agl_prt_ctl_phys,
+                                           p->agl_prt_ctl_size);
        spin_lock_init(&p->lock);
        skb_queue_head_init(&p->tx_list);
@@ -1199,14 +1534,19 @@ static int __devinit octeon_mgmt_probe(struct platform_device *pdev)
        mac = of_get_mac_address(pdev->dev.of_node);
-        if (mac)
+        if (mac && is_valid_ether_addr(mac)) {
-                memcpy(netdev->dev_addr, mac, 6);
+                memcpy(netdev->dev_addr, mac, ETH_ALEN);
+                netdev->addr_assign_type &= ~NET_ADDR_RANDOM;
+        } else {
+                eth_hw_addr_random(netdev);
+        }
        p->phy_np = of_parse_phandle(pdev->dev.of_node, "phy-handle", 0);
        pdev->dev.coherent_dma_mask = DMA_BIT_MASK(64);
        pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask;
+        netif_carrier_off(netdev);
        result = register_netdev(netdev);
        if (result)
                goto err;
diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/Kconfig b/drivers/net/ethernet/oki-semi/pch_gbe/Kconfig
index 97302419a377..5296cc8d3cba 100644
--- a/drivers/net/ethernet/oki-semi/pch_gbe/Kconfig
+++ b/drivers/net/ethernet/oki-semi/pch_gbe/Kconfig
@@ -26,6 +26,9 @@ if PCH_GBE
 config PCH_PTP
        bool "PCH PTP clock support"
        default n
+        depends on EXPERIMENTAL
+        select PPS
+        select PTP_1588_CLOCK
        select PTP_1588_CLOCK_PCH
        ---help---
          Say Y here if you want to use Precision Time Protocol (PTP) in the
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c
index b528e52a8ee1..2a0c9dc48eb3 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c
@@ -38,7 +38,7 @@ static inline void writeq(u64 val, void __iomem *addr)
 }
 #endif
-static const struct crb_128M_2M_block_map
+static struct crb_128M_2M_block_map
 crb_128M_2M_map[64] __cacheline_aligned_in_smp = {
    {{{0, 0,         0,         0} } },         /* 0: PCI */
    {{{1, 0x0100000, 0x0102000, 0x120000},      /* 1: PCIE */
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
index 473ce134ca63..24ad17ec7fcd 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
@@ -1601,7 +1601,8 @@ qlcnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        adapter->netdev  = netdev;
        adapter->pdev    = pdev;
-        if (qlcnic_alloc_adapter_resources(adapter))
+        err = qlcnic_alloc_adapter_resources(adapter);
+        if (err)
                goto err_out_free_netdev;
        adapter->dev_rst_time = jiffies;
diff --git a/drivers/net/ethernet/realtek/8139cp.c b/drivers/net/ethernet/realtek/8139cp.c
index 995d0cfc4c06..1c818254b7be 100644
--- a/drivers/net/ethernet/realtek/8139cp.c
+++ b/drivers/net/ethernet/realtek/8139cp.c
@@ -563,7 +563,7 @@ rx_next:
                if (cpr16(IntrStatus) & cp_rx_intr_mask)
                        goto rx_status_loop;
-                napi_gro_flush(napi);
+                napi_gro_flush(napi, false);
                spin_lock_irqsave(&cp->lock, flags);
                __napi_complete(napi);
                cpw16_f(IntrMask, cp_intr_mask);
diff --git a/drivers/net/ethernet/realtek/8139too.c b/drivers/net/ethernet/realtek/8139too.c
index 1d83565cc6af..3ed7add23c12 100644
--- a/drivers/net/ethernet/realtek/8139too.c
+++ b/drivers/net/ethernet/realtek/8139too.c
@@ -228,7 +228,7 @@ typedef enum {
 static const struct {
        const char *name;
        u32 hw_flags;
-} board_info[] __devinitdata = {
+} board_info[] __devinitconst = {
        { "RealTek RTL8139", RTL8139_CAPS },
        { "RealTek RTL8129", RTL8129_CAPS },
 };
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
index bad8f2eec9b4..c8bfea0524dd 100644
--- a/drivers/net/ethernet/renesas/sh_eth.c
+++ b/drivers/net/ethernet/renesas/sh_eth.c
@@ -2438,6 +2438,7 @@ static int sh_eth_drv_probe(struct platform_device *pdev)
                rtsu = platform_get_resource(pdev, IORESOURCE_MEM, 1);
                if (!rtsu) {
                        dev_err(&pdev->dev, "Not found TSU resource\n");
+                        ret = -ENODEV;
                        goto out_release;
                }
                mdp->tsu_addr = ioremap(rtsu->start,
diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c
index 96bd980e828d..4f86d0cd516a 100644
--- a/drivers/net/ethernet/sfc/efx.c
+++ b/drivers/net/ethernet/sfc/efx.c
@@ -2019,14 +2019,14 @@ static void efx_set_rx_mode(struct net_device *net_dev)
                netdev_for_each_mc_addr(ha, net_dev) {
                        crc = ether_crc_le(ETH_ALEN, ha->addr);
                        bit = crc & (EFX_MCAST_HASH_ENTRIES - 1);
-                        set_bit_le(bit, mc_hash->byte);
+                        __set_bit_le(bit, mc_hash);
                }
                /* Broadcast packets go through the multicast hash filter.
                 * ether_crc_le() of the broadcast address is 0xbe2612ff
                 * so we always add bit 0xff to the mask.
                 */
-                set_bit_le(0xff, mc_hash->byte);
+                __set_bit_le(0xff, mc_hash);
        }
        if (efx->port_enabled)
diff --git a/drivers/net/ethernet/sfc/net_driver.h b/drivers/net/ethernet/sfc/net_driver.h
index c1a010cda89b..576a31091165 100644
--- a/drivers/net/ethernet/sfc/net_driver.h
+++ b/drivers/net/ethernet/sfc/net_driver.h
@@ -1101,18 +1101,6 @@ static inline struct efx_rx_buffer *efx_rx_buffer(struct efx_rx_queue *rx_queue,
        return &rx_queue->buffer[index];
 }
-/* Set bit in a little-endian bitfield */
-static inline void set_bit_le(unsigned nr, unsigned char *addr)
-{
-        addr[nr / 8] |= (1 << (nr % 8));
-}
-/* Clear bit in a little-endian bitfield */
-static inline void clear_bit_le(unsigned nr, unsigned char *addr)
-{
-        addr[nr / 8] &= ~(1 << (nr % 8));
-}
 /**
 * EFX_MAX_FRAME_LEN - calculate maximum frame length
diff --git a/drivers/net/ethernet/sfc/nic.c b/drivers/net/ethernet/sfc/nic.c
index cdff40b65729..aab7cacb2e34 100644
--- a/drivers/net/ethernet/sfc/nic.c
+++ b/drivers/net/ethernet/sfc/nic.c
@@ -472,9 +472,9 @@ void efx_nic_init_tx(struct efx_tx_queue *tx_queue)
                efx_reado(efx, &reg, FR_AA_TX_CHKSM_CFG);
                if (tx_queue->queue & EFX_TXQ_TYPE_OFFLOAD)
-                        clear_bit_le(tx_queue->queue, (void *)&reg);
+                        __clear_bit_le(tx_queue->queue, &reg);
                else
-                        set_bit_le(tx_queue->queue, (void *)&reg);
+                        __set_bit_le(tx_queue->queue, &reg);
                efx_writeo(efx, &reg, FR_AA_TX_CHKSM_CFG);
        }
diff --git a/drivers/net/ethernet/sfc/ptp.c b/drivers/net/ethernet/sfc/ptp.c
index 5b3dd028ce85..0767043f44a4 100644
--- a/drivers/net/ethernet/sfc/ptp.c
+++ b/drivers/net/ethernet/sfc/ptp.c
@@ -640,8 +640,7 @@ static void efx_ptp_drop_time_expired_events(struct efx_nic *efx)
                        evt = list_entry(cursor, struct efx_ptp_event_rx,
                                         link);
                        if (time_after(jiffies, evt->expiry)) {
-                                list_del(&evt->link);
+                                list_move(&evt->link, &ptp->evt_free_list);
-                                list_add(&evt->link, &ptp->evt_free_list);
                                netif_warn(efx, hw, efx->net_dev,
                                           "PTP rx event dropped\n");
                        }
@@ -684,8 +683,7 @@ static enum ptp_packet_state efx_ptp_match_rx(struct efx_nic *efx,
                        match->state = PTP_PACKET_STATE_MATCHED;
                        rc = PTP_PACKET_STATE_MATCHED;
-                        list_del(&evt->link);
+                        list_move(&evt->link, &ptp->evt_free_list);
-                        list_add(&evt->link, &ptp->evt_free_list);
                        break;
                }
        }
@@ -820,8 +818,7 @@ static int efx_ptp_stop(struct efx_nic *efx)
        /* Drop any pending receive events */
        spin_lock_bh(&efx->ptp_data->evt_lock);
        list_for_each_safe(cursor, next, &efx->ptp_data->evt_list) {
-                list_del(cursor);
+                list_move(cursor, &efx->ptp_data->evt_free_list);
-                list_add(cursor, &efx->ptp_data->evt_free_list);
        }
        spin_unlock_bh(&efx->ptp_data->evt_lock);
diff --git a/drivers/net/ethernet/sis/sis190.c b/drivers/net/ethernet/sis/sis190.c
index 4613591b43e7..d8166012b7d4 100644
--- a/drivers/net/ethernet/sis/sis190.c
+++ b/drivers/net/ethernet/sis/sis190.c
@@ -1618,7 +1618,7 @@ static int __devinit sis190_get_mac_addr_from_eeprom(struct pci_dev *pdev,
 static int __devinit sis190_get_mac_addr_from_apc(struct pci_dev *pdev,
                                                  struct net_device *dev)
 {
-        static const u16 __devinitdata ids[] = { 0x0965, 0x0966, 0x0968 };
+        static const u16 __devinitconst ids[] = { 0x0965, 0x0966, 0x0968 };
        struct sis190_private *tp = netdev_priv(dev);
        struct pci_dev *isa_bridge;
        u8 reg, tmp8;
diff --git a/drivers/net/ethernet/sis/sis900.c b/drivers/net/ethernet/sis/sis900.c
index 203d9c6ec23a..fb9f6b38511f 100644
--- a/drivers/net/ethernet/sis/sis900.c
+++ b/drivers/net/ethernet/sis/sis900.c
@@ -478,8 +478,10 @@ static int __devinit sis900_probe(struct pci_dev *pci_dev,
        /* IO region. */
        ioaddr = pci_iomap(pci_dev, 0, 0);
-        if (!ioaddr)
+        if (!ioaddr) {
+                ret = -ENOMEM;
                goto err_out_cleardev;
+        }
        sis_priv = netdev_priv(net_dev);
        sis_priv->ioaddr = ioaddr;
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac.h b/drivers/net/ethernet/stmicro/stmmac/stmmac.h
index e872e1da3137..7d51a65ab099 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac.h
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac.h
@@ -50,7 +50,6 @@ struct stmmac_priv {
        unsigned int dirty_rx;
        struct sk_buff **rx_skbuff;
        dma_addr_t *rx_skbuff_dma;
-        struct sk_buff_head rx_recycle;
        struct net_device *dev;
        dma_addr_t dma_rx_phy;
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 3be88331d17a..c6cdbc4eb05e 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -747,18 +747,7 @@ static void stmmac_tx(struct stmmac_priv *priv)
                priv->hw->ring->clean_desc3(p);
                if (likely(skb != NULL)) {
-                        /*
+                        dev_kfree_skb(skb);
-                         * If there's room in the queue (limit it to size)
-                         * we add this skb back into the pool,
-                         * if it's the right size.
-                         */
-                        if ((skb_queue_len(&priv->rx_recycle) <
-                                priv->dma_rx_size) &&
-                                skb_recycle_check(skb, priv->dma_buf_sz))
-                                __skb_queue_head(&priv->rx_recycle, skb);
-                        else
-                                dev_kfree_skb(skb);
                        priv->tx_skbuff[entry] = NULL;
                }
@@ -1169,7 +1158,6 @@ static int stmmac_open(struct net_device *dev)
        priv->eee_enabled = stmmac_eee_init(priv);
        napi_enable(&priv->napi);
-        skb_queue_head_init(&priv->rx_recycle);
        netif_start_queue(dev);
        return 0;
@@ -1222,7 +1210,6 @@ static int stmmac_release(struct net_device *dev)
                kfree(priv->tm);
 #endif
        napi_disable(&priv->napi);
-        skb_queue_purge(&priv->rx_recycle);
        /* Free the IRQ lines */
        free_irq(dev->irq, dev);
@@ -1388,10 +1375,7 @@ static inline void stmmac_rx_refill(struct stmmac_priv *priv)
                if (likely(priv->rx_skbuff[entry] == NULL)) {
                        struct sk_buff *skb;
-                        skb = __skb_dequeue(&priv->rx_recycle);
+                        skb = netdev_alloc_skb_ip_align(priv->dev, bfsize);
-                        if (skb == NULL)
-                                skb = netdev_alloc_skb_ip_align(priv->dev,
-                                                                bfsize);
                        if (unlikely(skb == NULL))
                                break;
diff --git a/drivers/net/ethernet/sun/niu.c b/drivers/net/ethernet/sun/niu.c
index 8419bf385e08..275b430aeb75 100644
--- a/drivers/net/ethernet/sun/niu.c
+++ b/drivers/net/ethernet/sun/niu.c
@@ -9788,6 +9788,7 @@ static int __devinit niu_pci_init_one(struct pci_dev *pdev,
        if (!pci_is_pcie(pdev)) {
                dev_err(&pdev->dev, "Cannot find PCI Express capability, aborting\n");
+                err = -ENODEV;
                goto err_out_free_res;
        }
diff --git a/drivers/net/ethernet/sun/sungem.c b/drivers/net/ethernet/sun/sungem.c
index 9ae12d0c9632..6c8695ec7cb9 100644
--- a/drivers/net/ethernet/sun/sungem.c
+++ b/drivers/net/ethernet/sun/sungem.c
@@ -2963,7 +2963,8 @@ static int __devinit gem_init_one(struct pci_dev *pdev,
                goto err_out_iounmap;
        }
-        if (gem_get_device_address(gp))
+        err = gem_get_device_address(gp);
+        if (err)
                goto err_out_free_consistent;
        dev->netdev_ops = &gem_netdev_ops;
diff --git a/drivers/net/hamradio/6pack.c b/drivers/net/hamradio/6pack.c
index 64783a0d545a..1450e33fc250 100644
--- a/drivers/net/hamradio/6pack.c
+++ b/drivers/net/hamradio/6pack.c
@@ -811,9 +811,9 @@ static struct tty_ldisc_ops sp_ldisc = {
 /* Initialize 6pack control device -- register 6pack line discipline */
-static const char msg_banner[]  __initdata = KERN_INFO \
+static const char msg_banner[]  __initconst = KERN_INFO \
        "AX.25: 6pack driver, " SIXPACK_VERSION "\n";
-static const char msg_regfail[] __initdata = KERN_ERR  \
+static const char msg_regfail[] __initconst = KERN_ERR  \
        "6pack: can't register line discipline (err = %d)\n";
 static int __init sixpack_init_driver(void)
@@ -829,7 +829,7 @@ static int __init sixpack_init_driver(void)
        return status;
 }
-static const char msg_unregfail[] __exitdata = KERN_ERR \
+static const char msg_unregfail[] = KERN_ERR \
        "6pack: can't unregister line discipline (err = %d)\n";
 static void __exit sixpack_exit_driver(void)
diff --git a/drivers/net/hamradio/bpqether.c b/drivers/net/hamradio/bpqether.c
index 76d54774ba82..c2e5497397d5 100644
--- a/drivers/net/hamradio/bpqether.c
+++ b/drivers/net/hamradio/bpqether.c
@@ -87,7 +87,7 @@
 #include <linux/bpqether.h>
-static const char banner[] __initdata = KERN_INFO \
+static const char banner[] __initconst = KERN_INFO \
        "AX.25: bpqether driver version 004\n";
 static char bcast_addr[6]={0xFF,0xFF,0xFF,0xFF,0xFF,0xFF};
diff --git a/drivers/net/hamradio/mkiss.c b/drivers/net/hamradio/mkiss.c
index 2c0894a92abd..8e01c457015b 100644
--- a/drivers/net/hamradio/mkiss.c
+++ b/drivers/net/hamradio/mkiss.c
@@ -997,9 +997,9 @@ static struct tty_ldisc_ops ax_ldisc = {
        .write_wakeup   = mkiss_write_wakeup
 };
-static const char banner[] __initdata = KERN_INFO \
+static const char banner[] __initconst = KERN_INFO \
        "mkiss: AX.25 Multikiss, Hans Albas PE1AYX\n";
-static const char msg_regfail[] __initdata = KERN_ERR \
+static const char msg_regfail[] __initconst = KERN_ERR \
        "mkiss: can't register line discipline (err = %d)\n";
 static int __init mkiss_init_driver(void)
@@ -1015,7 +1015,7 @@ static int __init mkiss_init_driver(void)
        return status;
 }
-static const char msg_unregfail[] __exitdata = KERN_ERR \
+static const char msg_unregfail[] = KERN_ERR \
        "mkiss: can't unregister line discipline (err = %d)\n";
 static void __exit mkiss_exit_driver(void)
diff --git a/drivers/net/hamradio/scc.c b/drivers/net/hamradio/scc.c
index efc6c97163a7..1b4a47bd32b7 100644
--- a/drivers/net/hamradio/scc.c
+++ b/drivers/net/hamradio/scc.c
@@ -182,7 +182,7 @@
 #include "z8530.h"
-static const char banner[] __initdata = KERN_INFO \
+static const char banner[] __initconst = KERN_INFO \
        "AX.25: Z8530 SCC driver version "VERSION".dl1bke\n";
 static void t_dwait(unsigned long);
diff --git a/drivers/net/hamradio/yam.c b/drivers/net/hamradio/yam.c
index 5a6412ecce73..c6645f1017af 100644
--- a/drivers/net/hamradio/yam.c
+++ b/drivers/net/hamradio/yam.c
@@ -76,7 +76,7 @@
 /* --------------------------------------------------------------------- */
 static const char yam_drvname[] = "yam";
-static const char yam_drvinfo[] __initdata = KERN_INFO \
+static const char yam_drvinfo[] __initconst = KERN_INFO \
        "YAM driver version 0.8 by F1OAT/F6FBB\n";
 /* --------------------------------------------------------------------- */
diff --git a/drivers/net/irda/irtty-sir.c b/drivers/net/irda/irtty-sir.c
index 30087ca23a0f..6e4d4b62c9a8 100644
--- a/drivers/net/irda/irtty-sir.c
+++ b/drivers/net/irda/irtty-sir.c
@@ -459,8 +459,10 @@ static int irtty_open(struct tty_struct *tty)
        /* allocate private device info block */
        priv = kzalloc(sizeof(*priv), GFP_KERNEL);
-        if (!priv)
+        if (!priv) {
+                ret = -ENOMEM;
                goto out_put;
+        }
        priv->magic = IRTTY_MAGIC;
        priv->tty = tty;
diff --git a/drivers/net/irda/mcs7780.c b/drivers/net/irda/mcs7780.c
index 1a00b5990cb8..f07c340990da 100644
--- a/drivers/net/irda/mcs7780.c
+++ b/drivers/net/irda/mcs7780.c
@@ -920,8 +920,10 @@ static int mcs_probe(struct usb_interface *intf,
        ndev->netdev_ops = &mcs_netdev_ops;
-        if (!intf->cur_altsetting)
+        if (!intf->cur_altsetting) {
+                ret = -ENOMEM;
                goto error2;
+        }
        ret = mcs_find_endpoints(mcs, intf->cur_altsetting->endpoint,
                                 intf->cur_altsetting->desc.bNumEndpoints);
diff --git a/drivers/net/irda/pxaficp_ir.c b/drivers/net/irda/pxaficp_ir.c
index 002a442bf73f..858de05bdb7d 100644
--- a/drivers/net/irda/pxaficp_ir.c
+++ b/drivers/net/irda/pxaficp_ir.c
@@ -846,8 +846,10 @@ static int pxa_irda_probe(struct platform_device *pdev)
                goto err_mem_2;
        dev = alloc_irdadev(sizeof(struct pxa_irda));
-        if (!dev)
+        if (!dev) {
+                err = -ENOMEM;
                goto err_mem_3;
+        }
        SET_NETDEV_DEV(dev, &pdev->dev);
        si = netdev_priv(dev);
diff --git a/drivers/net/irda/sa1100_ir.c b/drivers/net/irda/sa1100_ir.c
index e25067552b20..42fde9ed23e1 100644
--- a/drivers/net/irda/sa1100_ir.c
+++ b/drivers/net/irda/sa1100_ir.c
@@ -940,8 +940,10 @@ static int sa1100_irda_probe(struct platform_device *pdev)
                goto err_mem_3;
        dev = alloc_irdadev(sizeof(struct sa1100_irda));
-        if (!dev)
+        if (!dev) {
+                err = -ENOMEM;
                goto err_mem_4;
+        }
        SET_NETDEV_DEV(dev, &pdev->dev);
diff --git a/drivers/net/irda/sh_irda.c b/drivers/net/irda/sh_irda.c
index eb315b8d07a3..4b746d9bd8e7 100644
--- a/drivers/net/irda/sh_irda.c
+++ b/drivers/net/irda/sh_irda.c
@@ -808,8 +808,8 @@ static int __devinit sh_irda_probe(struct platform_device *pdev)
                goto err_mem_4;
        platform_set_drvdata(pdev, ndev);
+        err = request_irq(irq, sh_irda_irq, IRQF_DISABLED, "sh_irda", self);
-        if (request_irq(irq, sh_irda_irq, IRQF_DISABLED, "sh_irda", self)) {
+        if (err) {
                dev_warn(&pdev->dev, "Unable to attach sh_irda interrupt\n");
                goto err_mem_4;
        }
diff --git a/drivers/net/irda/sh_sir.c b/drivers/net/irda/sh_sir.c
index 795109425568..624ac1939e85 100644
--- a/drivers/net/irda/sh_sir.c
+++ b/drivers/net/irda/sh_sir.c
@@ -741,6 +741,7 @@ static int __devinit sh_sir_probe(struct platform_device *pdev)
        self->clk = clk_get(&pdev->dev, clk_name);
        if (IS_ERR(self->clk)) {
                dev_err(&pdev->dev, "cannot get clock \"%s\"\n", clk_name);
+                err = -ENODEV;
                goto err_mem_3;
        }
@@ -760,8 +761,8 @@ static int __devinit sh_sir_probe(struct platform_device *pdev)
                goto err_mem_4;
        platform_set_drvdata(pdev, ndev);
+        err = request_irq(irq, sh_sir_irq, IRQF_DISABLED, "sh_sir", self);
-        if (request_irq(irq, sh_sir_irq, IRQF_DISABLED, "sh_sir", self)) {
+        if (err) {
                dev_warn(&pdev->dev, "Unable to attach sh_sir interrupt\n");
                goto err_mem_4;
        }
diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c
index 170eb411ab5d..c1ef3000ea60 100644
--- a/drivers/net/phy/mdio_bus.c
+++ b/drivers/net/phy/mdio_bus.c
@@ -26,6 +26,7 @@
 #include <linux/delay.h>
 #include <linux/device.h>
 #include <linux/of_device.h>
+#include <linux/of_mdio.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
diff --git a/drivers/net/rionet.c b/drivers/net/rionet.c
index 91d25888a1b9..d8b9b1e8ee02 100644
--- a/drivers/net/rionet.c
+++ b/drivers/net/rionet.c
@@ -26,7 +26,7 @@
 #include <linux/ethtool.h>
 #define DRV_NAME        "rionet"
-#define DRV_VERSION     "0.2"
+#define DRV_VERSION     "0.3"
 #define DRV_AUTHOR      "Matt Porter <mporter@kernel.crashing.org>"
 #define DRV_DESC        "Ethernet over RapidIO"
@@ -47,8 +47,7 @@ MODULE_LICENSE("GPL");
 #define RIONET_TX_RING_SIZE     CONFIG_RIONET_TX_SIZE
 #define RIONET_RX_RING_SIZE     CONFIG_RIONET_RX_SIZE
+#define RIONET_MAX_NETS         8
-static LIST_HEAD(rionet_peers);
 struct rionet_private {
        struct rio_mport *mport;
@@ -69,16 +68,14 @@ struct rionet_peer {
        struct resource *res;
 };
-static int rionet_check = 0;
+struct rionet_net {
-static int rionet_capable = 1;
+        struct net_device *ndev;
+        struct list_head peers;
+        struct rio_dev **active;
+        int nact;       /* number of active peers */
+};
-/*
+static struct rionet_net nets[RIONET_MAX_NETS];
- * This is a fast lookup table for translating TX
- * Ethernet packets into a destination RIO device. It
- * could be made into a hash table to save memory depending
- * on system trade-offs.
- */
-static struct rio_dev **rionet_active;
 #define is_rionet_capable(src_ops, dst_ops)                     \
                        ((src_ops & RIO_SRC_OPS_DATA_MSG) &&    \
@@ -175,6 +172,7 @@ static int rionet_start_xmit(struct sk_buff *skb, struct net_device *ndev)
        struct ethhdr *eth = (struct ethhdr *)skb->data;
        u16 destid;
        unsigned long flags;
+        int add_num = 1;
        local_irq_save(flags);
        if (!spin_trylock(&rnet->tx_lock)) {
@@ -182,7 +180,10 @@ static int rionet_start_xmit(struct sk_buff *skb, struct net_device *ndev)
                return NETDEV_TX_LOCKED;
        }
-        if ((rnet->tx_cnt + 1) > RIONET_TX_RING_SIZE) {
+        if (is_multicast_ether_addr(eth->h_dest))
+                add_num = nets[rnet->mport->id].nact;
+        if ((rnet->tx_cnt + add_num) > RIONET_TX_RING_SIZE) {
                netif_stop_queue(ndev);
                spin_unlock_irqrestore(&rnet->tx_lock, flags);
                printk(KERN_ERR "%s: BUG! Tx Ring full when queue awake!\n",
@@ -191,15 +192,22 @@ static int rionet_start_xmit(struct sk_buff *skb, struct net_device *ndev)
        }
        if (is_multicast_ether_addr(eth->h_dest)) {
+                int count = 0;
                for (i = 0; i < RIO_MAX_ROUTE_ENTRIES(rnet->mport->sys_size);
                                i++)
-                        if (rionet_active[i])
+                        if (nets[rnet->mport->id].active[i]) {
                                rionet_queue_tx_msg(skb, ndev,
-                                                    rionet_active[i]);
+                                        nets[rnet->mport->id].active[i]);
+                                if (count)
+                                        atomic_inc(&skb->users);
+                                count++;
+                        }
        } else if (RIONET_MAC_MATCH(eth->h_dest)) {
                destid = RIONET_GET_DESTID(eth->h_dest);
-                if (rionet_active[destid])
+                if (nets[rnet->mport->id].active[destid])
-                        rionet_queue_tx_msg(skb, ndev, rionet_active[destid]);
+                        rionet_queue_tx_msg(skb, ndev,
+                                        nets[rnet->mport->id].active[destid]);
        }
        spin_unlock_irqrestore(&rnet->tx_lock, flags);
@@ -218,16 +226,21 @@ static void rionet_dbell_event(struct rio_mport *mport, void *dev_id, u16 sid, u
                printk(KERN_INFO "%s: doorbell sid %4.4x tid %4.4x info %4.4x",
                       DRV_NAME, sid, tid, info);
        if (info == RIONET_DOORBELL_JOIN) {
-                if (!rionet_active[sid]) {
+                if (!nets[rnet->mport->id].active[sid]) {
-                        list_for_each_entry(peer, &rionet_peers, node) {
+                        list_for_each_entry(peer,
-                                if (peer->rdev->destid == sid)
+                                           &nets[rnet->mport->id].peers, node) {
-                                        rionet_active[sid] = peer->rdev;
+                                if (peer->rdev->destid == sid) {
+                                        nets[rnet->mport->id].active[sid] =
+                                                                peer->rdev;
+                                        nets[rnet->mport->id].nact++;
+                                }
                        }
                        rio_mport_send_doorbell(mport, sid,
                                                RIONET_DOORBELL_JOIN);
                }
        } else if (info == RIONET_DOORBELL_LEAVE) {
-                rionet_active[sid] = NULL;
+                nets[rnet->mport->id].active[sid] = NULL;
+                nets[rnet->mport->id].nact--;
        } else {
                if (netif_msg_intr(rnet))
                        printk(KERN_WARNING "%s: unhandled doorbell\n",
@@ -321,7 +334,8 @@ static int rionet_open(struct net_device *ndev)
        netif_carrier_on(ndev);
        netif_start_queue(ndev);
-        list_for_each_entry_safe(peer, tmp, &rionet_peers, node) {
+        list_for_each_entry_safe(peer, tmp,
+                                 &nets[rnet->mport->id].peers, node) {
                if (!(peer->res = rio_request_outb_dbell(peer->rdev,
                                                         RIONET_DOORBELL_JOIN,
                                                         RIONET_DOORBELL_LEAVE)))
@@ -346,7 +360,7 @@ static int rionet_close(struct net_device *ndev)
        int i;
        if (netif_msg_ifup(rnet))
-                printk(KERN_INFO "%s: close\n", DRV_NAME);
+                printk(KERN_INFO "%s: close %s\n", DRV_NAME, ndev->name);
        netif_stop_queue(ndev);
        netif_carrier_off(ndev);
@@ -354,10 +368,11 @@ static int rionet_close(struct net_device *ndev)
        for (i = 0; i < RIONET_RX_RING_SIZE; i++)
                kfree_skb(rnet->rx_skb[i]);
-        list_for_each_entry_safe(peer, tmp, &rionet_peers, node) {
+        list_for_each_entry_safe(peer, tmp,
-                if (rionet_active[peer->rdev->destid]) {
+                                 &nets[rnet->mport->id].peers, node) {
+                if (nets[rnet->mport->id].active[peer->rdev->destid]) {
                        rio_send_doorbell(peer->rdev, RIONET_DOORBELL_LEAVE);
-                        rionet_active[peer->rdev->destid] = NULL;
+                        nets[rnet->mport->id].active[peer->rdev->destid] = NULL;
                }
                rio_release_outb_dbell(peer->rdev, peer->res);
        }
@@ -373,17 +388,21 @@ static int rionet_close(struct net_device *ndev)
 static void rionet_remove(struct rio_dev *rdev)
 {
        struct net_device *ndev = rio_get_drvdata(rdev);
+        unsigned char netid = rdev->net->hport->id;
        struct rionet_peer *peer, *tmp;
-        free_pages((unsigned long)rionet_active, get_order(sizeof(void *) *
-                        RIO_MAX_ROUTE_ENTRIES(rdev->net->hport->sys_size)));
        unregister_netdev(ndev);
-        free_netdev(ndev);
-        list_for_each_entry_safe(peer, tmp, &rionet_peers, node) {
+        free_pages((unsigned long)nets[netid].active, get_order(sizeof(void *) *
+                        RIO_MAX_ROUTE_ENTRIES(rdev->net->hport->sys_size)));
+        nets[netid].active = NULL;
+        list_for_each_entry_safe(peer, tmp, &nets[netid].peers, node) {
                list_del(&peer->node);
                kfree(peer);
        }
+        free_netdev(ndev);
 }
 static void rionet_get_drvinfo(struct net_device *ndev,
@@ -435,13 +454,13 @@ static int rionet_setup_netdev(struct rio_mport *mport, struct net_device *ndev)
        const size_t rionet_active_bytes = sizeof(void *) *
                                RIO_MAX_ROUTE_ENTRIES(mport->sys_size);
-        rionet_active = (struct rio_dev **)__get_free_pages(GFP_KERNEL,
+        nets[mport->id].active = (struct rio_dev **)__get_free_pages(GFP_KERNEL,
-                        get_order(rionet_active_bytes));
+                                                get_order(rionet_active_bytes));
-        if (!rionet_active) {
+        if (!nets[mport->id].active) {
                rc = -ENOMEM;
                goto out;
        }
-        memset((void *)rionet_active, 0, rionet_active_bytes);
+        memset((void *)nets[mport->id].active, 0, rionet_active_bytes);
        /* Set up private area */
        rnet = netdev_priv(ndev);
@@ -470,60 +489,62 @@ static int rionet_setup_netdev(struct rio_mport *mport, struct net_device *ndev)
        if (rc != 0)
                goto out;
-        printk("%s: %s %s Version %s, MAC %pM\n",
+        printk(KERN_INFO "%s: %s %s Version %s, MAC %pM, %s\n",
               ndev->name,
               DRV_NAME,
               DRV_DESC,
               DRV_VERSION,
-               ndev->dev_addr);
+               ndev->dev_addr,
+               mport->name);
      out:
        return rc;
 }
-/*
+static unsigned long net_table[RIONET_MAX_NETS/sizeof(unsigned long) + 1];
- * XXX Make multi-net safe
- */
 static int rionet_probe(struct rio_dev *rdev, const struct rio_device_id *id)
 {
        int rc = -ENODEV;
        u32 lsrc_ops, ldst_ops;
        struct rionet_peer *peer;
        struct net_device *ndev = NULL;
+        unsigned char netid = rdev->net->hport->id;
+        int oldnet;
-        /* If local device is not rionet capable, give up quickly */
+        if (netid >= RIONET_MAX_NETS)
-        if (!rionet_capable)
+                return rc;
-                goto out;
-        /* Allocate our net_device structure */
+        oldnet = test_and_set_bit(netid, net_table);
-        ndev = alloc_etherdev(sizeof(struct rionet_private));
-        if (ndev == NULL) {
-                rc = -ENOMEM;
-                goto out;
-        }
        /*
         * First time through, make sure local device is rionet
-         * capable, setup netdev,  and set flags so this is skipped
+         * capable, setup netdev (will be skipped on later probes)
-         * on later probes
         */
-        if (!rionet_check) {
+        if (!oldnet) {
                rio_local_read_config_32(rdev->net->hport, RIO_SRC_OPS_CAR,
                                         &lsrc_ops);
                rio_local_read_config_32(rdev->net->hport, RIO_DST_OPS_CAR,
                                         &ldst_ops);
                if (!is_rionet_capable(lsrc_ops, ldst_ops)) {
                        printk(KERN_ERR
-                               "%s: local device is not network capable\n",
+                               "%s: local device %s is not network capable\n",
-                               DRV_NAME);
+                               DRV_NAME, rdev->net->hport->name);
-                        rionet_check = 1;
-                        rionet_capable = 0;
                        goto out;
                }
+                /* Allocate our net_device structure */
+                ndev = alloc_etherdev(sizeof(struct rionet_private));
+                if (ndev == NULL) {
+                        rc = -ENOMEM;
+                        goto out;
+                }
+                nets[netid].ndev = ndev;
                rc = rionet_setup_netdev(rdev->net->hport, ndev);
-                rionet_check = 1;
+                INIT_LIST_HEAD(&nets[netid].peers);
-        }
+                nets[netid].nact = 0;
+        } else if (nets[netid].ndev == NULL)
+                goto out;
        /*
         * If the remote device has mailbox/doorbell capabilities,
@@ -535,10 +556,10 @@ static int rionet_probe(struct rio_dev *rdev, const struct rio_device_id *id)
                        goto out;
                }
                peer->rdev = rdev;
-                list_add_tail(&peer->node, &rionet_peers);
+                list_add_tail(&peer->node, &nets[netid].peers);
        }
-        rio_set_drvdata(rdev, ndev);
+        rio_set_drvdata(rdev, nets[netid].ndev);
      out:
        return rc;
diff --git a/drivers/net/usb/cdc_eem.c b/drivers/net/usb/cdc_eem.c
index 434d5af8e6fb..c81e278629ff 100644
--- a/drivers/net/usb/cdc_eem.c
+++ b/drivers/net/usb/cdc_eem.c
@@ -244,8 +244,12 @@ static int eem_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
                         *  - suspend: peripheral ready to suspend
                         *  - response: suggest N millisec polling
                         *  - response complete: suggest N sec polling
+                         *
+                         * Suspend is reported and maybe heeded.
                         */
                        case 2:         /* Suspend hint */
+                                usbnet_device_suggests_idle(dev);
+                                continue;
                        case 3:         /* Response hint */
                        case 4:         /* Response complete hint */
                                continue;
diff --git a/drivers/net/usb/kaweth.c b/drivers/net/usb/kaweth.c
index c75e11e1b385..afb117c16d2d 100644
--- a/drivers/net/usb/kaweth.c
+++ b/drivers/net/usb/kaweth.c
@@ -424,7 +424,7 @@ static int kaweth_download_firmware(struct kaweth_device *kaweth,
        netdev_dbg(kaweth->net,
                   "Downloading firmware at %p to kaweth device at %p\n",
-                   fw->data, kaweth);
+                   kaweth->firmware_buf, kaweth);
        netdev_dbg(kaweth->net, "Firmware length: %d\n", data_len);
        return kaweth_control(kaweth,
diff --git a/drivers/net/usb/mcs7830.c b/drivers/net/usb/mcs7830.c
index 03c2d8d653df..cc7e72010ac3 100644
--- a/drivers/net/usb/mcs7830.c
+++ b/drivers/net/usb/mcs7830.c
@@ -117,6 +117,7 @@ enum {
 struct mcs7830_data {
        u8 multi_filter[8];
        u8 config;
+        u8 link_counter;
 };
 static const char driver_name[] = "MOSCHIP usb-ethernet driver";
@@ -632,20 +633,31 @@ static int mcs7830_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
 static void mcs7830_status(struct usbnet *dev, struct urb *urb)
 {
        u8 *buf = urb->transfer_buffer;
-        bool link;
+        bool link, link_changed;
+        struct mcs7830_data *data = mcs7830_get_data(dev);
        if (urb->actual_length < 16)
                return;
        link = !(buf[1] & 0x20);
-        if (netif_carrier_ok(dev->net) != link) {
+        link_changed = netif_carrier_ok(dev->net) != link;
-                if (link) {
+        if (link_changed) {
-                        netif_carrier_on(dev->net);
+                data->link_counter++;
-                        usbnet_defer_kevent(dev, EVENT_LINK_RESET);
+                /*
-                } else
+                   track link state 20 times to guard against erroneous
-                        netif_carrier_off(dev->net);
+                   link state changes reported sometimes by the chip
-                netdev_dbg(dev->net, "Link Status is: %d\n", link);
+                 */
-        }
+                if (data->link_counter > 20) {
+                        data->link_counter = 0;
+                        if (link) {
+                                netif_carrier_on(dev->net);
+                                usbnet_defer_kevent(dev, EVENT_LINK_RESET);
+                        } else
+                                netif_carrier_off(dev->net);
+                        netdev_dbg(dev->net, "Link Status is: %d\n", link);
+                }
+        } else
+                data->link_counter = 0;
 }
 static const struct driver_info moschip_info = {
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
index fc9f578a1e25..f9819d10b1f9 100644
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
@@ -1588,10 +1588,27 @@ int usbnet_resume (struct usb_interface *intf)
                        tasklet_schedule (&dev->bh);
                }
        }
+        if (test_and_clear_bit(EVENT_DEVICE_REPORT_IDLE, &dev->flags))
+                usb_autopm_get_interface_no_resume(intf);
        return 0;
 }
 EXPORT_SYMBOL_GPL(usbnet_resume);
+/*
+ * Either a subdriver implements manage_power, then it is assumed to always
+ * be ready to be suspended or it reports the readiness to be suspended
+ * explicitly
+ */
+void usbnet_device_suggests_idle(struct usbnet *dev)
+{
+        if (!test_and_set_bit(EVENT_DEVICE_REPORT_IDLE, &dev->flags)) {
+                dev->intf->needs_remote_wakeup = 1;
+                usb_autopm_put_interface_async(dev->intf);
+        }
+}
+EXPORT_SYMBOL(usbnet_device_suggests_idle);
 /*-------------------------------------------------------------------------*/
diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
index 51de9edb55f5..607976c00162 100644
--- a/drivers/net/vxlan.c
+++ b/drivers/net/vxlan.c
@@ -28,7 +28,6 @@
 #include <linux/igmp.h>
 #include <linux/etherdevice.h>
 #include <linux/if_ether.h>
-#include <linux/version.h>
 #include <linux/hash.h>
 #include <net/ip.h>
 #include <net/icmp.h>
@@ -107,6 +106,8 @@ struct vxlan_dev {
        __be32            gaddr;        /* multicast group */
        __be32            saddr;        /* source address */
        unsigned int      link;         /* link to multicast over */
+        __u16             port_min;     /* source port range */
+        __u16             port_max;
        __u8              tos;          /* TOS override */
        __u8              ttl;
        bool              learn;
@@ -229,9 +230,9 @@ static u32 eth_hash(const unsigned char *addr)
        /* only want 6 bytes */
 #ifdef __BIG_ENDIAN
-        value <<= 16;
-#else
        value >>= 16;
+#else
+        value <<= 16;
 #endif
        return hash_64(value, FDB_HASH_BITS);
 }
@@ -536,7 +537,6 @@ static int vxlan_udp_encap_recv(struct sock *sk, struct sk_buff *skb)
        }
        __skb_pull(skb, sizeof(struct vxlanhdr));
-        skb_postpull_rcsum(skb, eth_hdr(skb), sizeof(struct vxlanhdr));
        /* Is this VNI defined? */
        vni = ntohl(vxh->vx_vni) >> 8;
@@ -555,7 +555,6 @@ static int vxlan_udp_encap_recv(struct sock *sk, struct sk_buff *skb)
        /* Re-examine inner Ethernet packet */
        oip = ip_hdr(skb);
        skb->protocol = eth_type_trans(skb, vxlan->dev);
-        skb_postpull_rcsum(skb, eth_hdr(skb), ETH_HLEN);
        /* Ignore packet loops (and multicast echo) */
        if (compare_ether_addr(eth_hdr(skb)->h_source,
@@ -567,6 +566,7 @@ static int vxlan_udp_encap_recv(struct sock *sk, struct sk_buff *skb)
        __skb_tunnel_rx(skb, vxlan->dev);
        skb_reset_network_header(skb);
+        skb->ip_summed = CHECKSUM_NONE;
        err = IP_ECN_decapsulate(oip, skb);
        if (unlikely(err)) {
@@ -622,46 +622,89 @@ static inline u8 vxlan_ecn_encap(u8 tos,
        return INET_ECN_encapsulate(tos, inner);
 }
+static __be32 vxlan_find_dst(struct vxlan_dev *vxlan, struct sk_buff *skb)
+{
+        const struct ethhdr *eth = (struct ethhdr *) skb->data;
+        const struct vxlan_fdb *f;
+        if (is_multicast_ether_addr(eth->h_dest))
+                return vxlan->gaddr;
+        f = vxlan_find_mac(vxlan, eth->h_dest);
+        if (f)
+                return f->remote_ip;
+        else
+                return vxlan->gaddr;
+}
+static void vxlan_sock_free(struct sk_buff *skb)
+{
+        sock_put(skb->sk);
+}
+/* On transmit, associate with the tunnel socket */
+static void vxlan_set_owner(struct net_device *dev, struct sk_buff *skb)
+{
+        struct vxlan_net *vn = net_generic(dev_net(dev), vxlan_net_id);
+        struct sock *sk = vn->sock->sk;
+        skb_orphan(skb);
+        sock_hold(sk);
+        skb->sk = sk;
+        skb->destructor = vxlan_sock_free;
+}
+/* Compute source port for outgoing packet
+ *   first choice to use L4 flow hash since it will spread
+ *     better and maybe available from hardware
+ *   secondary choice is to use jhash on the Ethernet header
+ */
+static u16 vxlan_src_port(const struct vxlan_dev *vxlan, struct sk_buff *skb)
+{
+        unsigned int range = (vxlan->port_max - vxlan->port_min) + 1;
+        u32 hash;
+        hash = skb_get_rxhash(skb);
+        if (!hash)
+                hash = jhash(skb->data, 2 * ETH_ALEN,
+                             (__force u32) skb->protocol);
+        return (((u64) hash * range) >> 32) + vxlan->port_min;
+}
 /* Transmit local packets over Vxlan
 *
 * Outer IP header inherits ECN and DF from inner header.
 * Outer UDP destination is the VXLAN assigned port.
- *           source port is based on hash of flow if available
+ *           source port is based on hash of flow
- *                       otherwise use a random value
 */
 static netdev_tx_t vxlan_xmit(struct sk_buff *skb, struct net_device *dev)
 {
        struct vxlan_dev *vxlan = netdev_priv(dev);
        struct rtable *rt;
-        const struct ethhdr *eth;
        const struct iphdr *old_iph;
        struct iphdr *iph;
        struct vxlanhdr *vxh;
        struct udphdr *uh;
        struct flowi4 fl4;
-        struct vxlan_fdb *f;
        unsigned int pkt_len = skb->len;
-        u32 hash;
        __be32 dst;
+        __u16 src_port;
        __be16 df = 0;
        __u8 tos, ttl;
        int err;
+        dst = vxlan_find_dst(vxlan, skb);
+        if (!dst)
+                goto drop;
        /* Need space for new headers (invalidates iph ptr) */
        if (skb_cow_head(skb, VXLAN_HEADROOM))
                goto drop;
-        eth = (void *)skb->data;
        old_iph = ip_hdr(skb);
-        if (!is_multicast_ether_addr(eth->h_dest) &&
-            (f = vxlan_find_mac(vxlan, eth->h_dest)))
-                dst = f->remote_ip;
-        else if (vxlan->gaddr) {
-                dst = vxlan->gaddr;
-        } else
-                goto drop;
        ttl = vxlan->ttl;
        if (!ttl && IN_MULTICAST(ntohl(dst)))
                ttl = 1;
@@ -670,11 +713,15 @@ static netdev_tx_t vxlan_xmit(struct sk_buff *skb, struct net_device *dev)
        if (tos == 1)
                tos = vxlan_get_dsfield(old_iph, skb);
-        hash = skb_get_rxhash(skb);
+        src_port = vxlan_src_port(vxlan, skb);
+        memset(&fl4, 0, sizeof(fl4));
+        fl4.flowi4_oif = vxlan->link;
+        fl4.flowi4_tos = RT_TOS(tos);
+        fl4.daddr = dst;
+        fl4.saddr = vxlan->saddr;
-        rt = ip_route_output_gre(dev_net(dev), &fl4, dst,
+        rt = ip_route_output_key(dev_net(dev), &fl4);
-                                 vxlan->saddr, vxlan->vni,
-                                 RT_TOS(tos), vxlan->link);
        if (IS_ERR(rt)) {
                netdev_dbg(dev, "no route to %pI4\n", &dst);
                dev->stats.tx_carrier_errors++;
@@ -703,7 +750,7 @@ static netdev_tx_t vxlan_xmit(struct sk_buff *skb, struct net_device *dev)
        uh = udp_hdr(skb);
        uh->dest = htons(vxlan_port);
-        uh->source = hash ? :random32();
+        uh->source = htons(src_port);
        uh->len = htons(skb->len);
        uh->check = 0;
@@ -716,10 +763,12 @@ static netdev_tx_t vxlan_xmit(struct sk_buff *skb, struct net_device *dev)
        iph->frag_off   = df;
        iph->protocol   = IPPROTO_UDP;
        iph->tos        = vxlan_ecn_encap(tos, old_iph, skb);
-        iph->daddr      = fl4.daddr;
+        iph->daddr      = dst;
        iph->saddr      = fl4.saddr;
        iph->ttl        = ttl ? : ip4_dst_hoplimit(&rt->dst);
+        vxlan_set_owner(dev, skb);
        /* See __IPTUNNEL_XMIT */
        skb->ip_summed = CHECKSUM_NONE;
        ip_select_ident(iph, &rt->dst, NULL);
@@ -929,9 +978,11 @@ static void vxlan_setup(struct net_device *dev)
 {
        struct vxlan_dev *vxlan = netdev_priv(dev);
        unsigned h;
+        int low, high;
        eth_hw_addr_random(dev);
        ether_setup(dev);
+        dev->hard_header_len = ETH_HLEN + VXLAN_HEADROOM;
        dev->netdev_ops = &vxlan_netdev_ops;
        dev->destructor = vxlan_free;
@@ -948,6 +999,10 @@ static void vxlan_setup(struct net_device *dev)
        vxlan->age_timer.function = vxlan_cleanup;
        vxlan->age_timer.data = (unsigned long) vxlan;
+        inet_get_local_port_range(&low, &high);
+        vxlan->port_min = low;
+        vxlan->port_max = high;
        vxlan->dev = dev;
        for (h = 0; h < FDB_HASH_SIZE; ++h)
@@ -964,6 +1019,7 @@ static const struct nla_policy vxlan_policy[IFLA_VXLAN_MAX + 1] = {
        [IFLA_VXLAN_LEARNING]   = { .type = NLA_U8 },
        [IFLA_VXLAN_AGEING]     = { .type = NLA_U32 },
        [IFLA_VXLAN_LIMIT]      = { .type = NLA_U32 },
+        [IFLA_VXLAN_PORT_RANGE] = { .len  = sizeof(struct ifla_vxlan_port_range) },
 };
 static int vxlan_validate(struct nlattr *tb[], struct nlattr *data[])
@@ -996,6 +1052,18 @@ static int vxlan_validate(struct nlattr *tb[], struct nlattr *data[])
                        return -EADDRNOTAVAIL;
                }
        }
+        if (data[IFLA_VXLAN_PORT_RANGE]) {
+                const struct ifla_vxlan_port_range *p
+                        = nla_data(data[IFLA_VXLAN_PORT_RANGE]);
+                if (ntohs(p->high) < ntohs(p->low)) {
+                        pr_debug("port range %u .. %u not valid\n",
+                                 ntohs(p->low), ntohs(p->high));
+                        return -EINVAL;
+                }
+        }
        return 0;
 }
@@ -1022,14 +1090,18 @@ static int vxlan_newlink(struct net *net, struct net_device *dev,
        if (data[IFLA_VXLAN_LOCAL])
                vxlan->saddr = nla_get_be32(data[IFLA_VXLAN_LOCAL]);
-        if (data[IFLA_VXLAN_LINK]) {
+        if (data[IFLA_VXLAN_LINK] &&
-                vxlan->link = nla_get_u32(data[IFLA_VXLAN_LINK]);
+            (vxlan->link = nla_get_u32(data[IFLA_VXLAN_LINK]))) {
+                struct net_device *lowerdev
+                         = __dev_get_by_index(net, vxlan->link);
-                if (!tb[IFLA_MTU]) {
+                if (!lowerdev) {
-                        struct net_device *lowerdev;
+                        pr_info("ifindex %d does not exist\n", vxlan->link);
-                        lowerdev = __dev_get_by_index(net, vxlan->link);
+                        return -ENODEV;
-                        dev->mtu = lowerdev->mtu - VXLAN_HEADROOM;
                }
+                if (!tb[IFLA_MTU])
+                        dev->mtu = lowerdev->mtu - VXLAN_HEADROOM;
        }
        if (data[IFLA_VXLAN_TOS])
@@ -1046,6 +1118,13 @@ static int vxlan_newlink(struct net *net, struct net_device *dev,
        if (data[IFLA_VXLAN_LIMIT])
                vxlan->addrmax = nla_get_u32(data[IFLA_VXLAN_LIMIT]);
+        if (data[IFLA_VXLAN_PORT_RANGE]) {
+                const struct ifla_vxlan_port_range *p
+                        = nla_data(data[IFLA_VXLAN_PORT_RANGE]);
+                vxlan->port_min = ntohs(p->low);
+                vxlan->port_max = ntohs(p->high);
+        }
        err = register_netdevice(dev);
        if (!err)
                hlist_add_head_rcu(&vxlan->hlist, vni_head(net, vxlan->vni));
@@ -1074,23 +1153,28 @@ static size_t vxlan_get_size(const struct net_device *dev)
                nla_total_size(sizeof(__u8)) +  /* IFLA_VXLAN_LEARNING */
                nla_total_size(sizeof(__u32)) + /* IFLA_VXLAN_AGEING */
                nla_total_size(sizeof(__u32)) + /* IFLA_VXLAN_LIMIT */
+                nla_total_size(sizeof(struct ifla_vxlan_port_range)) +
                0;
 }
 static int vxlan_fill_info(struct sk_buff *skb, const struct net_device *dev)
 {
        const struct vxlan_dev *vxlan = netdev_priv(dev);
+        struct ifla_vxlan_port_range ports = {
+                .low =  htons(vxlan->port_min),
+                .high = htons(vxlan->port_max),
+        };
        if (nla_put_u32(skb, IFLA_VXLAN_ID, vxlan->vni))
                goto nla_put_failure;
-        if (vxlan->gaddr && nla_put_u32(skb, IFLA_VXLAN_GROUP, vxlan->gaddr))
+        if (vxlan->gaddr && nla_put_be32(skb, IFLA_VXLAN_GROUP, vxlan->gaddr))
                goto nla_put_failure;
        if (vxlan->link && nla_put_u32(skb, IFLA_VXLAN_LINK, vxlan->link))
                goto nla_put_failure;
-        if (vxlan->saddr && nla_put_u32(skb, IFLA_VXLAN_LOCAL, vxlan->saddr))
+        if (vxlan->saddr && nla_put_be32(skb, IFLA_VXLAN_LOCAL, vxlan->saddr))
                goto nla_put_failure;
        if (nla_put_u8(skb, IFLA_VXLAN_TTL, vxlan->ttl) ||
@@ -1100,6 +1184,9 @@ static int vxlan_fill_info(struct sk_buff *skb, const struct net_device *dev)
            nla_put_u32(skb, IFLA_VXLAN_LIMIT, vxlan->addrmax))
                goto nla_put_failure;
+        if (nla_put(skb, IFLA_VXLAN_PORT_RANGE, sizeof(ports), &ports))
+                goto nla_put_failure;
        return 0;
 nla_put_failure:
diff --git a/drivers/net/wan/farsync.c b/drivers/net/wan/farsync.c
index 1a623183cbe5..b6271325f803 100644
--- a/drivers/net/wan/farsync.c
+++ b/drivers/net/wan/farsync.c
@@ -597,7 +597,7 @@ fst_q_work_item(u64 * queue, int card_index)
         * bottom half for the card.  Note the limitation of 64 cards.
         * That ought to be enough
         */
-        mask = 1 << card_index;
+        mask = (u64)1 << card_index;
        *queue |= mask;
        spin_unlock_irqrestore(&fst_work_q_lock, flags);
 }
diff --git a/drivers/net/wan/z85230.c b/drivers/net/wan/z85230.c
index 0e5769061702..feacc3b994b7 100644
--- a/drivers/net/wan/z85230.c
+++ b/drivers/net/wan/z85230.c
@@ -1775,7 +1775,7 @@ EXPORT_SYMBOL(z8530_queue_xmit);
 /*
 *      Module support
 */
-static const char banner[] __initdata =
+static const char banner[] __initconst =
        KERN_INFO "Generic Z85C30/Z85230 interface driver v0.02\n";
 static int __init z85230_init_driver(void)
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h b/drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
index 89bf94d4d8a1..6f7cf49eff4d 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
+++ b/drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
@@ -534,107 +534,107 @@ static const u32 ar9300_2p2_baseband_core[][2] = {
 static const u32 ar9300Modes_high_power_tx_gain_table_2p2[][5] = {
        /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
-        {0x0000a2dc, 0x000cfff0, 0x000cfff0, 0x03aaa352, 0x03aaa352},
+        {0x0000a2dc, 0x00033800, 0x00033800, 0x03aaa352, 0x03aaa352},
-        {0x0000a2e0, 0x000f0000, 0x000f0000, 0x03ccc584, 0x03ccc584},
+        {0x0000a2e0, 0x0003c000, 0x0003c000, 0x03ccc584, 0x03ccc584},
-        {0x0000a2e4, 0x03f00000, 0x03f00000, 0x03f0f800, 0x03f0f800},
+        {0x0000a2e4, 0x03fc0000, 0x03fc0000, 0x03f0f800, 0x03f0f800},
        {0x0000a2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
        {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d9, 0x000050d9},
        {0x0000a500, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
        {0x0000a504, 0x06000003, 0x06000003, 0x04000002, 0x04000002},
        {0x0000a508, 0x0a000020, 0x0a000020, 0x08000004, 0x08000004},
        {0x0000a50c, 0x10000023, 0x10000023, 0x0b000200, 0x0b000200},
-        {0x0000a510, 0x15000028, 0x15000028, 0x0f000202, 0x0f000202},
+        {0x0000a510, 0x16000220, 0x16000220, 0x0f000202, 0x0f000202},
-        {0x0000a514, 0x1b00002b, 0x1b00002b, 0x12000400, 0x12000400},
+        {0x0000a514, 0x1c000223, 0x1c000223, 0x12000400, 0x12000400},
-        {0x0000a518, 0x1f020028, 0x1f020028, 0x16000402, 0x16000402},
+        {0x0000a518, 0x21002220, 0x21002220, 0x16000402, 0x16000402},
-        {0x0000a51c, 0x2502002b, 0x2502002b, 0x19000404, 0x19000404},
+        {0x0000a51c, 0x27002223, 0x27002223, 0x19000404, 0x19000404},
-        {0x0000a520, 0x2a04002a, 0x2a04002a, 0x1c000603, 0x1c000603},
+        {0x0000a520, 0x2b022220, 0x2b022220, 0x1c000603, 0x1c000603},
-        {0x0000a524, 0x2e06002a, 0x2e06002a, 0x21000a02, 0x21000a02},
+        {0x0000a524, 0x2f022222, 0x2f022222, 0x21000a02, 0x21000a02},
-        {0x0000a528, 0x3302202d, 0x3302202d, 0x25000a04, 0x25000a04},
+        {0x0000a528, 0x34022225, 0x34022225, 0x25000a04, 0x25000a04},
-        {0x0000a52c, 0x3804202c, 0x3804202c, 0x28000a20, 0x28000a20},
+        {0x0000a52c, 0x3a02222a, 0x3a02222a, 0x28000a20, 0x28000a20},
-        {0x0000a530, 0x3c06202c, 0x3c06202c, 0x2c000e20, 0x2c000e20},
+        {0x0000a530, 0x3e02222c, 0x3e02222c, 0x2c000e20, 0x2c000e20},
-        {0x0000a534, 0x4108202d, 0x4108202d, 0x30000e22, 0x30000e22},
+        {0x0000a534, 0x4202242a, 0x4202242a, 0x30000e22, 0x30000e22},
-        {0x0000a538, 0x4506402d, 0x4506402d, 0x34000e24, 0x34000e24},
+        {0x0000a538, 0x4702244a, 0x4702244a, 0x34000e24, 0x34000e24},
-        {0x0000a53c, 0x4906222d, 0x4906222d, 0x38001640, 0x38001640},
+        {0x0000a53c, 0x4b02244c, 0x4b02244c, 0x38001640, 0x38001640},
-        {0x0000a540, 0x4d062231, 0x4d062231, 0x3c001660, 0x3c001660},
+        {0x0000a540, 0x4e02246c, 0x4e02246c, 0x3c001660, 0x3c001660},
-        {0x0000a544, 0x50082231, 0x50082231, 0x3f001861, 0x3f001861},
+        {0x0000a544, 0x52022470, 0x52022470, 0x3f001861, 0x3f001861},
-        {0x0000a548, 0x5608422e, 0x5608422e, 0x43001a81, 0x43001a81},
+        {0x0000a548, 0x55022490, 0x55022490, 0x43001a81, 0x43001a81},
-        {0x0000a54c, 0x5a08442e, 0x5a08442e, 0x47001a83, 0x47001a83},
+        {0x0000a54c, 0x59022492, 0x59022492, 0x47001a83, 0x47001a83},
-        {0x0000a550, 0x5e0a4431, 0x5e0a4431, 0x4a001c84, 0x4a001c84},
+        {0x0000a550, 0x5d022692, 0x5d022692, 0x4a001c84, 0x4a001c84},
-        {0x0000a554, 0x640a4432, 0x640a4432, 0x4e001ce3, 0x4e001ce3},
+        {0x0000a554, 0x61022892, 0x61022892, 0x4e001ce3, 0x4e001ce3},
-        {0x0000a558, 0x680a4434, 0x680a4434, 0x52001ce5, 0x52001ce5},
+        {0x0000a558, 0x65024890, 0x65024890, 0x52001ce5, 0x52001ce5},
-        {0x0000a55c, 0x6c0a6434, 0x6c0a6434, 0x56001ce9, 0x56001ce9},
+        {0x0000a55c, 0x69024892, 0x69024892, 0x56001ce9, 0x56001ce9},
-        {0x0000a560, 0x6f0a6633, 0x6f0a6633, 0x5a001ceb, 0x5a001ceb},
+        {0x0000a560, 0x6e024c92, 0x6e024c92, 0x5a001ceb, 0x5a001ceb},
-        {0x0000a564, 0x730c6634, 0x730c6634, 0x5d001eec, 0x5d001eec},
+        {0x0000a564, 0x74026e92, 0x74026e92, 0x5d001eec, 0x5d001eec},
-        {0x0000a568, 0x730c6634, 0x730c6634, 0x5d001eec, 0x5d001eec},
+        {0x0000a568, 0x74026e92, 0x74026e92, 0x5d001eec, 0x5d001eec},
-        {0x0000a56c, 0x730c6634, 0x730c6634, 0x5d001eec, 0x5d001eec},
+        {0x0000a56c, 0x74026e92, 0x74026e92, 0x5d001eec, 0x5d001eec},
-        {0x0000a570, 0x730c6634, 0x730c6634, 0x5d001eec, 0x5d001eec},
+        {0x0000a570, 0x74026e92, 0x74026e92, 0x5d001eec, 0x5d001eec},
-        {0x0000a574, 0x730c6634, 0x730c6634, 0x5d001eec, 0x5d001eec},
+        {0x0000a574, 0x74026e92, 0x74026e92, 0x5d001eec, 0x5d001eec},
-        {0x0000a578, 0x730c6634, 0x730c6634, 0x5d001eec, 0x5d001eec},
+        {0x0000a578, 0x74026e92, 0x74026e92, 0x5d001eec, 0x5d001eec},
-        {0x0000a57c, 0x730c6634, 0x730c6634, 0x5d001eec, 0x5d001eec},
+        {0x0000a57c, 0x74026e92, 0x74026e92, 0x5d001eec, 0x5d001eec},
        {0x0000a580, 0x00800000, 0x00800000, 0x00800000, 0x00800000},
        {0x0000a584, 0x06800003, 0x06800003, 0x04800002, 0x04800002},
        {0x0000a588, 0x0a800020, 0x0a800020, 0x08800004, 0x08800004},
        {0x0000a58c, 0x10800023, 0x10800023, 0x0b800200, 0x0b800200},
-        {0x0000a590, 0x15800028, 0x15800028, 0x0f800202, 0x0f800202},
+        {0x0000a590, 0x16800220, 0x16800220, 0x0f800202, 0x0f800202},
-        {0x0000a594, 0x1b80002b, 0x1b80002b, 0x12800400, 0x12800400},
+        {0x0000a594, 0x1c800223, 0x1c800223, 0x12800400, 0x12800400},
-        {0x0000a598, 0x1f820028, 0x1f820028, 0x16800402, 0x16800402},
+        {0x0000a598, 0x21802220, 0x21802220, 0x16800402, 0x16800402},
-        {0x0000a59c, 0x2582002b, 0x2582002b, 0x19800404, 0x19800404},
+        {0x0000a59c, 0x27802223, 0x27802223, 0x19800404, 0x19800404},
-        {0x0000a5a0, 0x2a84002a, 0x2a84002a, 0x1c800603, 0x1c800603},
+        {0x0000a5a0, 0x2b822220, 0x2b822220, 0x1c800603, 0x1c800603},
-        {0x0000a5a4, 0x2e86002a, 0x2e86002a, 0x21800a02, 0x21800a02},
+        {0x0000a5a4, 0x2f822222, 0x2f822222, 0x21800a02, 0x21800a02},
-        {0x0000a5a8, 0x3382202d, 0x3382202d, 0x25800a04, 0x25800a04},
+        {0x0000a5a8, 0x34822225, 0x34822225, 0x25800a04, 0x25800a04},
-        {0x0000a5ac, 0x3884202c, 0x3884202c, 0x28800a20, 0x28800a20},
+        {0x0000a5ac, 0x3a82222a, 0x3a82222a, 0x28800a20, 0x28800a20},
-        {0x0000a5b0, 0x3c86202c, 0x3c86202c, 0x2c800e20, 0x2c800e20},
+        {0x0000a5b0, 0x3e82222c, 0x3e82222c, 0x2c800e20, 0x2c800e20},
-        {0x0000a5b4, 0x4188202d, 0x4188202d, 0x30800e22, 0x30800e22},
+        {0x0000a5b4, 0x4282242a, 0x4282242a, 0x30800e22, 0x30800e22},
-        {0x0000a5b8, 0x4586402d, 0x4586402d, 0x34800e24, 0x34800e24},
+        {0x0000a5b8, 0x4782244a, 0x4782244a, 0x34800e24, 0x34800e24},
-        {0x0000a5bc, 0x4986222d, 0x4986222d, 0x38801640, 0x38801640},
+        {0x0000a5bc, 0x4b82244c, 0x4b82244c, 0x38801640, 0x38801640},
-        {0x0000a5c0, 0x4d862231, 0x4d862231, 0x3c801660, 0x3c801660},
+        {0x0000a5c0, 0x4e82246c, 0x4e82246c, 0x3c801660, 0x3c801660},
-        {0x0000a5c4, 0x50882231, 0x50882231, 0x3f801861, 0x3f801861},
+        {0x0000a5c4, 0x52822470, 0x52822470, 0x3f801861, 0x3f801861},
-        {0x0000a5c8, 0x5688422e, 0x5688422e, 0x43801a81, 0x43801a81},
+        {0x0000a5c8, 0x55822490, 0x55822490, 0x43801a81, 0x43801a81},
-        {0x0000a5cc, 0x5a88442e, 0x5a88442e, 0x47801a83, 0x47801a83},
+        {0x0000a5cc, 0x59822492, 0x59822492, 0x47801a83, 0x47801a83},
-        {0x0000a5d0, 0x5e8a4431, 0x5e8a4431, 0x4a801c84, 0x4a801c84},
+        {0x0000a5d0, 0x5d822692, 0x5d822692, 0x4a801c84, 0x4a801c84},
-        {0x0000a5d4, 0x648a4432, 0x648a4432, 0x4e801ce3, 0x4e801ce3},
+        {0x0000a5d4, 0x61822892, 0x61822892, 0x4e801ce3, 0x4e801ce3},
-        {0x0000a5d8, 0x688a4434, 0x688a4434, 0x52801ce5, 0x52801ce5},
+        {0x0000a5d8, 0x65824890, 0x65824890, 0x52801ce5, 0x52801ce5},
-        {0x0000a5dc, 0x6c8a6434, 0x6c8a6434, 0x56801ce9, 0x56801ce9},
+        {0x0000a5dc, 0x69824892, 0x69824892, 0x56801ce9, 0x56801ce9},
-        {0x0000a5e0, 0x6f8a6633, 0x6f8a6633, 0x5a801ceb, 0x5a801ceb},
+        {0x0000a5e0, 0x6e824c92, 0x6e824c92, 0x5a801ceb, 0x5a801ceb},
-        {0x0000a5e4, 0x738c6634, 0x738c6634, 0x5d801eec, 0x5d801eec},
+        {0x0000a5e4, 0x74826e92, 0x74826e92, 0x5d801eec, 0x5d801eec},
-        {0x0000a5e8, 0x738c6634, 0x738c6634, 0x5d801eec, 0x5d801eec},
+        {0x0000a5e8, 0x74826e92, 0x74826e92, 0x5d801eec, 0x5d801eec},
-        {0x0000a5ec, 0x738c6634, 0x738c6634, 0x5d801eec, 0x5d801eec},
+        {0x0000a5ec, 0x74826e92, 0x74826e92, 0x5d801eec, 0x5d801eec},
-        {0x0000a5f0, 0x738c6634, 0x738c6634, 0x5d801eec, 0x5d801eec},
+        {0x0000a5f0, 0x74826e92, 0x74826e92, 0x5d801eec, 0x5d801eec},
-        {0x0000a5f4, 0x738c6634, 0x738c6634, 0x5d801eec, 0x5d801eec},
+        {0x0000a5f4, 0x74826e92, 0x74826e92, 0x5d801eec, 0x5d801eec},
-        {0x0000a5f8, 0x738c6634, 0x738c6634, 0x5d801eec, 0x5d801eec},
+        {0x0000a5f8, 0x74826e92, 0x74826e92, 0x5d801eec, 0x5d801eec},
-        {0x0000a5fc, 0x738c6634, 0x738c6634, 0x5d801eec, 0x5d801eec},
+        {0x0000a5fc, 0x74826e92, 0x74826e92, 0x5d801eec, 0x5d801eec},
        {0x0000a600, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
        {0x0000a604, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000a608, 0x01804601, 0x01804601, 0x00000000, 0x00000000},
+        {0x0000a608, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000a60c, 0x01804601, 0x01804601, 0x00000000, 0x00000000},
+        {0x0000a60c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000a610, 0x01804601, 0x01804601, 0x00000000, 0x00000000},
+        {0x0000a610, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000a614, 0x01804601, 0x01804601, 0x01404000, 0x01404000},
+        {0x0000a614, 0x02004000, 0x02004000, 0x01404000, 0x01404000},
-        {0x0000a618, 0x01804601, 0x01804601, 0x01404501, 0x01404501},
+        {0x0000a618, 0x02004801, 0x02004801, 0x01404501, 0x01404501},
-        {0x0000a61c, 0x01804601, 0x01804601, 0x02008501, 0x02008501},
+        {0x0000a61c, 0x02808a02, 0x02808a02, 0x02008501, 0x02008501},
-        {0x0000a620, 0x03408d02, 0x03408d02, 0x0280ca03, 0x0280ca03},
+        {0x0000a620, 0x0380ce03, 0x0380ce03, 0x0280ca03, 0x0280ca03},
-        {0x0000a624, 0x0300cc03, 0x0300cc03, 0x03010c04, 0x03010c04},
+        {0x0000a624, 0x04411104, 0x04411104, 0x03010c04, 0x03010c04},
-        {0x0000a628, 0x03410d04, 0x03410d04, 0x04014c04, 0x04014c04},
+        {0x0000a628, 0x04411104, 0x04411104, 0x04014c04, 0x04014c04},
-        {0x0000a62c, 0x03410d04, 0x03410d04, 0x04015005, 0x04015005},
+        {0x0000a62c, 0x04411104, 0x04411104, 0x04015005, 0x04015005},
-        {0x0000a630, 0x03410d04, 0x03410d04, 0x04015005, 0x04015005},
+        {0x0000a630, 0x04411104, 0x04411104, 0x04015005, 0x04015005},
-        {0x0000a634, 0x03410d04, 0x03410d04, 0x04015005, 0x04015005},
+        {0x0000a634, 0x04411104, 0x04411104, 0x04015005, 0x04015005},
-        {0x0000a638, 0x03410d04, 0x03410d04, 0x04015005, 0x04015005},
+        {0x0000a638, 0x04411104, 0x04411104, 0x04015005, 0x04015005},
-        {0x0000a63c, 0x03410d04, 0x03410d04, 0x04015005, 0x04015005},
+        {0x0000a63c, 0x04411104, 0x04411104, 0x04015005, 0x04015005},
-        {0x0000b2dc, 0x000cfff0, 0x000cfff0, 0x03aaa352, 0x03aaa352},
+        {0x0000b2dc, 0x00033800, 0x00033800, 0x03aaa352, 0x03aaa352},
-        {0x0000b2e0, 0x000f0000, 0x000f0000, 0x03ccc584, 0x03ccc584},
+        {0x0000b2e0, 0x0003c000, 0x0003c000, 0x03ccc584, 0x03ccc584},
-        {0x0000b2e4, 0x03f00000, 0x03f00000, 0x03f0f800, 0x03f0f800},
+        {0x0000b2e4, 0x03fc0000, 0x03fc0000, 0x03f0f800, 0x03f0f800},
        {0x0000b2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
-        {0x0000c2dc, 0x000cfff0, 0x000cfff0, 0x03aaa352, 0x03aaa352},
+        {0x0000c2dc, 0x00033800, 0x00033800, 0x03aaa352, 0x03aaa352},
-        {0x0000c2e0, 0x000f0000, 0x000f0000, 0x03ccc584, 0x03ccc584},
+        {0x0000c2e0, 0x0003c000, 0x0003c000, 0x03ccc584, 0x03ccc584},
-        {0x0000c2e4, 0x03f00000, 0x03f00000, 0x03f0f800, 0x03f0f800},
+        {0x0000c2e4, 0x03fc0000, 0x03fc0000, 0x03f0f800, 0x03f0f800},
        {0x0000c2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
        {0x00016044, 0x012492d4, 0x012492d4, 0x012492d4, 0x012492d4},
-        {0x00016048, 0x61200001, 0x61200001, 0x66480001, 0x66480001},
+        {0x00016048, 0x66480001, 0x66480001, 0x66480001, 0x66480001},
        {0x00016068, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
        {0x00016444, 0x012492d4, 0x012492d4, 0x012492d4, 0x012492d4},
-        {0x00016448, 0x61200001, 0x61200001, 0x66480001, 0x66480001},
+        {0x00016448, 0x66480001, 0x66480001, 0x66480001, 0x66480001},
        {0x00016468, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
        {0x00016844, 0x012492d4, 0x012492d4, 0x012492d4, 0x012492d4},
-        {0x00016848, 0x61200001, 0x61200001, 0x66480001, 0x66480001},
+        {0x00016848, 0x66480001, 0x66480001, 0x66480001, 0x66480001},
        {0x00016868, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
 };
diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.c b/drivers/net/wireless/ath/ath9k/hif_usb.c
index 924c4616c3d9..f5dda84176c3 100644
--- a/drivers/net/wireless/ath/ath9k/hif_usb.c
+++ b/drivers/net/wireless/ath/ath9k/hif_usb.c
@@ -38,6 +38,7 @@ static struct usb_device_id ath9k_hif_usb_ids[] = {
        { USB_DEVICE(0x04CA, 0x4605) }, /* Liteon */
        { USB_DEVICE(0x040D, 0x3801) }, /* VIA */
        { USB_DEVICE(0x0cf3, 0xb003) }, /* Ubiquiti WifiStation Ext */
+        { USB_DEVICE(0x0cf3, 0xb002) }, /* Ubiquiti WifiStation */
        { USB_DEVICE(0x057c, 0x8403) }, /* AVM FRITZ!WLAN 11N v2 USB */
        { USB_DEVICE(0x0cf3, 0x7015),
diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c
index 378bd70256b2..741918a2027b 100644
--- a/drivers/net/wireless/ath/ath9k/xmit.c
+++ b/drivers/net/wireless/ath/ath9k/xmit.c
@@ -312,6 +312,7 @@ static struct ath_buf *ath_tx_get_buffer(struct ath_softc *sc)
        }
        bf = list_first_entry(&sc->tx.txbuf, struct ath_buf, list);
+        bf->bf_next = NULL;
        list_del(&bf->list);
        spin_unlock_bh(&sc->tx.txbuflock);
@@ -393,7 +394,7 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,
        u16 seq_st = 0, acked_cnt = 0, txfail_cnt = 0, seq_first;
        u32 ba[WME_BA_BMP_SIZE >> 5];
        int isaggr, txfail, txpending, sendbar = 0, needreset = 0, nbad = 0;
-        bool rc_update = true;
+        bool rc_update = true, isba;
        struct ieee80211_tx_rate rates[4];
        struct ath_frame_info *fi;
        int nframes;
@@ -437,13 +438,17 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,
        tidno = ieee80211_get_qos_ctl(hdr)[0] & IEEE80211_QOS_CTL_TID_MASK;
        tid = ATH_AN_2_TID(an, tidno);
        seq_first = tid->seq_start;
+        isba = ts->ts_flags & ATH9K_TX_BA;
        /*
         * The hardware occasionally sends a tx status for the wrong TID.
         * In this case, the BA status cannot be considered valid and all
         * subframes need to be retransmitted
+         *
+         * Only BlockAcks have a TID and therefore normal Acks cannot be
+         * checked
         */
-        if (tidno != ts->tid)
+        if (isba && tidno != ts->tid)
                txok = false;
        isaggr = bf_isaggr(bf);
@@ -1774,6 +1779,7 @@ static void ath_tx_send_normal(struct ath_softc *sc, struct ath_txq *txq,
        list_add_tail(&bf->list, &bf_head);
        bf->bf_state.bf_type = 0;
+        bf->bf_next = NULL;
        bf->bf_lastbf = bf;
        ath_tx_fill_desc(sc, bf, txq, fi->framelen);
        ath_tx_txqaddbuf(sc, txq, &bf_head, false);
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index 73730e94e0ac..c5a99c8c8168 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -5404,6 +5404,8 @@ static void b43_bcma_remove(struct bcma_device *core)
        cancel_work_sync(&wldev->restart_work);
        B43_WARN_ON(!wl);
+        if (!wldev->fw.ucode.data)
+                return;                 /* NULL if firmware never loaded */
        if (wl->current_dev == wldev && wl->hw_registred) {
                b43_leds_stop(wldev);
                ieee80211_unregister_hw(wl->hw);
@@ -5478,6 +5480,8 @@ static void b43_ssb_remove(struct ssb_device *sdev)
        cancel_work_sync(&wldev->restart_work);
        B43_WARN_ON(!wl);
+        if (!wldev->fw.ucode.data)
+                return;                 /* NULL if firmware never loaded */
        if (wl->current_dev == wldev && wl->hw_registred) {
                b43_leds_stop(wldev);
                ieee80211_unregister_hw(wl->hw);
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/usb.c b/drivers/net/wireless/brcm80211/brcmfmac/usb.c
index a2b4b1e71017..7a6dfdc67b6c 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/usb.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/usb.c
@@ -1339,7 +1339,7 @@ static int brcmf_usb_probe_cb(struct brcmf_usbdev_info *devinfo,
        }
        ret = brcmf_bus_start(dev);
-        if (ret == -ENOLINK) {
+        if (ret) {
                brcmf_dbg(ERROR, "dongle is not responding\n");
                brcmf_detach(dev);
                goto fail;
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
index c1abaa6db59e..a6f1e8166008 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
@@ -3569,7 +3569,7 @@ brcmf_cfg80211_sched_scan_start(struct wiphy *wiphy,
        if (!request || !request->n_ssids || !request->n_match_sets) {
                WL_ERR("Invalid sched scan req!! n_ssids:%d\n",
-                       request->n_ssids);
+                       request ? request->n_ssids : 0);
                return -EINVAL;
        }
@@ -3972,7 +3972,7 @@ brcmf_set_management_ie(struct brcmf_cfg80211_info *cfg,
        u8  *iovar_ie_buf;
        u8  *curr_ie_buf;
        u8  *mgmt_ie_buf = NULL;
-        u32 mgmt_ie_buf_len = 0;
+        int mgmt_ie_buf_len;
        u32 *mgmt_ie_len = 0;
        u32 del_add_ie_buf_len = 0;
        u32 total_ie_buf_len = 0;
@@ -3982,7 +3982,7 @@ brcmf_set_management_ie(struct brcmf_cfg80211_info *cfg,
        struct parsed_vndr_ie_info *vndrie_info;
        s32 i;
        u8 *ptr;
-        u32 remained_buf_len;
+        int remained_buf_len;
        WL_TRACE("bssidx %d, pktflag : 0x%02X\n", bssidx, pktflag);
        iovar_ie_buf = kzalloc(WL_EXTRA_BUF_MAX, GFP_KERNEL);
@@ -4606,12 +4606,13 @@ brcmf_bss_roaming_done(struct brcmf_cfg80211_info *cfg,
        struct brcmf_cfg80211_profile *profile = cfg->profile;
        struct brcmf_cfg80211_connect_info *conn_info = cfg_to_conn(cfg);
        struct wiphy *wiphy = cfg_to_wiphy(cfg);
-        struct brcmf_channel_info_le channel_le;
+        struct ieee80211_channel *notify_channel = NULL;
-        struct ieee80211_channel *notify_channel;
        struct ieee80211_supported_band *band;
+        struct brcmf_bss_info_le *bi;
        u32 freq;
        s32 err = 0;
        u32 target_channel;
+        u8 *buf;
        WL_TRACE("Enter\n");
@@ -4619,11 +4620,22 @@ brcmf_bss_roaming_done(struct brcmf_cfg80211_info *cfg,
        memcpy(profile->bssid, e->addr, ETH_ALEN);
        brcmf_update_bss_info(cfg);
-        brcmf_exec_dcmd(ndev, BRCMF_C_GET_CHANNEL, &channel_le,
+        buf = kzalloc(WL_BSS_INFO_MAX, GFP_KERNEL);
-                        sizeof(channel_le));
+        if (buf == NULL) {
+                err = -ENOMEM;
+                goto done;
+        }
+        /* data sent to dongle has to be little endian */
+        *(__le32 *)buf = cpu_to_le32(WL_BSS_INFO_MAX);
+        err = brcmf_exec_dcmd(ndev, BRCMF_C_GET_BSS_INFO, buf, WL_BSS_INFO_MAX);
+        if (err)
+                goto done;
-        target_channel = le32_to_cpu(channel_le.target_channel);
+        bi = (struct brcmf_bss_info_le *)(buf + 4);
-        WL_CONN("Roamed to channel %d\n", target_channel);
+        target_channel = bi->ctl_ch ? bi->ctl_ch :
+                                      CHSPEC_CHANNEL(le16_to_cpu(bi->chanspec));
        if (target_channel <= CH_MAX_2G_CHANNEL)
                band = wiphy->bands[IEEE80211_BAND_2GHZ];
@@ -4633,6 +4645,8 @@ brcmf_bss_roaming_done(struct brcmf_cfg80211_info *cfg,
        freq = ieee80211_channel_to_frequency(target_channel, band->band);
        notify_channel = ieee80211_get_channel(wiphy, freq);
+done:
+        kfree(buf);
        cfg80211_roamed(ndev, notify_channel, (u8 *)profile->bssid,
                        conn_info->req_ie, conn_info->req_ie_len,
                        conn_info->resp_ie, conn_info->resp_ie_len, GFP_KERNEL);
@@ -5186,41 +5200,6 @@ brcmf_cfg80211_event(struct net_device *ndev,
                schedule_work(&cfg->event_work);
 }
-static s32 brcmf_dongle_mode(struct net_device *ndev, s32 iftype)
-{
-        s32 infra = 0;
-        s32 err = 0;
-        switch (iftype) {
-        case NL80211_IFTYPE_MONITOR:
-        case NL80211_IFTYPE_WDS:
-                WL_ERR("type (%d) : currently we do not support this mode\n",
-                       iftype);
-                err = -EINVAL;
-                return err;
-        case NL80211_IFTYPE_ADHOC:
-                infra = 0;
-                break;
-        case NL80211_IFTYPE_STATION:
-                infra = 1;
-                break;
-        case NL80211_IFTYPE_AP:
-                infra = 1;
-                break;
-        default:
-                err = -EINVAL;
-                WL_ERR("invalid type (%d)\n", iftype);
-                return err;
-        }
-        err = brcmf_exec_dcmd_u32(ndev, BRCMF_C_SET_INFRA, &infra);
-        if (err) {
-                WL_ERR("WLC_SET_INFRA error (%d)\n", err);
-                return err;
-        }
-        return 0;
-}
 static s32 brcmf_dongle_eventmsg(struct net_device *ndev)
 {
        /* Room for "event_msgs" + '\0' + bitvec */
@@ -5439,7 +5418,8 @@ static s32 brcmf_config_dongle(struct brcmf_cfg80211_info *cfg)
                                WL_BEACON_TIMEOUT);
        if (err)
                goto default_conf_out;
-        err = brcmf_dongle_mode(ndev, wdev->iftype);
+        err = brcmf_cfg80211_change_iface(wdev->wiphy, ndev, wdev->iftype,
+                                          NULL, NULL);
        if (err && err != -EINPROGRESS)
                goto default_conf_out;
        err = brcmf_dongle_probecap(cfg);
diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c
index 935120fc8c93..768bf612533e 100644
--- a/drivers/net/wireless/ipw2x00/ipw2200.c
+++ b/drivers/net/wireless/ipw2x00/ipw2200.c
@@ -10472,7 +10472,7 @@ static void ipw_handle_promiscuous_tx(struct ipw_priv *priv,
                } else
                        len = src->len;
-                dst = alloc_skb(len + sizeof(*rt_hdr), GFP_ATOMIC);
+                dst = alloc_skb(len + sizeof(*rt_hdr) + sizeof(u16)*2, GFP_ATOMIC);
                if (!dst)
                        continue;
diff --git a/drivers/net/wireless/iwlwifi/dvm/devices.c b/drivers/net/wireless/iwlwifi/dvm/devices.c
index 349c205d5f62..da5862064195 100644
--- a/drivers/net/wireless/iwlwifi/dvm/devices.c
+++ b/drivers/net/wireless/iwlwifi/dvm/devices.c
@@ -518,7 +518,7 @@ static int iwl6000_hw_channel_switch(struct iwl_priv *priv,
         * See iwlagn_mac_channel_switch.
         */
        struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];
-        struct iwl6000_channel_switch_cmd cmd;
+        struct iwl6000_channel_switch_cmd *cmd;
        u32 switch_time_in_usec, ucode_switch_time;
        u16 ch;
        u32 tsf_low;
@@ -527,18 +527,25 @@ static int iwl6000_hw_channel_switch(struct iwl_priv *priv,
        struct ieee80211_vif *vif = ctx->vif;
        struct iwl_host_cmd hcmd = {
                .id = REPLY_CHANNEL_SWITCH,
-                .len = { sizeof(cmd), },
+                .len = { sizeof(*cmd), },
                .flags = CMD_SYNC,
-                .data = { &cmd, },
+                .dataflags[0] = IWL_HCMD_DFL_NOCOPY,
        };
+        int err;
-        cmd.band = priv->band == IEEE80211_BAND_2GHZ;
+        cmd = kzalloc(sizeof(*cmd), GFP_KERNEL);
+        if (!cmd)
+                return -ENOMEM;
+        hcmd.data[0] = cmd;
+        cmd->band = priv->band == IEEE80211_BAND_2GHZ;
        ch = ch_switch->channel->hw_value;
        IWL_DEBUG_11H(priv, "channel switch from %u to %u\n",
                      ctx->active.channel, ch);
-        cmd.channel = cpu_to_le16(ch);
+        cmd->channel = cpu_to_le16(ch);
-        cmd.rxon_flags = ctx->staging.flags;
+        cmd->rxon_flags = ctx->staging.flags;
-        cmd.rxon_filter_flags = ctx->staging.filter_flags;
+        cmd->rxon_filter_flags = ctx->staging.filter_flags;
        switch_count = ch_switch->count;
        tsf_low = ch_switch->timestamp & 0x0ffffffff;
        /*
@@ -554,23 +561,25 @@ static int iwl6000_hw_channel_switch(struct iwl_priv *priv,
                        switch_count = 0;
        }
        if (switch_count <= 1)
-                cmd.switch_time = cpu_to_le32(priv->ucode_beacon_time);
+                cmd->switch_time = cpu_to_le32(priv->ucode_beacon_time);
        else {
                switch_time_in_usec =
                        vif->bss_conf.beacon_int * switch_count * TIME_UNIT;
                ucode_switch_time = iwl_usecs_to_beacons(priv,
                                                         switch_time_in_usec,
                                                         beacon_interval);
-                cmd.switch_time = iwl_add_beacon_time(priv,
+                cmd->switch_time = iwl_add_beacon_time(priv,
-                                                      priv->ucode_beacon_time,
+                                                       priv->ucode_beacon_time,
-                                                      ucode_switch_time,
+                                                       ucode_switch_time,
-                                                      beacon_interval);
+                                                       beacon_interval);
        }
        IWL_DEBUG_11H(priv, "uCode time for the switch is 0x%x\n",
-                      cmd.switch_time);
+                      cmd->switch_time);
-        cmd.expect_beacon = ch_switch->channel->flags & IEEE80211_CHAN_RADAR;
+        cmd->expect_beacon = ch_switch->channel->flags & IEEE80211_CHAN_RADAR;
-        return iwl_dvm_send_cmd(priv, &hcmd);
+        err = iwl_dvm_send_cmd(priv, &hcmd);
+        kfree(cmd);
+        return err;
 }
 struct iwl_lib_ops iwl6000_lib = {
diff --git a/drivers/net/wireless/mwifiex/cfg80211.c b/drivers/net/wireless/mwifiex/cfg80211.c
index 0679458a1bac..780d3e168297 100644
--- a/drivers/net/wireless/mwifiex/cfg80211.c
+++ b/drivers/net/wireless/mwifiex/cfg80211.c
@@ -1825,8 +1825,6 @@ mwifiex_cfg80211_scan(struct wiphy *wiphy,
                return -EBUSY;
        }
-        priv->scan_request = request;
        priv->user_scan_cfg = kzalloc(sizeof(struct mwifiex_user_scan_cfg),
                                      GFP_KERNEL);
        if (!priv->user_scan_cfg) {
@@ -1834,6 +1832,8 @@ mwifiex_cfg80211_scan(struct wiphy *wiphy,
                return -ENOMEM;
        }
+        priv->scan_request = request;
        priv->user_scan_cfg->num_ssids = request->n_ssids;
        priv->user_scan_cfg->ssid_list = request->ssids;
@@ -1870,6 +1870,9 @@ mwifiex_cfg80211_scan(struct wiphy *wiphy,
        ret = mwifiex_scan_networks(priv, priv->user_scan_cfg);
        if (ret) {
                dev_err(priv->adapter->dev, "scan failed: %d\n", ret);
+                priv->scan_request = NULL;
+                kfree(priv->user_scan_cfg);
+                priv->user_scan_cfg = NULL;
                return ret;
        }
diff --git a/drivers/net/wireless/mwifiex/scan.c b/drivers/net/wireless/mwifiex/scan.c
index 00b658d3b6ec..9171aaedbccd 100644
--- a/drivers/net/wireless/mwifiex/scan.c
+++ b/drivers/net/wireless/mwifiex/scan.c
@@ -1843,21 +1843,18 @@ static int mwifiex_scan_specific_ssid(struct mwifiex_private *priv,
                                      struct cfg80211_ssid *req_ssid)
 {
        struct mwifiex_adapter *adapter = priv->adapter;
-        int ret = 0;
+        int ret;
        struct mwifiex_user_scan_cfg *scan_cfg;
-        if (!req_ssid)
-                return -1;
        if (adapter->scan_processing) {
-                dev_dbg(adapter->dev, "cmd: Scan already in process...\n");
+                dev_err(adapter->dev, "cmd: Scan already in process...\n");
-                return ret;
+                return -EBUSY;
        }
        if (priv->scan_block) {
-                dev_dbg(adapter->dev,
+                dev_err(adapter->dev,
                        "cmd: Scan is blocked during association...\n");
-                return ret;
+                return -EBUSY;
        }
        scan_cfg = kzalloc(sizeof(struct mwifiex_user_scan_cfg), GFP_KERNEL);
diff --git a/drivers/net/wireless/rt2x00/rt2500usb.c b/drivers/net/wireless/rt2x00/rt2500usb.c
index a12e84f892be..6b2e1e431dd2 100644
--- a/drivers/net/wireless/rt2x00/rt2500usb.c
+++ b/drivers/net/wireless/rt2x00/rt2500usb.c
@@ -1988,6 +1988,7 @@ static struct usb_driver rt2500usb_driver = {
        .disconnect     = rt2x00usb_disconnect,
        .suspend        = rt2x00usb_suspend,
        .resume         = rt2x00usb_resume,
+        .reset_resume   = rt2x00usb_resume,
        .disable_hub_initiated_lpm = 1,
 };
diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c
index 01dc8891070c..59474ae0aec0 100644
--- a/drivers/net/wireless/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
@@ -2449,7 +2449,7 @@ static int rt2800_get_gain_calibration_delta(struct rt2x00_dev *rt2x00dev)
        /*
         * Check if temperature compensation is supported.
         */
-        if (tssi_bounds[4] == 0xff)
+        if (tssi_bounds[4] == 0xff || step == 0xff)
                return 0;
        /*
diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c
index c9e9370eb789..3b8fb5a603f2 100644
--- a/drivers/net/wireless/rt2x00/rt2800usb.c
+++ b/drivers/net/wireless/rt2x00/rt2800usb.c
@@ -1282,6 +1282,7 @@ static struct usb_driver rt2800usb_driver = {
        .disconnect     = rt2x00usb_disconnect,
        .suspend        = rt2x00usb_suspend,
        .resume         = rt2x00usb_resume,
+        .reset_resume   = rt2x00usb_resume,
        .disable_hub_initiated_lpm = 1,
 };
diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c
index e5eb43b3eee7..24eec66e9fd2 100644
--- a/drivers/net/wireless/rt2x00/rt73usb.c
+++ b/drivers/net/wireless/rt2x00/rt73usb.c
@@ -2535,6 +2535,7 @@ static struct usb_driver rt73usb_driver = {
        .disconnect     = rt2x00usb_disconnect,
        .suspend        = rt2x00usb_suspend,
        .resume         = rt2x00usb_resume,
+        .reset_resume   = rt2x00usb_resume,
        .disable_hub_initiated_lpm = 1,
 };
diff --git a/drivers/net/wireless/rtlwifi/usb.c b/drivers/net/wireless/rtlwifi/usb.c
index 030beb45d8b0..e3ea4b346889 100644
--- a/drivers/net/wireless/rtlwifi/usb.c
+++ b/drivers/net/wireless/rtlwifi/usb.c
@@ -673,7 +673,7 @@ static int rtl_usb_start(struct ieee80211_hw *hw)
                set_hal_start(rtlhal);
                /* Start bulk IN */
-                _rtl_usb_receive(hw);
+                err = _rtl_usb_receive(hw);
        }
        return err;
diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c
index 682633bfe00f..f2d6b78d901d 100644
--- a/drivers/net/xen-netback/netback.c
+++ b/drivers/net/xen-netback/netback.c
@@ -40,6 +40,7 @@
 #include <net/tcp.h>
+#include <xen/xen.h>
 #include <xen/events.h>
 #include <xen/interface/memory.h>
@@ -334,21 +335,35 @@ unsigned int xen_netbk_count_skb_slots(struct xenvif *vif, struct sk_buff *skb)
        for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
                unsigned long size = skb_frag_size(&skb_shinfo(skb)->frags[i]);
+                unsigned long offset = skb_shinfo(skb)->frags[i].page_offset;
                unsigned long bytes;
+                offset &= ~PAGE_MASK;
                while (size > 0) {
+                        BUG_ON(offset >= PAGE_SIZE);
                        BUG_ON(copy_off > MAX_BUFFER_OFFSET);
-                        if (start_new_rx_buffer(copy_off, size, 0)) {
+                        bytes = PAGE_SIZE - offset;
+                        if (bytes > size)
+                                bytes = size;
+                        if (start_new_rx_buffer(copy_off, bytes, 0)) {
                                count++;
                                copy_off = 0;
                        }
-                        bytes = size;
                        if (copy_off + bytes > MAX_BUFFER_OFFSET)
                                bytes = MAX_BUFFER_OFFSET - copy_off;
                        copy_off += bytes;
+                        offset += bytes;
                        size -= bytes;
+                        if (offset == PAGE_SIZE)
+                                offset = 0;
                }
        }
        return count;
@@ -402,14 +417,24 @@ static void netbk_gop_frag_copy(struct xenvif *vif, struct sk_buff *skb,
        unsigned long bytes;
        /* Data must not cross a page boundary. */
-        BUG_ON(size + offset > PAGE_SIZE);
+        BUG_ON(size + offset > PAGE_SIZE<<compound_order(page));
        meta = npo->meta + npo->meta_prod - 1;
+        /* Skip unused frames from start of page */
+        page += offset >> PAGE_SHIFT;
+        offset &= ~PAGE_MASK;
        while (size > 0) {
+                BUG_ON(offset >= PAGE_SIZE);
                BUG_ON(npo->copy_off > MAX_BUFFER_OFFSET);
-                if (start_new_rx_buffer(npo->copy_off, size, *head)) {
+                bytes = PAGE_SIZE - offset;
+                if (bytes > size)
+                        bytes = size;
+                if (start_new_rx_buffer(npo->copy_off, bytes, *head)) {
                        /*
                         * Netfront requires there to be some data in the head
                         * buffer.
@@ -419,7 +444,6 @@ static void netbk_gop_frag_copy(struct xenvif *vif, struct sk_buff *skb,
                        meta = get_next_rx_buffer(vif, npo);
                }
-                bytes = size;
                if (npo->copy_off + bytes > MAX_BUFFER_OFFSET)
                        bytes = MAX_BUFFER_OFFSET - npo->copy_off;
@@ -452,6 +476,13 @@ static void netbk_gop_frag_copy(struct xenvif *vif, struct sk_buff *skb,
                offset += bytes;
                size -= bytes;
+                /* Next frame */
+                if (offset == PAGE_SIZE && size) {
+                        BUG_ON(!PageCompound(page));
+                        page++;
+                        offset = 0;
+                }
                /* Leave a gap for the GSO descriptor. */
                if (*head && skb_shinfo(skb)->gso_size && !vif->gso_prefix)
                        vif->rx.req_cons++;
@@ -635,9 +666,7 @@ static void xen_netbk_rx_action(struct xen_netbk *netbk)
                return;
        BUG_ON(npo.copy_prod > ARRAY_SIZE(netbk->grant_copy_op));
-        ret = HYPERVISOR_grant_table_op(GNTTABOP_copy, &netbk->grant_copy_op,
+        gnttab_batch_copy(netbk->grant_copy_op, npo.copy_prod);
-                                        npo.copy_prod);
-        BUG_ON(ret != 0);
        while ((skb = __skb_dequeue(&rxq)) != NULL) {
                sco = (struct skb_cb_overlay *)skb->cb;
@@ -1460,18 +1489,15 @@ static void xen_netbk_tx_submit(struct xen_netbk *netbk)
 static void xen_netbk_tx_action(struct xen_netbk *netbk)
 {
        unsigned nr_gops;
-        int ret;
        nr_gops = xen_netbk_tx_build_gops(netbk);
        if (nr_gops == 0)
                return;
-        ret = HYPERVISOR_grant_table_op(GNTTABOP_copy,
-                                        netbk->tx_copy_ops, nr_gops);
-        BUG_ON(ret);
-        xen_netbk_tx_submit(netbk);
+        gnttab_batch_copy(netbk->tx_copy_ops, nr_gops);
+        xen_netbk_tx_submit(netbk);
 }
 static void xen_netbk_idx_release(struct xen_netbk *netbk, u16 pending_idx)
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index c934fe8583f5..caa011008cd0 100644
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -43,6 +43,7 @@
 #include <linux/slab.h>
 #include <net/ip.h>
+#include <asm/xen/page.h>
 #include <xen/xen.h>
 #include <xen/xenbus.h>
 #include <xen/events.h>