99 files changed, 1151 insertions, 309 deletions
diff --git a/drivers/net/ethernet/3com/3c509.c b/drivers/net/ethernet/3com/3c509.c
index c53384d41c96..35df0b9e6848 100644
--- a/drivers/net/ethernet/3com/3c509.c
+++ b/drivers/net/ethernet/3com/3c509.c
@@ -749,7 +749,7 @@ el3_start_xmit(struct sk_buff *skb, struct net_device *dev)
        spin_unlock_irqrestore(&lp->lock, flags);
-        dev_kfree_skb (skb);
+        dev_consume_skb_any (skb);
        /* Clear the Tx status stack. */
        {
diff --git a/drivers/net/ethernet/3com/3c59x.c b/drivers/net/ethernet/3com/3c59x.c
index 238ccea965c8..61477b8e8d24 100644
--- a/drivers/net/ethernet/3com/3c59x.c
+++ b/drivers/net/ethernet/3com/3c59x.c
@@ -2086,7 +2086,7 @@ vortex_start_xmit(struct sk_buff *skb, struct net_device *dev)
                /* ... and the packet rounded to a doubleword. */
                skb_tx_timestamp(skb);
                iowrite32_rep(ioaddr + TX_FIFO, skb->data, (skb->len + 3) >> 2);
-                dev_kfree_skb (skb);
+                dev_consume_skb_any (skb);
                if (ioread16(ioaddr + TxFree) > 1536) {
                        netif_start_queue (dev);        /* AKPM: redundant? */
                } else {
diff --git a/drivers/net/ethernet/8390/lib8390.c b/drivers/net/ethernet/8390/lib8390.c
index d2cd80444ade..599311f0e05c 100644
--- a/drivers/net/ethernet/8390/lib8390.c
+++ b/drivers/net/ethernet/8390/lib8390.c
@@ -404,7 +404,7 @@ static netdev_tx_t __ei_start_xmit(struct sk_buff *skb,
        spin_unlock(&ei_local->page_lock);
        enable_irq_lockdep_irqrestore(dev->irq, &flags);
        skb_tx_timestamp(skb);
-        dev_kfree_skb(skb);
+        dev_consume_skb_any(skb);
        dev->stats.tx_bytes += send_length;
        return NETDEV_TX_OK;
diff --git a/drivers/net/ethernet/adi/bfin_mac.c b/drivers/net/ethernet/adi/bfin_mac.c
index c0f68dcd1dc1..95779b6b7394 100644
--- a/drivers/net/ethernet/adi/bfin_mac.c
+++ b/drivers/net/ethernet/adi/bfin_mac.c
@@ -1040,6 +1040,7 @@ static struct ptp_clock_info bfin_ptp_caps = {
        .n_alarm        = 0,
        .n_ext_ts       = 0,
        .n_per_out      = 0,
+        .n_pins         = 0,
        .pps            = 0,
        .adjfreq        = bfin_ptp_adjfreq,
        .adjtime        = bfin_ptp_adjtime,
@@ -1086,7 +1087,7 @@ static inline void _tx_reclaim_skb(void)
                tx_list_head->desc_a.config &= ~DMAEN;
                tx_list_head->status.status_word = 0;
                if (tx_list_head->skb) {
-                        dev_kfree_skb(tx_list_head->skb);
+                        dev_consume_skb_any(tx_list_head->skb);
                        tx_list_head->skb = NULL;
                }
                tx_list_head = tx_list_head->next;
diff --git a/drivers/net/ethernet/allwinner/sun4i-emac.c b/drivers/net/ethernet/allwinner/sun4i-emac.c
index 511f6eecd58b..fcaeeb8a4929 100644
--- a/drivers/net/ethernet/allwinner/sun4i-emac.c
+++ b/drivers/net/ethernet/allwinner/sun4i-emac.c
@@ -476,7 +476,7 @@ static int emac_start_xmit(struct sk_buff *skb, struct net_device *dev)
        spin_unlock_irqrestore(&db->lock, flags);
        /* free this SKB */
-        dev_kfree_skb(skb);
+        dev_consume_skb_any(skb);
        return NETDEV_TX_OK;
 }
diff --git a/drivers/net/ethernet/altera/altera_sgdma.c b/drivers/net/ethernet/altera/altera_sgdma.c
index cbeee073a9ff..0ee96639ae44 100644
--- a/drivers/net/ethernet/altera/altera_sgdma.c
+++ b/drivers/net/ethernet/altera/altera_sgdma.c
@@ -84,8 +84,8 @@ int sgdma_initialize(struct altera_tse_private *priv)
                return -EINVAL;
        }
-        priv->txdescphys = dma_map_single(priv->device, priv->rx_dma_desc,
+        priv->txdescphys = dma_map_single(priv->device, priv->tx_dma_desc,
-                                          priv->rxdescmem, DMA_TO_DEVICE);
+                                          priv->txdescmem, DMA_TO_DEVICE);
        if (dma_mapping_error(priv->device, priv->txdescphys)) {
                sgdma_uninitialize(priv);
@@ -340,7 +340,7 @@ static int sgdma_async_read(struct altera_tse_private *priv)
                /* clear control and status */
                iowrite32(0, &csr->control);
-                /* If statuc available, clear those bits */
+                /* If status available, clear those bits */
                if (sts & 0xf)
                        iowrite32(0xf, &csr->status);
@@ -390,9 +390,8 @@ sgdma_txphysaddr(struct altera_tse_private *priv,
                 struct sgdma_descrip *desc)
 {
        dma_addr_t paddr = priv->txdescmem_busaddr;
-        dma_addr_t offs = (dma_addr_t)((dma_addr_t)desc -
+        uintptr_t offs = (uintptr_t)desc - (uintptr_t)priv->tx_dma_desc;
-                                (dma_addr_t)priv->tx_dma_desc);
+        return (dma_addr_t)((uintptr_t)paddr + offs);
-        return paddr + offs;
 }
 static dma_addr_t
@@ -400,9 +399,8 @@ sgdma_rxphysaddr(struct altera_tse_private *priv,
                 struct sgdma_descrip *desc)
 {
        dma_addr_t paddr = priv->rxdescmem_busaddr;
-        dma_addr_t offs = (dma_addr_t)((dma_addr_t)desc -
+        uintptr_t offs = (uintptr_t)desc - (uintptr_t)priv->rx_dma_desc;
-                                (dma_addr_t)priv->rx_dma_desc);
+        return (dma_addr_t)((uintptr_t)paddr + offs);
-        return paddr + offs;
 }
 #define list_remove_head(list, entry, type, member)                     \
diff --git a/drivers/net/ethernet/altera/altera_tse_ethtool.c b/drivers/net/ethernet/altera/altera_tse_ethtool.c
index 63ac5f4960e4..319ca74f5e74 100644
--- a/drivers/net/ethernet/altera/altera_tse_ethtool.c
+++ b/drivers/net/ethernet/altera/altera_tse_ethtool.c
@@ -181,6 +181,14 @@ static void tse_get_regs(struct net_device *dev, struct ethtool_regs *regs,
        u32 *tse_mac_regs = (u32 *)priv->mac_dev;
        u32 *buf = regbuf;
+        /* Set version to a known value, so ethtool knows
+         * how to do any special formatting of this data.
+         * This version number will need to change if and
+         * when this register table is changed.
+         */
+        regs->version = 1;
        for (i = 0; i < TSE_NUM_REGS; i++)
                buf[i] = ioread32(&tse_mac_regs[i]);
 }
diff --git a/drivers/net/ethernet/amd/7990.c b/drivers/net/ethernet/amd/7990.c
index 18e542f7853d..98a10d555b79 100644
--- a/drivers/net/ethernet/amd/7990.c
+++ b/drivers/net/ethernet/amd/7990.c
@@ -578,7 +578,7 @@ int lance_start_xmit(struct sk_buff *skb, struct net_device *dev)
        outs++;
        /* Kick the lance: transmit now */
        WRITERDP(lp, LE_C0_INEA | LE_C0_TDMD);
-        dev_kfree_skb(skb);
+        dev_consume_skb_any(skb);
        spin_lock_irqsave(&lp->devlock, flags);
        if (TX_BUFFS_AVAIL)
diff --git a/drivers/net/ethernet/amd/am79c961a.c b/drivers/net/ethernet/amd/am79c961a.c
index 9793767996a2..87e727b921dc 100644
--- a/drivers/net/ethernet/amd/am79c961a.c
+++ b/drivers/net/ethernet/amd/am79c961a.c
@@ -472,7 +472,7 @@ am79c961_sendpacket(struct sk_buff *skb, struct net_device *dev)
        if (am_readword(dev, priv->txhdr + (priv->txhead << 3) + 2) & TMD_OWN)
                netif_stop_queue(dev);
-        dev_kfree_skb(skb);
+        dev_consume_skb_any(skb);
        return NETDEV_TX_OK;
 }
diff --git a/drivers/net/ethernet/amd/pcnet32.c b/drivers/net/ethernet/amd/pcnet32.c
index 2ae00ed83afa..e7cc9174e364 100644
--- a/drivers/net/ethernet/amd/pcnet32.c
+++ b/drivers/net/ethernet/amd/pcnet32.c
@@ -2448,7 +2448,7 @@ static netdev_tx_t pcnet32_start_xmit(struct sk_buff *skb,
        lp->tx_dma_addr[entry] =
            pci_map_single(lp->pci_dev, skb->data, skb->len, PCI_DMA_TODEVICE);
        if (pci_dma_mapping_error(lp->pci_dev, lp->tx_dma_addr[entry])) {
-                dev_kfree_skb(skb);
+                dev_kfree_skb_any(skb);
                dev->stats.tx_dropped++;
                goto drop_packet;
        }
diff --git a/drivers/net/ethernet/atheros/alx/main.c b/drivers/net/ethernet/atheros/alx/main.c
index 2e45f6ec1bf0..238356108e65 100644
--- a/drivers/net/ethernet/atheros/alx/main.c
+++ b/drivers/net/ethernet/atheros/alx/main.c
@@ -1097,7 +1097,7 @@ static netdev_tx_t alx_start_xmit(struct sk_buff *skb,
        return NETDEV_TX_OK;
 drop:
-        dev_kfree_skb(skb);
+        dev_kfree_skb_any(skb);
        return NETDEV_TX_OK;
 }
diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
index 4d3258dd0a88..31f262302128 100644
--- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
+++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
@@ -832,7 +832,7 @@ static int atl1c_sw_init(struct atl1c_adapter *adapter)
 }
 static inline void atl1c_clean_buffer(struct pci_dev *pdev,
-                                struct atl1c_buffer *buffer_info, int in_irq)
+                                struct atl1c_buffer *buffer_info)
 {
        u16 pci_driection;
        if (buffer_info->flags & ATL1C_BUFFER_FREE)
@@ -850,12 +850,8 @@ static inline void atl1c_clean_buffer(struct pci_dev *pdev,
                        pci_unmap_page(pdev, buffer_info->dma,
                                        buffer_info->length, pci_driection);
        }
-        if (buffer_info->skb) {
+        if (buffer_info->skb)
-                if (in_irq)
+                dev_consume_skb_any(buffer_info->skb);
-                        dev_kfree_skb_irq(buffer_info->skb);
-                else
-                        dev_kfree_skb(buffer_info->skb);
-        }
        buffer_info->dma = 0;
        buffer_info->skb = NULL;
        ATL1C_SET_BUFFER_STATE(buffer_info, ATL1C_BUFFER_FREE);
@@ -875,7 +871,7 @@ static void atl1c_clean_tx_ring(struct atl1c_adapter *adapter,
        ring_count = tpd_ring->count;
        for (index = 0; index < ring_count; index++) {
                buffer_info = &tpd_ring->buffer_info[index];
-                atl1c_clean_buffer(pdev, buffer_info, 0);
+                atl1c_clean_buffer(pdev, buffer_info);
        }
        /* Zero out Tx-buffers */
@@ -899,7 +895,7 @@ static void atl1c_clean_rx_ring(struct atl1c_adapter *adapter)
        for (j = 0; j < rfd_ring->count; j++) {
                buffer_info = &rfd_ring->buffer_info[j];
-                atl1c_clean_buffer(pdev, buffer_info, 0);
+                atl1c_clean_buffer(pdev, buffer_info);
        }
        /* zero out the descriptor ring */
        memset(rfd_ring->desc, 0, rfd_ring->size);
@@ -1562,7 +1558,7 @@ static bool atl1c_clean_tx_irq(struct atl1c_adapter *adapter,
        while (next_to_clean != hw_next_to_clean) {
                buffer_info = &tpd_ring->buffer_info[next_to_clean];
-                atl1c_clean_buffer(pdev, buffer_info, 1);
+                atl1c_clean_buffer(pdev, buffer_info);
                if (++next_to_clean == tpd_ring->count)
                        next_to_clean = 0;
                atomic_set(&tpd_ring->next_to_clean, next_to_clean);
@@ -2085,7 +2081,7 @@ static void atl1c_tx_rollback(struct atl1c_adapter *adpt,
        while (index != tpd_ring->next_to_use) {
                tpd = ATL1C_TPD_DESC(tpd_ring, index);
                buffer_info = &tpd_ring->buffer_info[index];
-                atl1c_clean_buffer(adpt->pdev, buffer_info, 0);
+                atl1c_clean_buffer(adpt->pdev, buffer_info);
                memset(tpd, 0, sizeof(struct atl1c_tpd_desc));
                if (++index == tpd_ring->count)
                        index = 0;
@@ -2258,7 +2254,7 @@ static netdev_tx_t atl1c_xmit_frame(struct sk_buff *skb,
                /* roll back tpd/buffer */
                atl1c_tx_rollback(adapter, tpd, type);
                spin_unlock_irqrestore(&adapter->tx_lock, flags);
-                dev_kfree_skb(skb);
+                dev_kfree_skb_any(skb);
        } else {
                atl1c_tx_queue(adapter, skb, tpd, type);
                spin_unlock_irqrestore(&adapter->tx_lock, flags);
diff --git a/drivers/net/ethernet/atheros/atlx/atl2.c b/drivers/net/ethernet/atheros/atlx/atl2.c
index 265ce1b752ed..78befb522a52 100644
--- a/drivers/net/ethernet/atheros/atlx/atl2.c
+++ b/drivers/net/ethernet/atheros/atlx/atl2.c
@@ -55,6 +55,7 @@ static const char atl2_driver_name[] = "atl2";
 static const char atl2_driver_string[] = "Atheros(R) L2 Ethernet Driver";
 static const char atl2_copyright[] = "Copyright (c) 2007 Atheros Corporation.";
 static const char atl2_driver_version[] = ATL2_DRV_VERSION;
+static const struct ethtool_ops atl2_ethtool_ops;
 MODULE_AUTHOR("Atheros Corporation <xiong.huang@atheros.com>, Chris Snook <csnook@redhat.com>");
 MODULE_DESCRIPTION("Atheros Fast Ethernet Network Driver");
@@ -71,8 +72,6 @@ static DEFINE_PCI_DEVICE_TABLE(atl2_pci_tbl) = {
 };
 MODULE_DEVICE_TABLE(pci, atl2_pci_tbl);
-static void atl2_set_ethtool_ops(struct net_device *netdev);
 static void atl2_check_options(struct atl2_adapter *adapter);
 /**
@@ -1397,7 +1396,7 @@ static int atl2_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        atl2_setup_pcicmd(pdev);
        netdev->netdev_ops = &atl2_netdev_ops;
-        atl2_set_ethtool_ops(netdev);
+        SET_ETHTOOL_OPS(netdev, &atl2_ethtool_ops);
        netdev->watchdog_timeo = 5 * HZ;
        strncpy(netdev->name, pci_name(pdev), sizeof(netdev->name) - 1);
@@ -2105,11 +2104,6 @@ static const struct ethtool_ops atl2_ethtool_ops = {
        .set_eeprom             = atl2_set_eeprom,
 };
-static void atl2_set_ethtool_ops(struct net_device *netdev)
-{
-        SET_ETHTOOL_OPS(netdev, &atl2_ethtool_ops);
-}
 #define LBYTESWAP(a)  ((((a) & 0x00ff00ff) << 8) | \
        (((a) & 0xff00ff00) >> 8))
 #define LONGSWAP(a)   ((LBYTESWAP(a) << 16) | (LBYTESWAP(a) >> 16))
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
index bbbd2a4bc161..37422af9ef13 100644
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
@@ -6322,6 +6322,7 @@ static const struct ptp_clock_info tg3_ptp_caps = {
        .n_alarm        = 0,
        .n_ext_ts       = 0,
        .n_per_out      = 1,
+        .n_pins         = 0,
        .pps            = 0,
        .adjfreq        = tg3_ptp_adjfreq,
        .adjtime        = tg3_ptp_adjtime,
diff --git a/drivers/net/ethernet/brocade/bna/bnad.c b/drivers/net/ethernet/brocade/bna/bnad.c
index cb7625366ec2..a881e982a084 100644
--- a/drivers/net/ethernet/brocade/bna/bnad.c
+++ b/drivers/net/ethernet/brocade/bna/bnad.c
@@ -2946,17 +2946,17 @@ bnad_start_xmit(struct sk_buff *skb, struct net_device *netdev)
        /* Sanity checks for the skb */
        if (unlikely(skb->len <= ETH_HLEN)) {
-                dev_kfree_skb(skb);
+                dev_kfree_skb_any(skb);
                BNAD_UPDATE_CTR(bnad, tx_skb_too_short);
                return NETDEV_TX_OK;
        }
        if (unlikely(len > BFI_TX_MAX_DATA_PER_VECTOR)) {
-                dev_kfree_skb(skb);
+                dev_kfree_skb_any(skb);
                BNAD_UPDATE_CTR(bnad, tx_skb_headlen_zero);
                return NETDEV_TX_OK;
        }
        if (unlikely(len == 0)) {
-                dev_kfree_skb(skb);
+                dev_kfree_skb_any(skb);
                BNAD_UPDATE_CTR(bnad, tx_skb_headlen_zero);
                return NETDEV_TX_OK;
        }
@@ -2968,7 +2968,7 @@ bnad_start_xmit(struct sk_buff *skb, struct net_device *netdev)
         * and the netif_tx_stop_all_queues() call.
         */
        if (unlikely(!tcb || !test_bit(BNAD_TXQ_TX_STARTED, &tcb->flags))) {
-                dev_kfree_skb(skb);
+                dev_kfree_skb_any(skb);
                BNAD_UPDATE_CTR(bnad, tx_skb_stopping);
                return NETDEV_TX_OK;
        }
@@ -2981,7 +2981,7 @@ bnad_start_xmit(struct sk_buff *skb, struct net_device *netdev)
        wis = BNA_TXQ_WI_NEEDED(vectors);       /* 4 vectors per work item */
        if (unlikely(vectors > BFI_TX_MAX_VECTORS_PER_PKT)) {
-                dev_kfree_skb(skb);
+                dev_kfree_skb_any(skb);
                BNAD_UPDATE_CTR(bnad, tx_skb_max_vectors);
                return NETDEV_TX_OK;
        }
@@ -3021,7 +3021,7 @@ bnad_start_xmit(struct sk_buff *skb, struct net_device *netdev)
        /* Program the opcode, flags, frame_len, num_vectors in WI */
        if (bnad_txq_wi_prepare(bnad, tcb, skb, txqent)) {
-                dev_kfree_skb(skb);
+                dev_kfree_skb_any(skb);
                return NETDEV_TX_OK;
        }
        txqent->hdr.wi.reserved = 0;
@@ -3047,7 +3047,7 @@ bnad_start_xmit(struct sk_buff *skb, struct net_device *netdev)
                        /* Undo the changes starting at tcb->producer_index */
                        bnad_tx_buff_unmap(bnad, unmap_q, q_depth,
                                tcb->producer_index);
-                        dev_kfree_skb(skb);
+                        dev_kfree_skb_any(skb);
                        BNAD_UPDATE_CTR(bnad, tx_skb_frag_zero);
                        return NETDEV_TX_OK;
                }
@@ -3076,7 +3076,7 @@ bnad_start_xmit(struct sk_buff *skb, struct net_device *netdev)
        if (unlikely(len != skb->len)) {
                /* Undo the changes starting at tcb->producer_index */
                bnad_tx_buff_unmap(bnad, unmap_q, q_depth, tcb->producer_index);
-                dev_kfree_skb(skb);
+                dev_kfree_skb_any(skb);
                BNAD_UPDATE_CTR(bnad, tx_skb_len_mismatch);
                return NETDEV_TX_OK;
        }
diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c
index d0c38e01e99f..6116887d2880 100644
--- a/drivers/net/ethernet/cadence/macb.c
+++ b/drivers/net/ethernet/cadence/macb.c
@@ -1045,7 +1045,7 @@ static int macb_start_xmit(struct sk_buff *skb, struct net_device *dev)
        mapping = dma_map_single(&bp->pdev->dev, skb->data,
                                 len, DMA_TO_DEVICE);
        if (dma_mapping_error(&bp->pdev->dev, mapping)) {
-                kfree_skb(skb);
+                dev_kfree_skb_any(skb);
                goto unlock;
        }
diff --git a/drivers/net/ethernet/calxeda/xgmac.c b/drivers/net/ethernet/calxeda/xgmac.c
index d2a183c3a6ce..521dfea44b83 100644
--- a/drivers/net/ethernet/calxeda/xgmac.c
+++ b/drivers/net/ethernet/calxeda/xgmac.c
@@ -897,7 +897,7 @@ static void xgmac_tx_complete(struct xgmac_priv *priv)
                /* Check tx error on the last segment */
                if (desc_get_tx_ls(p)) {
                        desc_get_tx_status(priv, p);
-                        dev_kfree_skb(skb);
+                        dev_consume_skb_any(skb);
                }
                priv->tx_skbuff[entry] = NULL;
@@ -1105,7 +1105,7 @@ static netdev_tx_t xgmac_xmit(struct sk_buff *skb, struct net_device *dev)
        len = skb_headlen(skb);
        paddr = dma_map_single(priv->device, skb->data, len, DMA_TO_DEVICE);
        if (dma_mapping_error(priv->device, paddr)) {
-                dev_kfree_skb(skb);
+                dev_kfree_skb_any(skb);
                return NETDEV_TX_OK;
        }
        priv->tx_skbuff[entry] = skb;
@@ -1169,7 +1169,7 @@ dma_err:
        desc = first;
        dma_unmap_single(priv->device, desc_get_buf_addr(desc),
                         desc_get_buf_len(desc), DMA_TO_DEVICE);
-        dev_kfree_skb(skb);
+        dev_kfree_skb_any(skb);
        return NETDEV_TX_OK;
 }
diff --git a/drivers/net/ethernet/chelsio/cxgb3/sge.c b/drivers/net/ethernet/chelsio/cxgb3/sge.c
index 632b318eb38a..8b069f96e920 100644
--- a/drivers/net/ethernet/chelsio/cxgb3/sge.c
+++ b/drivers/net/ethernet/chelsio/cxgb3/sge.c
@@ -298,7 +298,7 @@ static void free_tx_desc(struct adapter *adapter, struct sge_txq *q,
                        if (need_unmap)
                                unmap_skb(d->skb, q, cidx, pdev);
                        if (d->eop) {
-                                kfree_skb(d->skb);
+                                dev_consume_skb_any(d->skb);
                                d->skb = NULL;
                        }
                }
@@ -1188,7 +1188,7 @@ static void write_tx_pkt_wr(struct adapter *adap, struct sk_buff *skb,
                        cpl->wr.wr_lo = htonl(V_WR_LEN(flits) | V_WR_GEN(gen) |
                                              V_WR_TID(q->token));
                        wr_gen2(d, gen);
-                        kfree_skb(skb);
+                        dev_consume_skb_any(skb);
                        return;
                }
@@ -1233,7 +1233,7 @@ netdev_tx_t t3_eth_xmit(struct sk_buff *skb, struct net_device *dev)
         * anything shorter than an Ethernet header.
         */
        if (unlikely(skb->len < ETH_HLEN)) {
-                dev_kfree_skb(skb);
+                dev_kfree_skb_any(skb);
                return NETDEV_TX_OK;
        }
diff --git a/drivers/net/ethernet/chelsio/cxgb4/sge.c b/drivers/net/ethernet/chelsio/cxgb4/sge.c
index d4db382ff8c7..ca95cf2954eb 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/sge.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/sge.c
@@ -383,7 +383,7 @@ static void free_tx_desc(struct adapter *adap, struct sge_txq *q,
                if (d->skb) {                       /* an SGL is present */
                        if (unmap)
                                unmap_sgl(dev, d->skb, d->sgl, q);
-                        kfree_skb(d->skb);
+                        dev_consume_skb_any(d->skb);
                        d->skb = NULL;
                }
                ++d;
@@ -1009,7 +1009,7 @@ netdev_tx_t t4_eth_xmit(struct sk_buff *skb, struct net_device *dev)
         * anything shorter than an Ethernet header.
         */
        if (unlikely(skb->len < ETH_HLEN)) {
-out_free:       dev_kfree_skb(skb);
+out_free:       dev_kfree_skb_any(skb);
                return NETDEV_TX_OK;
        }
@@ -1104,7 +1104,7 @@ out_free:	dev_kfree_skb(skb);
        if (immediate) {
                inline_tx_skb(skb, &q->q, cpl + 1);
-                dev_kfree_skb(skb);
+                dev_consume_skb_any(skb);
        } else {
                int last_desc;
diff --git a/drivers/net/ethernet/chelsio/cxgb4vf/sge.c b/drivers/net/ethernet/chelsio/cxgb4vf/sge.c
index 0a89963c48ce..9cfa4b4bb089 100644
--- a/drivers/net/ethernet/chelsio/cxgb4vf/sge.c
+++ b/drivers/net/ethernet/chelsio/cxgb4vf/sge.c
@@ -401,7 +401,7 @@ static void free_tx_desc(struct adapter *adapter, struct sge_txq *tq,
                if (sdesc->skb) {
                        if (need_unmap)
                                unmap_sgl(dev, sdesc->skb, sdesc->sgl, tq);
-                        kfree_skb(sdesc->skb);
+                        dev_consume_skb_any(sdesc->skb);
                        sdesc->skb = NULL;
                }
@@ -1275,7 +1275,7 @@ int t4vf_eth_xmit(struct sk_buff *skb, struct net_device *dev)
                 * need it any longer.
                 */
                inline_tx_skb(skb, &txq->q, cpl + 1);
-                dev_kfree_skb(skb);
+                dev_consume_skb_any(skb);
        } else {
                /*
                 * Write the skb's Scatter/Gather list into the TX Packet CPL
@@ -1354,7 +1354,7 @@ out_free:
         * An error of some sort happened.  Free the TX skb and tell the
         * OS that we've "dealt" with the packet ...
         */
-        dev_kfree_skb(skb);
+        dev_kfree_skb_any(skb);
        return NETDEV_TX_OK;
 }
diff --git a/drivers/net/ethernet/cirrus/cs89x0.c b/drivers/net/ethernet/cirrus/cs89x0.c
index 19f642a45f40..fe84fbabc0d4 100644
--- a/drivers/net/ethernet/cirrus/cs89x0.c
+++ b/drivers/net/ethernet/cirrus/cs89x0.c
@@ -1174,7 +1174,7 @@ static netdev_tx_t net_send_packet(struct sk_buff *skb, struct net_device *dev)
        writewords(lp, TX_FRAME_PORT, skb->data, (skb->len + 1) >> 1);
        spin_unlock_irqrestore(&lp->lock, flags);
        dev->stats.tx_bytes += skb->len;
-        dev_kfree_skb(skb);
+        dev_consume_skb_any(skb);
        /* We DO NOT call netif_wake_queue() here.
         * We also DO NOT call netif_start_queue().
diff --git a/drivers/net/ethernet/cisco/enic/enic_main.c b/drivers/net/ethernet/cisco/enic/enic_main.c
index 4c35fc8fad99..2945718ce806 100644
--- a/drivers/net/ethernet/cisco/enic/enic_main.c
+++ b/drivers/net/ethernet/cisco/enic/enic_main.c
@@ -521,7 +521,7 @@ static netdev_tx_t enic_hard_start_xmit(struct sk_buff *skb,
        unsigned int txq_map;
        if (skb->len <= 0) {
-                dev_kfree_skb(skb);
+                dev_kfree_skb_any(skb);
                return NETDEV_TX_OK;
        }
@@ -536,7 +536,7 @@ static netdev_tx_t enic_hard_start_xmit(struct sk_buff *skb,
        if (skb_shinfo(skb)->gso_size == 0 &&
            skb_shinfo(skb)->nr_frags + 1 > ENIC_NON_TSO_MAX_DESC &&
            skb_linearize(skb)) {
-                dev_kfree_skb(skb);
+                dev_kfree_skb_any(skb);
                return NETDEV_TX_OK;
        }
diff --git a/drivers/net/ethernet/davicom/dm9000.c b/drivers/net/ethernet/davicom/dm9000.c
index a1a2b4028a5c..8c4b93be333b 100644
--- a/drivers/net/ethernet/davicom/dm9000.c
+++ b/drivers/net/ethernet/davicom/dm9000.c
@@ -1033,7 +1033,7 @@ dm9000_start_xmit(struct sk_buff *skb, struct net_device *dev)
        spin_unlock_irqrestore(&db->lock, flags);
        /* free this SKB */
-        dev_kfree_skb(skb);
+        dev_consume_skb_any(skb);
        return NETDEV_TX_OK;
 }
diff --git a/drivers/net/ethernet/dec/tulip/dmfe.c b/drivers/net/ethernet/dec/tulip/dmfe.c
index 5ad9e3e3c0b8..53f0c618045c 100644
--- a/drivers/net/ethernet/dec/tulip/dmfe.c
+++ b/drivers/net/ethernet/dec/tulip/dmfe.c
@@ -696,7 +696,7 @@ static netdev_tx_t dmfe_start_xmit(struct sk_buff *skb,
        /* Too large packet check */
        if (skb->len > MAX_PACKET_SIZE) {
                pr_err("big packet = %d\n", (u16)skb->len);
-                dev_kfree_skb(skb);
+                dev_kfree_skb_any(skb);
                return NETDEV_TX_OK;
        }
@@ -743,7 +743,7 @@ static netdev_tx_t dmfe_start_xmit(struct sk_buff *skb,
        dw32(DCR7, db->cr7_data);
        /* free this SKB */
-        dev_kfree_skb(skb);
+        dev_consume_skb_any(skb);
        return NETDEV_TX_OK;
 }
diff --git a/drivers/net/ethernet/dec/tulip/uli526x.c b/drivers/net/ethernet/dec/tulip/uli526x.c
index aa4ee385091f..aa801a6af7b9 100644
--- a/drivers/net/ethernet/dec/tulip/uli526x.c
+++ b/drivers/net/ethernet/dec/tulip/uli526x.c
@@ -607,7 +607,7 @@ static netdev_tx_t uli526x_start_xmit(struct sk_buff *skb,
        /* Too large packet check */
        if (skb->len > MAX_PACKET_SIZE) {
                netdev_err(dev, "big packet = %d\n", (u16)skb->len);
-                dev_kfree_skb(skb);
+                dev_kfree_skb_any(skb);
                return NETDEV_TX_OK;
        }
@@ -648,7 +648,7 @@ static netdev_tx_t uli526x_start_xmit(struct sk_buff *skb,
        uw32(DCR7, db->cr7_data);
        /* free this SKB */
-        dev_kfree_skb(skb);
+        dev_consume_skb_any(skb);
        return NETDEV_TX_OK;
 }
diff --git a/drivers/net/ethernet/dlink/sundance.c b/drivers/net/ethernet/dlink/sundance.c
index 113cd799a131..d9e5ca0d48c1 100644
--- a/drivers/net/ethernet/dlink/sundance.c
+++ b/drivers/net/ethernet/dlink/sundance.c
@@ -1137,7 +1137,7 @@ start_tx (struct sk_buff *skb, struct net_device *dev)
        return NETDEV_TX_OK;
 drop_frame:
-        dev_kfree_skb(skb);
+        dev_kfree_skb_any(skb);
        np->tx_skbuff[entry] = NULL;
        dev->stats.tx_dropped++;
        return NETDEV_TX_OK;
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
index 03a351300013..f9f8a589cdef 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -338,7 +338,7 @@ fec_enet_start_xmit(struct sk_buff *skb, struct net_device *ndev)
        /* Protocol checksum off-load for TCP and UDP. */
        if (fec_enet_clear_csum(skb, ndev)) {
-                kfree_skb(skb);
+                dev_kfree_skb_any(skb);
                return NETDEV_TX_OK;
        }
diff --git a/drivers/net/ethernet/freescale/fec_ptp.c b/drivers/net/ethernet/freescale/fec_ptp.c
index 89ccb5b08708..82386b29914a 100644
--- a/drivers/net/ethernet/freescale/fec_ptp.c
+++ b/drivers/net/ethernet/freescale/fec_ptp.c
@@ -372,6 +372,7 @@ void fec_ptp_init(struct platform_device *pdev)
        fep->ptp_caps.n_alarm = 0;
        fep->ptp_caps.n_ext_ts = 0;
        fep->ptp_caps.n_per_out = 0;
+        fep->ptp_caps.n_pins = 0;
        fep->ptp_caps.pps = 0;
        fep->ptp_caps.adjfreq = fec_ptp_adjfreq;
        fep->ptp_caps.adjtime = fec_ptp_adjtime;
diff --git a/drivers/net/ethernet/freescale/gianfar.c b/drivers/net/ethernet/freescale/gianfar.c
index 6e12f9365856..9125d9abf099 100644
--- a/drivers/net/ethernet/freescale/gianfar.c
+++ b/drivers/net/ethernet/freescale/gianfar.c
@@ -754,9 +754,19 @@ static int gfar_of_init(struct platform_device *ofdev, struct net_device **pdev)
                num_tx_qs = 1;
                num_rx_qs = 1;
        } else { /* MQ_MG_MODE */
+                /* get the actual number of supported groups */
+                unsigned int num_grps = of_get_available_child_count(np);
+                if (num_grps == 0 || num_grps > MAXGROUPS) {
+                        dev_err(&ofdev->dev, "Invalid # of int groups(%d)\n",
+                                num_grps);
+                        pr_err("Cannot do alloc_etherdev, aborting\n");
+                        return -EINVAL;
+                }
                if (poll_mode == GFAR_SQ_POLLING) {
-                        num_tx_qs = 2; /* one txq per int group */
+                        num_tx_qs = num_grps; /* one txq per int group */
-                        num_rx_qs = 2; /* one rxq per int group */
+                        num_rx_qs = num_grps; /* one rxq per int group */
                } else { /* GFAR_MQ_POLLING */
                        num_tx_qs = tx_queues ? *tx_queues : 1;
                        num_rx_qs = rx_queues ? *rx_queues : 1;
diff --git a/drivers/net/ethernet/freescale/gianfar_ptp.c b/drivers/net/ethernet/freescale/gianfar_ptp.c
index abc28da27042..bb568006f37d 100644
--- a/drivers/net/ethernet/freescale/gianfar_ptp.c
+++ b/drivers/net/ethernet/freescale/gianfar_ptp.c
@@ -414,6 +414,7 @@ static struct ptp_clock_info ptp_gianfar_caps = {
        .n_alarm        = 0,
        .n_ext_ts       = N_EXT_TS,
        .n_per_out      = 0,
+        .n_pins         = 0,
        .pps            = 1,
        .adjfreq        = ptp_gianfar_adjfreq,
        .adjtime        = ptp_gianfar_adjtime,
diff --git a/drivers/net/ethernet/freescale/ucc_geth.c b/drivers/net/ethernet/freescale/ucc_geth.c
index 72291a8904a9..c8299c31b21f 100644
--- a/drivers/net/ethernet/freescale/ucc_geth.c
+++ b/drivers/net/ethernet/freescale/ucc_geth.c
@@ -3261,7 +3261,7 @@ static int ucc_geth_tx(struct net_device *dev, u8 txQ)
                dev->stats.tx_packets++;
-                dev_kfree_skb(skb);
+                dev_consume_skb_any(skb);
                ugeth->tx_skbuff[txQ][ugeth->skb_dirtytx[txQ]] = NULL;
                ugeth->skb_dirtytx[txQ] =
diff --git a/drivers/net/ethernet/i825xx/lib82596.c b/drivers/net/ethernet/i825xx/lib82596.c
index 17fca323c143..c984998b34a0 100644
--- a/drivers/net/ethernet/i825xx/lib82596.c
+++ b/drivers/net/ethernet/i825xx/lib82596.c
@@ -993,7 +993,7 @@ static int i596_start_xmit(struct sk_buff *skb, struct net_device *dev)
                                       dev->name));
                dev->stats.tx_dropped++;
-                dev_kfree_skb(skb);
+                dev_kfree_skb_any(skb);
        } else {
                if (++lp->next_tx_cmd == TX_RING_SIZE)
                        lp->next_tx_cmd = 0;
diff --git a/drivers/net/ethernet/ibm/ehea/ehea_main.c b/drivers/net/ethernet/ibm/ehea/ehea_main.c
index 7628e0fd8455..538903bf13bc 100644
--- a/drivers/net/ethernet/ibm/ehea/ehea_main.c
+++ b/drivers/net/ethernet/ibm/ehea/ehea_main.c
@@ -490,7 +490,7 @@ static int ehea_refill_rq_def(struct ehea_port_res *pr,
                skb_arr[index] = skb;
                tmp_addr = ehea_map_vaddr(skb->data);
                if (tmp_addr == -1) {
-                        dev_kfree_skb(skb);
+                        dev_consume_skb_any(skb);
                        q_skba->os_skbs = fill_wqes - i;
                        ret = 0;
                        break;
@@ -856,7 +856,7 @@ static struct ehea_cqe *ehea_proc_cqes(struct ehea_port_res *pr, int my_quota)
                        index = EHEA_BMASK_GET(EHEA_WR_ID_INDEX, cqe->wr_id);
                        skb = pr->sq_skba.arr[index];
-                        dev_kfree_skb(skb);
+                        dev_consume_skb_any(skb);
                        pr->sq_skba.arr[index] = NULL;
                }
@@ -2044,7 +2044,7 @@ static void ehea_xmit3(struct sk_buff *skb, struct net_device *dev,
                skb_copy_bits(skb, 0, imm_data, skb->len);
        swqe->immediate_data_length = skb->len;
-        dev_kfree_skb(skb);
+        dev_consume_skb_any(skb);
 }
 static int ehea_start_xmit(struct sk_buff *skb, struct net_device *dev)
diff --git a/drivers/net/ethernet/ibm/ibmveth.c b/drivers/net/ethernet/ibm/ibmveth.c
index e75bdfcd1374..c9127562bd22 100644
--- a/drivers/net/ethernet/ibm/ibmveth.c
+++ b/drivers/net/ethernet/ibm/ibmveth.c
@@ -1044,7 +1044,7 @@ retry_bounce:
                               DMA_TO_DEVICE);
 out:
-        dev_kfree_skb(skb);
+        dev_consume_skb_any(skb);
        return NETDEV_TX_OK;
 map_failed_frags:
diff --git a/drivers/net/ethernet/intel/e1000e/ptp.c b/drivers/net/ethernet/intel/e1000e/ptp.c
index 3bd79a3ff829..fb1a914a3ad4 100644
--- a/drivers/net/ethernet/intel/e1000e/ptp.c
+++ b/drivers/net/ethernet/intel/e1000e/ptp.c
@@ -189,6 +189,7 @@ static const struct ptp_clock_info e1000e_ptp_clock_info = {
        .n_alarm        = 0,
        .n_ext_ts       = 0,
        .n_per_out      = 0,
+        .n_pins         = 0,
        .pps            = 0,
        .adjfreq        = e1000e_phc_adjfreq,
        .adjtime        = e1000e_phc_adjtime,
diff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
index 6049e63a826d..28da4125c8c9 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
@@ -114,6 +114,11 @@ static struct i40e_stats i40e_gstrings_stats[] = {
        I40E_PF_STAT("VF_admin_queue_requests", vf_aq_requests),
        I40E_PF_STAT("tx_hwtstamp_timeouts", tx_hwtstamp_timeouts),
        I40E_PF_STAT("rx_hwtstamp_cleared", rx_hwtstamp_cleared),
+        /* LPI stats */
+        I40E_PF_STAT("tx_lpi_status", stats.tx_lpi_status),
+        I40E_PF_STAT("rx_lpi_status", stats.rx_lpi_status),
+        I40E_PF_STAT("tx_lpi_count", stats.tx_lpi_count),
+        I40E_PF_STAT("rx_lpi_count", stats.rx_lpi_count),
 };
 #define I40E_QUEUE_STATS_LEN(n) \
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index 113354214517..28df88ef3c8b 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -740,6 +740,7 @@ void i40e_update_stats(struct i40e_vsi *vsi)
        u32 rx_page, rx_buf;
        u64 rx_p, rx_b;
        u64 tx_p, tx_b;
+        u32 val;
        int i;
        u16 q;
@@ -972,6 +973,20 @@ void i40e_update_stats(struct i40e_vsi *vsi)
                i40e_stat_update32(hw, I40E_GLPRT_RJC(hw->port),
                                   pf->stat_offsets_loaded,
                                   &osd->rx_jabber, &nsd->rx_jabber);
+                val = rd32(hw, I40E_PRTPM_EEE_STAT);
+                nsd->tx_lpi_status =
+                               (val & I40E_PRTPM_EEE_STAT_TX_LPI_STATUS_MASK) >>
+                                I40E_PRTPM_EEE_STAT_TX_LPI_STATUS_SHIFT;
+                nsd->rx_lpi_status =
+                               (val & I40E_PRTPM_EEE_STAT_RX_LPI_STATUS_MASK) >>
+                                I40E_PRTPM_EEE_STAT_RX_LPI_STATUS_SHIFT;
+                i40e_stat_update32(hw, I40E_PRTPM_TLPIC,
+                                   pf->stat_offsets_loaded,
+                                   &osd->tx_lpi_count, &nsd->tx_lpi_count);
+                i40e_stat_update32(hw, I40E_PRTPM_RLPIC,
+                                   pf->stat_offsets_loaded,
+                                   &osd->rx_lpi_count, &nsd->rx_lpi_count);
        }
        pf->stat_offsets_loaded = true;
@@ -6381,7 +6396,7 @@ static int i40e_sw_init(struct i40e_pf *pf)
                        pf->flags |= I40E_FLAG_FD_SB_ENABLED;
                } else {
                        dev_info(&pf->pdev->dev,
-                                 "Flow Director Side Band mode Disabled in MFP mode\n");
+                                 "Flow Director Sideband mode Disabled in MFP mode\n");
                }
                pf->fdir_pf_filter_count =
                                 pf->hw.func_caps.fd_filters_guaranteed;
diff --git a/drivers/net/ethernet/intel/i40e/i40e_type.h b/drivers/net/ethernet/intel/i40e/i40e_type.h
index 5c902f448b1d..d2f0b95fd0d7 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_type.h
+++ b/drivers/net/ethernet/intel/i40e/i40e_type.h
@@ -1014,6 +1014,11 @@ struct i40e_hw_port_stats {
        u64 tx_size_big;                /* ptc9522 */
        u64 mac_short_packet_dropped;   /* mspdc */
        u64 checksum_error;             /* xec */
+        /* EEE LPI */
+        bool tx_lpi_status;
+        bool rx_lpi_status;
+        u64 tx_lpi_count;               /* etlpic */
+        u64 rx_lpi_count;               /* erlpic */
 };
 /* Checksum and Shadow RAM pointers */
diff --git a/drivers/net/ethernet/intel/i40evf/i40e_type.h b/drivers/net/ethernet/intel/i40evf/i40e_type.h
index 7189d6f08ddd..efe73ad6fdb9 100644
--- a/drivers/net/ethernet/intel/i40evf/i40e_type.h
+++ b/drivers/net/ethernet/intel/i40evf/i40e_type.h
@@ -1020,6 +1020,11 @@ struct i40e_hw_port_stats {
        u64 tx_size_big;                /* ptc9522 */
        u64 mac_short_packet_dropped;   /* mspdc */
        u64 checksum_error;             /* xec */
+        /* EEE LPI */
+        bool tx_lpi_status;
+        bool rx_lpi_status;
+        u64 tx_lpi_count;               /* etlpic */
+        u64 rx_lpi_count;               /* erlpic */
 };
 /* Checksum and Shadow RAM pointers */
diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_main.c b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
index d381bcc4ea9f..d3eafa320ba9 100644
--- a/drivers/net/ethernet/intel/i40evf/i40evf_main.c
+++ b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
@@ -1968,8 +1968,7 @@ static void i40evf_init_task(struct work_struct *work)
                }
                err = i40evf_send_api_ver(adapter);
                if (err) {
-                        dev_err(&pdev->dev, "Unable to send to PF (%d)\n",
+                        dev_err(&pdev->dev, "Unable to send to PF (%d)\n", err);
-                                err);
                        i40evf_shutdown_adminq(hw);
                        goto err;
                }
@@ -1977,8 +1976,10 @@ static void i40evf_init_task(struct work_struct *work)
                goto restart;
                break;
        case __I40EVF_INIT_VERSION_CHECK:
-                if (!i40evf_asq_done(hw))
+                if (!i40evf_asq_done(hw)) {
+                        dev_err(&pdev->dev, "Admin queue command never completed.\n");
                        goto err;
+                }
                /* aq msg sent, awaiting reply */
                err = i40evf_verify_api_ver(adapter);
@@ -2133,8 +2134,6 @@ err_alloc:
        kfree(adapter->vf_res);
        adapter->vf_res = NULL;
 err:
-        if (hw->aq.asq.count)
-                i40evf_shutdown_adminq(hw); /* ignore error */
        /* Things went into the weeds, so try again later */
        if (++adapter->aq_wait_count > I40EVF_AQ_MAX_ERR) {
                dev_err(&pdev->dev, "Failed to communicate with PF; giving up.\n");
diff --git a/drivers/net/ethernet/intel/igb/e1000_regs.h b/drivers/net/ethernet/intel/igb/e1000_regs.h
index d0f14be3d94f..bdb246e848e1 100644
--- a/drivers/net/ethernet/intel/igb/e1000_regs.h
+++ b/drivers/net/ethernet/intel/igb/e1000_regs.h
@@ -362,12 +362,25 @@
                                                       * Filter - RW */
 #define E1000_VMVIR(_n)        (0x03700 + (4 * (_n)))
-#define wr32(reg, value) (writel(value, hw->hw_addr + reg))
+struct e1000_hw;
-#define rd32(reg) (readl(hw->hw_addr + reg))
+u32 igb_rd32(struct e1000_hw *hw, u32 reg);
+/* write operations, indexed using DWORDS */
+#define wr32(reg, val) \
+do { \
+        u8 __iomem *hw_addr = ACCESS_ONCE((hw)->hw_addr); \
+        if (!E1000_REMOVED(hw_addr)) \
+                writel((val), &hw_addr[(reg)]); \
+} while (0)
+#define rd32(reg) (igb_rd32(hw, reg))
 #define wrfl() ((void)rd32(E1000_STATUS))
 #define array_wr32(reg, offset, value) \
-        (writel(value, hw->hw_addr + reg + ((offset) << 2)))
+        wr32((reg) + ((offset) << 2), (value))
 #define array_rd32(reg, offset) \
        (readl(hw->hw_addr + reg + ((offset) << 2)))
@@ -406,4 +419,6 @@
 #define E1000_INVM_DATA_REG(_n) (0x12120 + 4*(_n))
 #define E1000_INVM_SIZE         64 /* Number of INVM Data Registers */
+#define E1000_REMOVED(h) unlikely(!(h))
 #endif
diff --git a/drivers/net/ethernet/intel/igb/igb.h b/drivers/net/ethernet/intel/igb/igb.h
index a202c9640e93..411b213c63be 100644
--- a/drivers/net/ethernet/intel/igb/igb.h
+++ b/drivers/net/ethernet/intel/igb/igb.h
@@ -434,6 +434,7 @@ struct igb_adapter {
        struct delayed_work ptp_overflow_work;
        struct work_struct ptp_tx_work;
        struct sk_buff *ptp_tx_skb;
+        struct hwtstamp_config tstamp_config;
        unsigned long ptp_tx_start;
        unsigned long last_rx_ptp_check;
        spinlock_t tmreg_lock;
@@ -545,8 +546,8 @@ static inline void igb_ptp_rx_hwtstamp(struct igb_ring *rx_ring,
        rx_ring->last_rx_timestamp = jiffies;
 }
-int igb_ptp_hwtstamp_ioctl(struct net_device *netdev, struct ifreq *ifr,
+int igb_ptp_set_ts_config(struct net_device *netdev, struct ifreq *ifr);
-                           int cmd);
+int igb_ptp_get_ts_config(struct net_device *netdev, struct ifreq *ifr);
 #ifdef CONFIG_IGB_HWMON
 void igb_sysfs_exit(struct igb_adapter *adapter);
 int igb_sysfs_init(struct igb_adapter *adapter);
diff --git a/drivers/net/ethernet/intel/igb/igb_ethtool.c b/drivers/net/ethernet/intel/igb/igb_ethtool.c
index e35bc1faa452..e5570acbeea8 100644
--- a/drivers/net/ethernet/intel/igb/igb_ethtool.c
+++ b/drivers/net/ethernet/intel/igb/igb_ethtool.c
@@ -2353,6 +2353,11 @@ static int igb_get_ts_info(struct net_device *dev,
 {
        struct igb_adapter *adapter = netdev_priv(dev);
+        if (adapter->ptp_clock)
+                info->phc_index = ptp_clock_index(adapter->ptp_clock);
+        else
+                info->phc_index = -1;
        switch (adapter->hw.mac.type) {
        case e1000_82575:
                info->so_timestamping =
@@ -2374,11 +2379,6 @@ static int igb_get_ts_info(struct net_device *dev,
                        SOF_TIMESTAMPING_RX_HARDWARE |
                        SOF_TIMESTAMPING_RAW_HARDWARE;
-                if (adapter->ptp_clock)
-                        info->phc_index = ptp_clock_index(adapter->ptp_clock);
-                else
-                        info->phc_index = -1;
                info->tx_types =
                        (1 << HWTSTAMP_TX_OFF) |
                        (1 << HWTSTAMP_TX_ON);
@@ -2791,9 +2791,11 @@ static int igb_get_module_eeprom(struct net_device *netdev,
        /* Read EEPROM block, SFF-8079/SFF-8472, word at a time */
        for (i = 0; i < last_word - first_word + 1; i++) {
                status = igb_read_phy_reg_i2c(hw, first_word + i, &dataword[i]);
-                if (status != E1000_SUCCESS)
+                if (status != E1000_SUCCESS) {
                        /* Error occurred while reading module */
+                        kfree(dataword);
                        return -EIO;
+                }
                be16_to_cpus(&dataword[i]);
        }
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index 17feea0ea2b0..cd20409858d1 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -751,6 +751,28 @@ static void igb_cache_ring_register(struct igb_adapter *adapter)
        }
 }
+u32 igb_rd32(struct e1000_hw *hw, u32 reg)
+{
+        struct igb_adapter *igb = container_of(hw, struct igb_adapter, hw);
+        u8 __iomem *hw_addr = ACCESS_ONCE(hw->hw_addr);
+        u32 value = 0;
+        if (E1000_REMOVED(hw_addr))
+                return ~value;
+        value = readl(&hw_addr[reg]);
+        /* reads should not return all F's */
+        if (!(~value) && (!reg || !(~readl(hw_addr)))) {
+                struct net_device *netdev = igb->netdev;
+                hw->hw_addr = NULL;
+                netif_device_detach(netdev);
+                netdev_err(netdev, "PCIe link lost, device now detached\n");
+        }
+        return value;
+}
 /**
 *  igb_write_ivar - configure ivar for given MSI-X vector
 *  @hw: pointer to the HW structure
@@ -1013,6 +1035,12 @@ static void igb_reset_q_vector(struct igb_adapter *adapter, int v_idx)
 {
        struct igb_q_vector *q_vector = adapter->q_vector[v_idx];
+        /* Coming from igb_set_interrupt_capability, the vectors are not yet
+         * allocated. So, q_vector is NULL so we should stop here.
+         */
+        if (!q_vector)
+                return;
        if (q_vector->tx.ring)
                adapter->tx_ring[q_vector->tx.ring->queue_index] = NULL;
@@ -1121,6 +1149,7 @@ static void igb_set_interrupt_capability(struct igb_adapter *adapter, bool msix)
        /* If we can't do MSI-X, try MSI */
 msi_only:
+        adapter->flags &= ~IGB_FLAG_HAS_MSIX;
 #ifdef CONFIG_PCI_IOV
        /* disable SR-IOV for non MSI-X configurations */
        if (adapter->vf_data) {
@@ -7162,8 +7191,10 @@ static int igb_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)
        case SIOCGMIIREG:
        case SIOCSMIIREG:
                return igb_mii_ioctl(netdev, ifr, cmd);
+        case SIOCGHWTSTAMP:
+                return igb_ptp_get_ts_config(netdev, ifr);
        case SIOCSHWTSTAMP:
-                return igb_ptp_hwtstamp_ioctl(netdev, ifr, cmd);
+                return igb_ptp_set_ts_config(netdev, ifr);
        default:
                return -EOPNOTSUPP;
        }
diff --git a/drivers/net/ethernet/intel/igb/igb_ptp.c b/drivers/net/ethernet/intel/igb/igb_ptp.c
index a894551ae3c0..da55fbb090b2 100644
--- a/drivers/net/ethernet/intel/igb/igb_ptp.c
+++ b/drivers/net/ethernet/intel/igb/igb_ptp.c
@@ -541,10 +541,26 @@ void igb_ptp_rx_rgtstamp(struct igb_q_vector *q_vector,
 }
 /**
- * igb_ptp_hwtstamp_ioctl - control hardware time stamping
+ * igb_ptp_get_ts_config - get hardware time stamping config
+ * @netdev:
+ * @ifreq:
+ *
+ * Get the hwtstamp_config settings to return to the user. Rather than attempt
+ * to deconstruct the settings from the registers, just return a shadow copy
+ * of the last known settings.
+ **/
+int igb_ptp_get_ts_config(struct net_device *netdev, struct ifreq *ifr)
+{
+        struct igb_adapter *adapter = netdev_priv(netdev);
+        struct hwtstamp_config *config = &adapter->tstamp_config;
+        return copy_to_user(ifr->ifr_data, config, sizeof(*config)) ?
+                -EFAULT : 0;
+}
+/**
+ * igb_ptp_set_ts_config - control hardware time stamping
 * @netdev:
 * @ifreq:
- * @cmd:
 *
 * Outgoing time stamping can be enabled and disabled. Play nice and
 * disable it when requested, although it shouldn't case any overhead
@@ -558,12 +574,11 @@ void igb_ptp_rx_rgtstamp(struct igb_q_vector *q_vector,
 * not supported, with the exception of "all V2 events regardless of
 * level 2 or 4".
 **/
-int igb_ptp_hwtstamp_ioctl(struct net_device *netdev,
+int igb_ptp_set_ts_config(struct net_device *netdev, struct ifreq *ifr)
-                           struct ifreq *ifr, int cmd)
 {
        struct igb_adapter *adapter = netdev_priv(netdev);
        struct e1000_hw *hw = &adapter->hw;
-        struct hwtstamp_config config;
+        struct hwtstamp_config *config = &adapter->tstamp_config;
        u32 tsync_tx_ctl = E1000_TSYNCTXCTL_ENABLED;
        u32 tsync_rx_ctl = E1000_TSYNCRXCTL_ENABLED;
        u32 tsync_rx_cfg = 0;
@@ -571,14 +586,14 @@ int igb_ptp_hwtstamp_ioctl(struct net_device *netdev,
        bool is_l2 = false;
        u32 regval;
-        if (copy_from_user(&config, ifr->ifr_data, sizeof(config)))
+        if (copy_from_user(config, ifr->ifr_data, sizeof(*config)))
                return -EFAULT;
        /* reserved for future extensions */
-        if (config.flags)
+        if (config->flags)
                return -EINVAL;
-        switch (config.tx_type) {
+        switch (config->tx_type) {
        case HWTSTAMP_TX_OFF:
                tsync_tx_ctl = 0;
        case HWTSTAMP_TX_ON:
@@ -587,7 +602,7 @@ int igb_ptp_hwtstamp_ioctl(struct net_device *netdev,
                return -ERANGE;
        }
-        switch (config.rx_filter) {
+        switch (config->rx_filter) {
        case HWTSTAMP_FILTER_NONE:
                tsync_rx_ctl = 0;
                break;
@@ -611,7 +626,7 @@ int igb_ptp_hwtstamp_ioctl(struct net_device *netdev,
        case HWTSTAMP_FILTER_PTP_V2_L2_DELAY_REQ:
        case HWTSTAMP_FILTER_PTP_V2_L4_DELAY_REQ:
                tsync_rx_ctl |= E1000_TSYNCRXCTL_TYPE_EVENT_V2;
-                config.rx_filter = HWTSTAMP_FILTER_PTP_V2_EVENT;
+                config->rx_filter = HWTSTAMP_FILTER_PTP_V2_EVENT;
                is_l2 = true;
                is_l4 = true;
                break;
@@ -622,12 +637,12 @@ int igb_ptp_hwtstamp_ioctl(struct net_device *netdev,
                 */
                if (hw->mac.type != e1000_82576) {
                        tsync_rx_ctl |= E1000_TSYNCRXCTL_TYPE_ALL;
-                        config.rx_filter = HWTSTAMP_FILTER_ALL;
+                        config->rx_filter = HWTSTAMP_FILTER_ALL;
                        break;
                }
                /* fall through */
        default:
-                config.rx_filter = HWTSTAMP_FILTER_NONE;
+                config->rx_filter = HWTSTAMP_FILTER_NONE;
                return -ERANGE;
        }
@@ -644,7 +659,7 @@ int igb_ptp_hwtstamp_ioctl(struct net_device *netdev,
        if ((hw->mac.type >= e1000_82580) && tsync_rx_ctl) {
                tsync_rx_ctl = E1000_TSYNCRXCTL_ENABLED;
                tsync_rx_ctl |= E1000_TSYNCRXCTL_TYPE_ALL;
-                config.rx_filter = HWTSTAMP_FILTER_ALL;
+                config->rx_filter = HWTSTAMP_FILTER_ALL;
                is_l2 = true;
                is_l4 = true;
@@ -708,7 +723,7 @@ int igb_ptp_hwtstamp_ioctl(struct net_device *netdev,
        regval = rd32(E1000_RXSTMPL);
        regval = rd32(E1000_RXSTMPH);
-        return copy_to_user(ifr->ifr_data, &config, sizeof(config)) ?
+        return copy_to_user(ifr->ifr_data, config, sizeof(*config)) ?
                -EFAULT : 0;
 }
@@ -865,6 +880,9 @@ void igb_ptp_reset(struct igb_adapter *adapter)
        if (!(adapter->flags & IGB_FLAG_PTP))
                return;
+        /* reset the tstamp_config */
+        memset(&adapter->tstamp_config, 0, sizeof(adapter->tstamp_config));
        switch (adapter->hw.mac.type) {
        case e1000_82576:
                /* Dial the nominal frequency. */
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
index 911b711b6ba1..24fba39e194e 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
@@ -2913,6 +2913,9 @@ s32 ixgbe_clear_vmdq_generic(struct ixgbe_hw *hw, u32 rar, u32 vmdq)
        mpsar_lo = IXGBE_READ_REG(hw, IXGBE_MPSAR_LO(rar));
        mpsar_hi = IXGBE_READ_REG(hw, IXGBE_MPSAR_HI(rar));
+        if (ixgbe_removed(hw->hw_addr))
+                goto done;
        if (!mpsar_lo && !mpsar_hi)
                goto done;
diff --git a/drivers/net/ethernet/intel/ixgbevf/ethtool.c b/drivers/net/ethernet/intel/ixgbevf/ethtool.c
index f68b78c732a8..b2d002394e5d 100644
--- a/drivers/net/ethernet/intel/ixgbevf/ethtool.c
+++ b/drivers/net/ethernet/intel/ixgbevf/ethtool.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
  Intel 82599 Virtual Function driver
-  Copyright(c) 1999 - 2012 Intel Corporation.
+  Copyright(c) 1999 - 2014 Intel Corporation.
  This program is free software; you can redistribute it and/or modify it
  under the terms and conditions of the GNU General Public License,
@@ -530,41 +530,55 @@ static const u32 register_test_patterns[] = {
        0x5A5A5A5A, 0xA5A5A5A5, 0x00000000, 0xFFFFFFFF
 };
-#define REG_PATTERN_TEST(R, M, W)                                             \
+static bool reg_pattern_test(struct ixgbevf_adapter *adapter, u64 *data,
-{                                                                             \
+                             int reg, u32 mask, u32 write)
-        u32 pat, val, before;                                                 \
+{
-        for (pat = 0; pat < ARRAY_SIZE(register_test_patterns); pat++) {      \
+        u32 pat, val, before;
-                before = readl(adapter->hw.hw_addr + R);                      \
-                writel((register_test_patterns[pat] & W),                     \
+        if (IXGBE_REMOVED(adapter->hw.hw_addr)) {
-                       (adapter->hw.hw_addr + R));                            \
+                *data = 1;
-                val = readl(adapter->hw.hw_addr + R);                         \
+                return true;
-                if (val != (register_test_patterns[pat] & W & M)) {           \
+        }
-                        hw_dbg(&adapter->hw,                                  \
+        for (pat = 0; pat < ARRAY_SIZE(register_test_patterns); pat++) {
-                        "pattern test reg %04X failed: got "                  \
+                before = ixgbe_read_reg(&adapter->hw, reg);
-                        "0x%08X expected 0x%08X\n",                           \
+                ixgbe_write_reg(&adapter->hw, reg,
-                        R, val, (register_test_patterns[pat] & W & M));       \
+                                register_test_patterns[pat] & write);
-                        *data = R;                                            \
+                val = ixgbe_read_reg(&adapter->hw, reg);
-                        writel(before, adapter->hw.hw_addr + R);              \
+                if (val != (register_test_patterns[pat] & write & mask)) {
-                        return 1;                                             \
+                        hw_dbg(&adapter->hw,
-                }                                                             \
+                               "pattern test reg %04X failed: got 0x%08X expected 0x%08X\n",
-                writel(before, adapter->hw.hw_addr + R);                      \
+                               reg, val,
-        }                                                                     \
+                               register_test_patterns[pat] & write & mask);
+                        *data = reg;
+                        ixgbe_write_reg(&adapter->hw, reg, before);
+                        return true;
+                }
+                ixgbe_write_reg(&adapter->hw, reg, before);
+        }
+        return false;
 }
-#define REG_SET_AND_CHECK(R, M, W)                                            \
+static bool reg_set_and_check(struct ixgbevf_adapter *adapter, u64 *data,
-{                                                                             \
+                              int reg, u32 mask, u32 write)
-        u32 val, before;                                                      \
+{
-        before = readl(adapter->hw.hw_addr + R);                              \
+        u32 val, before;
-        writel((W & M), (adapter->hw.hw_addr + R));                           \
-        val = readl(adapter->hw.hw_addr + R);                                 \
+        if (IXGBE_REMOVED(adapter->hw.hw_addr)) {
-        if ((W & M) != (val & M)) {                                           \
+                *data = 1;
-                pr_err("set/check reg %04X test failed: got 0x%08X expected " \
+                return true;
-                       "0x%08X\n", R, (val & M), (W & M));                    \
+        }
-                *data = R;                                                    \
+        before = ixgbe_read_reg(&adapter->hw, reg);
-                writel(before, (adapter->hw.hw_addr + R));                    \
+        ixgbe_write_reg(&adapter->hw, reg, write & mask);
-                return 1;                                                     \
+        val = ixgbe_read_reg(&adapter->hw, reg);
-        }                                                                     \
+        if ((write & mask) != (val & mask)) {
-        writel(before, (adapter->hw.hw_addr + R));                            \
+                pr_err("set/check reg %04X test failed: got 0x%08X expected 0x%08X\n",
+                       reg, (val & mask), write & mask);
+                *data = reg;
+                ixgbe_write_reg(&adapter->hw, reg, before);
+                return true;
+        }
+        ixgbe_write_reg(&adapter->hw, reg, before);
+        return false;
 }
 static int ixgbevf_reg_test(struct ixgbevf_adapter *adapter, u64 *data)
@@ -572,6 +586,12 @@ static int ixgbevf_reg_test(struct ixgbevf_adapter *adapter, u64 *data)
        const struct ixgbevf_reg_test *test;
        u32 i;
+        if (IXGBE_REMOVED(adapter->hw.hw_addr)) {
+                dev_err(&adapter->pdev->dev,
+                        "Adapter removed - register test blocked\n");
+                *data = 1;
+                return 1;
+        }
        test = reg_test_vf;
        /*
@@ -580,38 +600,47 @@ static int ixgbevf_reg_test(struct ixgbevf_adapter *adapter, u64 *data)
         */
        while (test->reg) {
                for (i = 0; i < test->array_len; i++) {
+                        bool b = false;
                        switch (test->test_type) {
                        case PATTERN_TEST:
-                                REG_PATTERN_TEST(test->reg + (i * 0x40),
+                                b = reg_pattern_test(adapter, data,
-                                                test->mask,
+                                                     test->reg + (i * 0x40),
-                                                test->write);
+                                                     test->mask,
+                                                     test->write);
                                break;
                        case SET_READ_TEST:
-                                REG_SET_AND_CHECK(test->reg + (i * 0x40),
+                                b = reg_set_and_check(adapter, data,
-                                                test->mask,
+                                                      test->reg + (i * 0x40),
-                                                test->write);
+                                                      test->mask,
+                                                      test->write);
                                break;
                        case WRITE_NO_TEST:
-                                writel(test->write,
+                                ixgbe_write_reg(&adapter->hw,
-                                       (adapter->hw.hw_addr + test->reg)
+                                                  test->reg + (i * 0x40),
-                                       + (i * 0x40));
+                                                  test->write);
                                break;
                        case TABLE32_TEST:
-                                REG_PATTERN_TEST(test->reg + (i * 4),
+                                b = reg_pattern_test(adapter, data,
-                                                test->mask,
+                                                     test->reg + (i * 4),
-                                                test->write);
+                                                     test->mask,
+                                                     test->write);
                                break;
                        case TABLE64_TEST_LO:
-                                REG_PATTERN_TEST(test->reg + (i * 8),
+                                b = reg_pattern_test(adapter, data,
-                                                test->mask,
+                                                     test->reg + (i * 8),
-                                                test->write);
+                                                     test->mask,
+                                                     test->write);
                                break;
                        case TABLE64_TEST_HI:
-                                REG_PATTERN_TEST((test->reg + 4) + (i * 8),
+                                b = reg_pattern_test(adapter, data,
-                                                test->mask,
+                                                     test->reg + 4 + (i * 8),
-                                                test->write);
+                                                     test->mask,
+                                                     test->write);
                                break;
                        }
+                        if (b)
+                                return 1;
                }
                test++;
        }
@@ -626,6 +655,14 @@ static void ixgbevf_diag_test(struct net_device *netdev,
        struct ixgbevf_adapter *adapter = netdev_priv(netdev);
        bool if_running = netif_running(netdev);
+        if (IXGBE_REMOVED(adapter->hw.hw_addr)) {
+                dev_err(&adapter->pdev->dev,
+                        "Adapter removed - test blocked\n");
+                data[0] = 1;
+                data[1] = 1;
+                eth_test->flags |= ETH_TEST_FL_FAILED;
+                return;
+        }
        set_bit(__IXGBEVF_TESTING, &adapter->state);
        if (eth_test->flags == ETH_TEST_FL_OFFLINE) {
                /* Offline tests */
diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h b/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h
index 08fb88aba67b..a08bd7c46766 100644
--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h
+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h
@@ -315,6 +315,11 @@ static inline u16 ixgbevf_desc_unused(struct ixgbevf_ring *ring)
        return ((ntc > ntu) ? 0 : ring->count) + ntc - ntu - 1;
 }
+static inline void ixgbevf_write_tail(struct ixgbevf_ring *ring, u32 value)
+{
+        writel(value, ring->tail);
+}
 #define IXGBEVF_RX_DESC(R, i)       \
        (&(((union ixgbe_adv_rx_desc *)((R)->desc))[i]))
 #define IXGBEVF_TX_DESC(R, i)       \
@@ -401,6 +406,7 @@ struct ixgbevf_adapter {
        u64 bp_tx_missed;
 #endif
+        u8 __iomem *io_addr; /* Mainly for iounmap use */
        u32 link_speed;
        bool link_up;
diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
index 592d8a6baabc..a50e892a5d21 100644
--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
@@ -99,6 +99,49 @@ static void ixgbevf_queue_reset_subtask(struct ixgbevf_adapter *adapter);
 static void ixgbevf_set_itr(struct ixgbevf_q_vector *q_vector);
 static void ixgbevf_free_all_rx_resources(struct ixgbevf_adapter *adapter);
+static void ixgbevf_remove_adapter(struct ixgbe_hw *hw)
+{
+        struct ixgbevf_adapter *adapter = hw->back;
+        if (!hw->hw_addr)
+                return;
+        hw->hw_addr = NULL;
+        dev_err(&adapter->pdev->dev, "Adapter removed\n");
+        schedule_work(&adapter->watchdog_task);
+}
+static void ixgbevf_check_remove(struct ixgbe_hw *hw, u32 reg)
+{
+        u32 value;
+        /* The following check not only optimizes a bit by not
+         * performing a read on the status register when the
+         * register just read was a status register read that
+         * returned IXGBE_FAILED_READ_REG. It also blocks any
+         * potential recursion.
+         */
+        if (reg == IXGBE_VFSTATUS) {
+                ixgbevf_remove_adapter(hw);
+                return;
+        }
+        value = ixgbe_read_reg(hw, IXGBE_VFSTATUS);
+        if (value == IXGBE_FAILED_READ_REG)
+                ixgbevf_remove_adapter(hw);
+}
+u32 ixgbe_read_reg(struct ixgbe_hw *hw, u32 reg)
+{
+        u8 __iomem *reg_addr = ACCESS_ONCE(hw->hw_addr);
+        u32 value;
+        if (IXGBE_REMOVED(reg_addr))
+                return IXGBE_FAILED_READ_REG;
+        value = readl(reg_addr + reg);
+        if (unlikely(value == IXGBE_FAILED_READ_REG))
+                ixgbevf_check_remove(hw, reg);
+        return value;
+}
 static inline void ixgbevf_release_rx_desc(struct ixgbevf_ring *rx_ring,
                                           u32 val)
 {
@@ -111,7 +154,7 @@ static inline void ixgbevf_release_rx_desc(struct ixgbevf_ring *rx_ring,
         * such as IA-64).
         */
        wmb();
-        writel(val, rx_ring->tail);
+        ixgbevf_write_tail(rx_ring, val);
 }
 /**
@@ -1139,7 +1182,7 @@ static void ixgbevf_configure_tx_ring(struct ixgbevf_adapter *adapter,
        /* reset head and tail pointers */
        IXGBE_WRITE_REG(hw, IXGBE_VFTDH(reg_idx), 0);
        IXGBE_WRITE_REG(hw, IXGBE_VFTDT(reg_idx), 0);
-        ring->tail = hw->hw_addr + IXGBE_VFTDT(reg_idx);
+        ring->tail = adapter->io_addr + IXGBE_VFTDT(reg_idx);
        /* reset ntu and ntc to place SW in sync with hardwdare */
        ring->next_to_clean = 0;
@@ -1259,6 +1302,8 @@ static void ixgbevf_disable_rx_queue(struct ixgbevf_adapter *adapter,
        u32 rxdctl;
        u8 reg_idx = ring->reg_idx;
+        if (IXGBE_REMOVED(hw->hw_addr))
+                return;
        rxdctl = IXGBE_READ_REG(hw, IXGBE_VFRXDCTL(reg_idx));
        rxdctl &= ~IXGBE_RXDCTL_ENABLE;
@@ -1284,6 +1329,8 @@ static void ixgbevf_rx_desc_queue_enable(struct ixgbevf_adapter *adapter,
        u32 rxdctl;
        u8 reg_idx = ring->reg_idx;
+        if (IXGBE_REMOVED(hw->hw_addr))
+                return;
        do {
                usleep_range(1000, 2000);
                rxdctl = IXGBE_READ_REG(hw, IXGBE_VFRXDCTL(reg_idx));
@@ -1318,7 +1365,7 @@ static void ixgbevf_configure_rx_ring(struct ixgbevf_adapter *adapter,
        /* reset head and tail pointers */
        IXGBE_WRITE_REG(hw, IXGBE_VFRDH(reg_idx), 0);
        IXGBE_WRITE_REG(hw, IXGBE_VFRDT(reg_idx), 0);
-        ring->tail = hw->hw_addr + IXGBE_VFRDT(reg_idx);
+        ring->tail = adapter->io_addr + IXGBE_VFRDT(reg_idx);
        /* reset ntu and ntc to place SW in sync with hardwdare */
        ring->next_to_clean = 0;
@@ -2357,6 +2404,14 @@ static void ixgbevf_watchdog_task(struct work_struct *work)
        bool link_up = adapter->link_up;
        s32 need_reset;
+        if (IXGBE_REMOVED(hw->hw_addr)) {
+                if (!test_bit(__IXGBEVF_DOWN, &adapter->state)) {
+                        rtnl_lock();
+                        ixgbevf_down(adapter);
+                        rtnl_unlock();
+                }
+                return;
+        }
        ixgbevf_queue_reset_subtask(adapter);
        adapter->flags |= IXGBE_FLAG_IN_WATCHDOG_TASK;
@@ -3060,7 +3115,7 @@ static void ixgbevf_tx_map(struct ixgbevf_ring *tx_ring,
        tx_ring->next_to_use = i;
        /* notify HW of packet */
-        writel(i, tx_ring->tail);
+        ixgbevf_write_tail(tx_ring, i);
        return;
 dma_error:
@@ -3459,6 +3514,7 @@ static int ixgbevf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        hw->hw_addr = ioremap(pci_resource_start(pdev, 0),
                              pci_resource_len(pdev, 0));
+        adapter->io_addr = hw->hw_addr;
        if (!hw->hw_addr) {
                err = -EIO;
                goto err_ioremap;
@@ -3544,7 +3600,7 @@ err_register:
        ixgbevf_clear_interrupt_scheme(adapter);
 err_sw_init:
        ixgbevf_reset_interrupt_capability(adapter);
-        iounmap(hw->hw_addr);
+        iounmap(adapter->io_addr);
 err_ioremap:
        free_netdev(netdev);
 err_alloc_etherdev:
@@ -3582,7 +3638,7 @@ static void ixgbevf_remove(struct pci_dev *pdev)
        ixgbevf_clear_interrupt_scheme(adapter);
        ixgbevf_reset_interrupt_capability(adapter);
-        iounmap(adapter->hw.hw_addr);
+        iounmap(adapter->io_addr);
        pci_release_regions(pdev);
        hw_dbg(&adapter->hw, "Remove complete\n");
diff --git a/drivers/net/ethernet/intel/ixgbevf/regs.h b/drivers/net/ethernet/intel/ixgbevf/regs.h
index debd8c0e1f28..09dd8f698bea 100644
--- a/drivers/net/ethernet/intel/ixgbevf/regs.h
+++ b/drivers/net/ethernet/intel/ixgbevf/regs.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
  Intel 82599 Virtual Function driver
-  Copyright(c) 1999 - 2012 Intel Corporation.
+  Copyright(c) 1999 - 2014 Intel Corporation.
  This program is free software; you can redistribute it and/or modify it
  under the terms and conditions of the GNU General Public License,
@@ -70,16 +70,6 @@
 #define IXGBE_VFGOTC_MSB       0x02024
 #define IXGBE_VFMPRC           0x01034
-#define IXGBE_WRITE_REG(a, reg, value) writel((value), ((a)->hw_addr + (reg)))
-#define IXGBE_READ_REG(a, reg) readl((a)->hw_addr + (reg))
-#define IXGBE_WRITE_REG_ARRAY(a, reg, offset, value) ( \
-    writel((value), ((a)->hw_addr + (reg) + ((offset) << 2))))
-#define IXGBE_READ_REG_ARRAY(a, reg, offset) ( \
-    readl((a)->hw_addr + (reg) + ((offset) << 2)))
 #define IXGBE_WRITE_FLUSH(a) (IXGBE_READ_REG(a, IXGBE_VFSTATUS))
 #endif /* _IXGBEVF_REGS_H_ */
diff --git a/drivers/net/ethernet/intel/ixgbevf/vf.h b/drivers/net/ethernet/intel/ixgbevf/vf.h
index 7b1f502d1716..096d33a59def 100644
--- a/drivers/net/ethernet/intel/ixgbevf/vf.h
+++ b/drivers/net/ethernet/intel/ixgbevf/vf.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
  Intel 82599 Virtual Function driver
-  Copyright(c) 1999 - 2012 Intel Corporation.
+  Copyright(c) 1999 - 2014 Intel Corporation.
  This program is free software; you can redistribute it and/or modify it
  under the terms and conditions of the GNU General Public License,
@@ -172,6 +172,37 @@ struct ixgbevf_info {
        const struct ixgbe_mac_operations *mac_ops;
 };
+#define IXGBE_FAILED_READ_REG 0xffffffffU
+#define IXGBE_REMOVED(a) unlikely(!(a))
+static inline void ixgbe_write_reg(struct ixgbe_hw *hw, u32 reg, u32 value)
+{
+        u8 __iomem *reg_addr = ACCESS_ONCE(hw->hw_addr);
+        if (IXGBE_REMOVED(reg_addr))
+                return;
+        writel(value, reg_addr + reg);
+}
+#define IXGBE_WRITE_REG(h, r, v) ixgbe_write_reg(h, r, v)
+u32 ixgbe_read_reg(struct ixgbe_hw *hw, u32 reg);
+#define IXGBE_READ_REG(h, r) ixgbe_read_reg(h, r)
+static inline void ixgbe_write_reg_array(struct ixgbe_hw *hw, u32 reg,
+                                          u32 offset, u32 value)
+{
+        ixgbe_write_reg(hw, reg + (offset << 2), value);
+}
+#define IXGBE_WRITE_REG_ARRAY(h, r, o, v) ixgbe_write_reg_array(h, r, o, v)
+static inline u32 ixgbe_read_reg_array(struct ixgbe_hw *hw, u32 reg,
+                                        u32 offset)
+{
+        return ixgbe_read_reg(hw, reg + (offset << 2));
+}
+#define IXGBE_READ_REG_ARRAY(h, r, o) ixgbe_read_reg_array(h, r, o)
 void ixgbevf_rlpml_set_vf(struct ixgbe_hw *hw, u16 max_size);
 int ixgbevf_negotiate_api_version(struct ixgbe_hw *hw, int api);
 int ixgbevf_get_queues(struct ixgbe_hw *hw, unsigned int *num_tcs,
diff --git a/drivers/net/ethernet/jme.c b/drivers/net/ethernet/jme.c
index f5685c0d0579..14ff8d64257d 100644
--- a/drivers/net/ethernet/jme.c
+++ b/drivers/net/ethernet/jme.c
@@ -2059,7 +2059,7 @@ jme_expand_header(struct jme_adapter *jme, struct sk_buff *skb)
        if (unlikely(skb_shinfo(skb)->gso_size &&
                        skb_header_cloned(skb) &&
                        pskb_expand_head(skb, 0, 0, GFP_ATOMIC))) {
-                dev_kfree_skb(skb);
+                dev_kfree_skb_any(skb);
                return -1;
        }
diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c
index a2565ce22b7c..b7b8d74c22d9 100644
--- a/drivers/net/ethernet/marvell/mv643xx_eth.c
+++ b/drivers/net/ethernet/marvell/mv643xx_eth.c
@@ -730,7 +730,7 @@ static int txq_submit_skb(struct tx_queue *txq, struct sk_buff *skb)
                    unlikely(tag_bytes & ~12)) {
                        if (skb_checksum_help(skb) == 0)
                                goto no_csum;
-                        kfree_skb(skb);
+                        dev_kfree_skb_any(skb);
                        return 1;
                }
@@ -819,7 +819,7 @@ static netdev_tx_t mv643xx_eth_xmit(struct sk_buff *skb, struct net_device *dev)
        if (txq->tx_ring_size - txq->tx_desc_count < MAX_SKB_FRAGS + 1) {
                if (net_ratelimit())
                        netdev_err(dev, "tx queue full?!\n");
-                kfree_skb(skb);
+                dev_kfree_skb_any(skb);
                return NETDEV_TX_OK;
        }
diff --git a/drivers/net/ethernet/marvell/skge.c b/drivers/net/ethernet/marvell/skge.c
index 597846193869..7f81ae66cc89 100644
--- a/drivers/net/ethernet/marvell/skge.c
+++ b/drivers/net/ethernet/marvell/skge.c
@@ -2845,7 +2845,7 @@ mapping_unwind:
 mapping_error:
        if (net_ratelimit())
                dev_warn(&hw->pdev->dev, "%s: tx mapping error\n", dev->name);
-        dev_kfree_skb(skb);
+        dev_kfree_skb_any(skb);
        return NETDEV_TX_OK;
 }
@@ -3172,7 +3172,7 @@ static void skge_tx_done(struct net_device *dev)
                        pkts_compl++;
                        bytes_compl += e->skb->len;
-                        dev_kfree_skb(e->skb);
+                        dev_consume_skb_any(e->skb);
                }
        }
        netdev_completed_queue(dev, pkts_compl, bytes_compl);
diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c
index d524676fdff4..b81106451a0a 100644
--- a/drivers/net/ethernet/marvell/sky2.c
+++ b/drivers/net/ethernet/marvell/sky2.c
@@ -2002,7 +2002,7 @@ mapping_unwind:
 mapping_error:
        if (net_ratelimit())
                dev_warn(&hw->pdev->dev, "%s: tx mapping error\n", dev->name);
-        dev_kfree_skb(skb);
+        dev_kfree_skb_any(skb);
        return NETDEV_TX_OK;
 }
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_clock.c b/drivers/net/ethernet/mellanox/mlx4/en_clock.c
index abaf6bb22416..57dda95b67d8 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_clock.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_clock.c
@@ -276,6 +276,7 @@ static const struct ptp_clock_info mlx4_en_ptp_clock_info = {
        .n_alarm        = 0,
        .n_ext_ts       = 0,
        .n_per_out      = 0,
+        .n_pins         = 0,
        .pps            = 0,
        .adjfreq        = mlx4_en_phc_adjfreq,
        .adjtime        = mlx4_en_phc_adjtime,
diff --git a/drivers/net/ethernet/micrel/ksz884x.c b/drivers/net/ethernet/micrel/ksz884x.c
index ce84dc289c8f..14ac0e2bc09f 100644
--- a/drivers/net/ethernet/micrel/ksz884x.c
+++ b/drivers/net/ethernet/micrel/ksz884x.c
@@ -4832,7 +4832,7 @@ static inline void copy_old_skb(struct sk_buff *old, struct sk_buff *skb)
        skb->csum = old->csum;
        skb_set_network_header(skb, ETH_HLEN);
-        dev_kfree_skb(old);
+        dev_consume_skb_any(old);
 }
 /**
diff --git a/drivers/net/ethernet/neterion/s2io.c b/drivers/net/ethernet/neterion/s2io.c
index d44fdb91808e..a2844ff322c4 100644
--- a/drivers/net/ethernet/neterion/s2io.c
+++ b/drivers/net/ethernet/neterion/s2io.c
@@ -4049,7 +4049,7 @@ static netdev_tx_t s2io_xmit(struct sk_buff *skb, struct net_device *dev)
        if (!is_s2io_card_up(sp)) {
                DBG_PRINT(TX_DBG, "%s: Card going down for reset\n",
                          dev->name);
-                dev_kfree_skb(skb);
+                dev_kfree_skb_any(skb);
                return NETDEV_TX_OK;
        }
@@ -4122,7 +4122,7 @@ static netdev_tx_t s2io_xmit(struct sk_buff *skb, struct net_device *dev)
            ((put_off+1) == queue_len ? 0 : (put_off+1)) == get_off) {
                DBG_PRINT(TX_DBG, "Error in xmit, No free TXDs.\n");
                s2io_stop_tx_queue(sp, fifo->fifo_no);
-                dev_kfree_skb(skb);
+                dev_kfree_skb_any(skb);
                spin_unlock_irqrestore(&fifo->tx_lock, flags);
                return NETDEV_TX_OK;
        }
@@ -4244,7 +4244,7 @@ pci_map_failed:
        swstats->pci_map_fail_cnt++;
        s2io_stop_tx_queue(sp, fifo->fifo_no);
        swstats->mem_freed += skb->truesize;
-        dev_kfree_skb(skb);
+        dev_kfree_skb_any(skb);
        spin_unlock_irqrestore(&fifo->tx_lock, flags);
        return NETDEV_TX_OK;
 }
diff --git a/drivers/net/ethernet/neterion/vxge/vxge-main.c b/drivers/net/ethernet/neterion/vxge/vxge-main.c
index 11adc89959c1..d107bcbb8543 100644
--- a/drivers/net/ethernet/neterion/vxge/vxge-main.c
+++ b/drivers/net/ethernet/neterion/vxge/vxge-main.c
@@ -824,7 +824,7 @@ vxge_xmit(struct sk_buff *skb, struct net_device *dev)
        if (unlikely(skb->len <= 0)) {
                vxge_debug_tx(VXGE_ERR,
                        "%s: Buffer has no data..", dev->name);
-                dev_kfree_skb(skb);
+                dev_kfree_skb_any(skb);
                return NETDEV_TX_OK;
        }
@@ -833,7 +833,7 @@ vxge_xmit(struct sk_buff *skb, struct net_device *dev)
        if (unlikely(!is_vxge_card_up(vdev))) {
                vxge_debug_tx(VXGE_ERR,
                        "%s: vdev not initialized", dev->name);
-                dev_kfree_skb(skb);
+                dev_kfree_skb_any(skb);
                return NETDEV_TX_OK;
        }
@@ -843,7 +843,7 @@ vxge_xmit(struct sk_buff *skb, struct net_device *dev)
                        vxge_debug_tx(VXGE_ERR,
                                "%s: Failed to store the mac address",
                                dev->name);
-                        dev_kfree_skb(skb);
+                        dev_kfree_skb_any(skb);
                        return NETDEV_TX_OK;
                }
        }
@@ -990,7 +990,7 @@ _exit1:
        vxge_hw_fifo_txdl_free(fifo_hw, dtr);
 _exit0:
        netif_tx_stop_queue(fifo->txq);
-        dev_kfree_skb(skb);
+        dev_kfree_skb_any(skb);
        return NETDEV_TX_OK;
 }
diff --git a/drivers/net/ethernet/nvidia/forcedeth.c b/drivers/net/ethernet/nvidia/forcedeth.c
index 811be0bccd14..fddb464aeab3 100644
--- a/drivers/net/ethernet/nvidia/forcedeth.c
+++ b/drivers/net/ethernet/nvidia/forcedeth.c
@@ -2231,7 +2231,7 @@ static netdev_tx_t nv_start_xmit(struct sk_buff *skb, struct net_device *dev)
                if (pci_dma_mapping_error(np->pci_dev,
                                          np->put_tx_ctx->dma)) {
                        /* on DMA mapping error - drop the packet */
-                        kfree_skb(skb);
+                        dev_kfree_skb_any(skb);
                        u64_stats_update_begin(&np->swstats_tx_syncp);
                        np->stat_tx_dropped++;
                        u64_stats_update_end(&np->swstats_tx_syncp);
@@ -2277,7 +2277,7 @@ static netdev_tx_t nv_start_xmit(struct sk_buff *skb, struct net_device *dev)
                                        if (unlikely(tmp_tx_ctx++ == np->last_tx_ctx))
                                                tmp_tx_ctx = np->first_tx_ctx;
                                } while (tmp_tx_ctx != np->put_tx_ctx);
-                                kfree_skb(skb);
+                                dev_kfree_skb_any(skb);
                                np->put_tx_ctx = start_tx_ctx;
                                u64_stats_update_begin(&np->swstats_tx_syncp);
                                np->stat_tx_dropped++;
@@ -2380,7 +2380,7 @@ static netdev_tx_t nv_start_xmit_optimized(struct sk_buff *skb,
                if (pci_dma_mapping_error(np->pci_dev,
                                          np->put_tx_ctx->dma)) {
                        /* on DMA mapping error - drop the packet */
-                        kfree_skb(skb);
+                        dev_kfree_skb_any(skb);
                        u64_stats_update_begin(&np->swstats_tx_syncp);
                        np->stat_tx_dropped++;
                        u64_stats_update_end(&np->swstats_tx_syncp);
@@ -2427,7 +2427,7 @@ static netdev_tx_t nv_start_xmit_optimized(struct sk_buff *skb,
                                        if (unlikely(tmp_tx_ctx++ == np->last_tx_ctx))
                                                tmp_tx_ctx = np->first_tx_ctx;
                                } while (tmp_tx_ctx != np->put_tx_ctx);
-                                kfree_skb(skb);
+                                dev_kfree_skb_any(skb);
                                np->put_tx_ctx = start_tx_ctx;
                                u64_stats_update_begin(&np->swstats_tx_syncp);
                                np->stat_tx_dropped++;
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h b/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
index df9daa335292..b9039b569beb 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
@@ -38,8 +38,8 @@
 #define _QLCNIC_LINUX_MAJOR 5
 #define _QLCNIC_LINUX_MINOR 3
-#define _QLCNIC_LINUX_SUBVERSION 56
+#define _QLCNIC_LINUX_SUBVERSION 57
-#define QLCNIC_LINUX_VERSIONID  "5.3.56"
+#define QLCNIC_LINUX_VERSIONID  "5.3.57"
 #define QLCNIC_DRV_IDC_VER  0x01
 #define QLCNIC_DRIVER_VERSION  ((_QLCNIC_LINUX_MAJOR << 16) |\
                 (_QLCNIC_LINUX_MINOR << 8) | (_QLCNIC_LINUX_SUBVERSION))
@@ -169,11 +169,20 @@ struct cmd_desc_type0 {
        __le64 addr_buffer2;
-        __le16 reference_handle;
+        __le16 encap_descr;     /* 15:10 offset of outer L3 header,
+                                 * 9:6 number of 32bit words in outer L3 header,
+                                 * 5 offload outer L4 checksum,
+                                 * 4 offload outer L3 checksum,
+                                 * 3 Inner L4 type, TCP=0, UDP=1,
+                                 * 2 Inner L3 type, IPv4=0, IPv6=1,
+                                 * 1 Outer L3 type,IPv4=0, IPv6=1,
+                                 * 0 type of encapsulation, GRE=0, VXLAN=1
+                                 */
        __le16 mss;
        u8 port_ctxid;          /* 7:4 ctxid 3:0 port */
-        u8 total_hdr_length;    /* LSO only : MAC+IP+TCP Hdr size */
+        u8 hdr_length;          /* LSO only : MAC+IP+TCP Hdr size */
-        __le16 conn_id;         /* IPSec offoad only */
+        u8 outer_hdr_length;    /* Encapsulation only */
+        u8 rsvd1;
        __le64 addr_buffer3;
        __le64 addr_buffer1;
@@ -183,7 +192,9 @@ struct cmd_desc_type0 {
        __le64 addr_buffer4;
        u8 eth_addr[ETH_ALEN];
-        __le16 vlan_TCI;
+        __le16 vlan_TCI;        /* In case of  encapsulation,
+                                 * this is for outer VLAN
+                                 */
 } __attribute__ ((aligned(64)));
@@ -524,6 +535,7 @@ struct qlcnic_hardware_context {
        u8 extend_lb_time;
        u8 phys_port_id[ETH_ALEN];
        u8 lb_mode;
+        u16 vxlan_port;
 };
 struct qlcnic_adapter_stats {
@@ -538,6 +550,9 @@ struct qlcnic_adapter_stats {
        u64  txbytes;
        u64  lrobytes;
        u64  lso_frames;
+        u64  encap_lso_frames;
+        u64  encap_tx_csummed;
+        u64  encap_rx_csummed;
        u64  xmit_on;
        u64  xmit_off;
        u64  skb_alloc_failure;
@@ -899,6 +914,10 @@ struct qlcnic_mac_vlan_list {
 #define QLCNIC_FW_CAPABILITY_2_BEACON           BIT_7
 #define QLCNIC_FW_CAPABILITY_2_PER_PORT_ESWITCH_CFG     BIT_9
+#define QLCNIC_83XX_FW_CAPAB_ENCAP_RX_OFFLOAD   BIT_0
+#define QLCNIC_83XX_FW_CAPAB_ENCAP_TX_OFFLOAD   BIT_1
+#define QLCNIC_83XX_FW_CAPAB_ENCAP_CKO_OFFLOAD  BIT_4
 /* module types */
 #define LINKEVENT_MODULE_NOT_PRESENT                    1
 #define LINKEVENT_MODULE_OPTICAL_UNKNOWN                2
@@ -992,6 +1011,8 @@ struct qlcnic_ipaddr {
 #define QLCNIC_APP_CHANGED_FLAGS        0x20000
 #define QLCNIC_HAS_PHYS_PORT_ID         0x40000
 #define QLCNIC_TSS_RSS                  0x80000
+#define QLCNIC_ADD_VXLAN_PORT           0x100000
+#define QLCNIC_DEL_VXLAN_PORT           0x200000
 #define QLCNIC_IS_MSI_FAMILY(adapter) \
        ((adapter)->flags & (QLCNIC_MSI_ENABLED | QLCNIC_MSIX_ENABLED))
@@ -1806,6 +1827,18 @@ struct qlcnic_hardware_ops {
 extern struct qlcnic_nic_template qlcnic_vf_ops;
+static inline bool qlcnic_encap_tx_offload(struct qlcnic_adapter *adapter)
+{
+        return adapter->ahw->extra_capability[0] &
+               QLCNIC_83XX_FW_CAPAB_ENCAP_TX_OFFLOAD;
+}
+static inline bool qlcnic_encap_rx_offload(struct qlcnic_adapter *adapter)
+{
+        return adapter->ahw->extra_capability[0] &
+               QLCNIC_83XX_FW_CAPAB_ENCAP_RX_OFFLOAD;
+}
 static inline int qlcnic_start_firmware(struct qlcnic_adapter *adapter)
 {
        return adapter->nic_ops->start_firmware(adapter);
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
index 3b83fbde4975..b7cffb46a75d 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
@@ -77,7 +77,7 @@ static const struct qlcnic_mailbox_metadata qlcnic_83xx_mbx_tbl[] = {
        {QLCNIC_CMD_GET_PORT_CONFIG, 2, 2},
        {QLCNIC_CMD_GET_LINK_STATUS, 2, 4},
        {QLCNIC_CMD_IDC_ACK, 5, 1},
-        {QLCNIC_CMD_INIT_NIC_FUNC, 2, 1},
+        {QLCNIC_CMD_INIT_NIC_FUNC, 3, 1},
        {QLCNIC_CMD_STOP_NIC_FUNC, 2, 1},
        {QLCNIC_CMD_SET_LED_CONFIG, 5, 1},
        {QLCNIC_CMD_GET_LED_CONFIG, 1, 5},
@@ -87,6 +87,7 @@ static const struct qlcnic_mailbox_metadata qlcnic_83xx_mbx_tbl[] = {
        {QLCNIC_CMD_BC_EVENT_SETUP, 2, 1},
        {QLCNIC_CMD_DCB_QUERY_CAP, 1, 2},
        {QLCNIC_CMD_DCB_QUERY_PARAM, 1, 50},
+        {QLCNIC_CMD_SET_INGRESS_ENCAP, 2, 1},
 };
 const u32 qlcnic_83xx_ext_reg_tbl[] = {
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h
index 81c1889f6f3e..88d809c35633 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h
@@ -528,8 +528,9 @@ enum qlc_83xx_ext_regs {
 };
 /* Initialize/Stop NIC command bit definitions */
-#define QLC_REGISTER_DCB_AEN            BIT_1
 #define QLC_REGISTER_LB_IDC             BIT_0
+#define QLC_REGISTER_DCB_AEN            BIT_1
+#define QLC_83XX_MULTI_TENANCY_INFO     BIT_29
 #define QLC_INIT_FW_RESOURCES           BIT_31
 /* 83xx funcitons */
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
index 90a2dda351ec..ec399b7f5bd7 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
@@ -1020,10 +1020,97 @@ static int qlcnic_83xx_idc_check_state_validity(struct qlcnic_adapter *adapter,
        return 0;
 }
+#define QLC_83XX_ENCAP_TYPE_VXLAN       BIT_1
+#define QLC_83XX_MATCH_ENCAP_ID         BIT_2
+#define QLC_83XX_SET_VXLAN_UDP_DPORT    BIT_3
+#define QLC_83XX_VXLAN_UDP_DPORT(PORT)  ((PORT & 0xffff) << 16)
+#define QLCNIC_ENABLE_INGRESS_ENCAP_PARSING 1
+#define QLCNIC_DISABLE_INGRESS_ENCAP_PARSING 0
+static int qlcnic_set_vxlan_port(struct qlcnic_adapter *adapter)
+{
+        u16 port = adapter->ahw->vxlan_port;
+        struct qlcnic_cmd_args cmd;
+        int ret = 0;
+        memset(&cmd, 0, sizeof(cmd));
+        ret = qlcnic_alloc_mbx_args(&cmd, adapter,
+                                    QLCNIC_CMD_INIT_NIC_FUNC);
+        if (ret)
+                return ret;
+        cmd.req.arg[1] = QLC_83XX_MULTI_TENANCY_INFO;
+        cmd.req.arg[2] = QLC_83XX_ENCAP_TYPE_VXLAN |
+                         QLC_83XX_SET_VXLAN_UDP_DPORT |
+                         QLC_83XX_VXLAN_UDP_DPORT(port);
+        ret = qlcnic_issue_cmd(adapter, &cmd);
+        if (ret)
+                netdev_err(adapter->netdev,
+                           "Failed to set VXLAN port %d in adapter\n",
+                           port);
+        qlcnic_free_mbx_args(&cmd);
+        return ret;
+}
+static int qlcnic_set_vxlan_parsing(struct qlcnic_adapter *adapter,
+                                    bool state)
+{
+        u16 vxlan_port = adapter->ahw->vxlan_port;
+        struct qlcnic_cmd_args cmd;
+        int ret = 0;
+        memset(&cmd, 0, sizeof(cmd));
+        ret = qlcnic_alloc_mbx_args(&cmd, adapter,
+                                    QLCNIC_CMD_SET_INGRESS_ENCAP);
+        if (ret)
+                return ret;
+        cmd.req.arg[1] = state ? QLCNIC_ENABLE_INGRESS_ENCAP_PARSING :
+                                 QLCNIC_DISABLE_INGRESS_ENCAP_PARSING;
+        ret = qlcnic_issue_cmd(adapter, &cmd);
+        if (ret)
+                netdev_err(adapter->netdev,
+                           "Failed to %s VXLAN parsing for port %d\n",
+                           state ? "enable" : "disable", vxlan_port);
+        else
+                netdev_info(adapter->netdev,
+                            "%s VXLAN parsing for port %d\n",
+                            state ? "Enabled" : "Disabled", vxlan_port);
+        qlcnic_free_mbx_args(&cmd);
+        return ret;
+}
 static void qlcnic_83xx_periodic_tasks(struct qlcnic_adapter *adapter)
 {
+        struct qlcnic_hardware_context *ahw = adapter->ahw;
        if (adapter->fhash.fnum)
                qlcnic_prune_lb_filters(adapter);
+        if (adapter->flags & QLCNIC_ADD_VXLAN_PORT) {
+                if (qlcnic_set_vxlan_port(adapter))
+                        return;
+                if (qlcnic_set_vxlan_parsing(adapter, true))
+                        return;
+                adapter->flags &= ~QLCNIC_ADD_VXLAN_PORT;
+        } else if (adapter->flags & QLCNIC_DEL_VXLAN_PORT) {
+                if (qlcnic_set_vxlan_parsing(adapter, false))
+                        return;
+                ahw->vxlan_port = 0;
+                adapter->flags &= ~QLCNIC_DEL_VXLAN_PORT;
+        }
 }
 /**
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
index 1960609481ce..5bacf5210aed 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
@@ -47,6 +47,12 @@ static const struct qlcnic_stats qlcnic_gstrings_stats[] = {
        {"lro_pkts", QLC_SIZEOF(stats.lro_pkts), QLC_OFF(stats.lro_pkts)},
        {"lrobytes", QLC_SIZEOF(stats.lrobytes), QLC_OFF(stats.lrobytes)},
        {"lso_frames", QLC_SIZEOF(stats.lso_frames), QLC_OFF(stats.lso_frames)},
+        {"encap_lso_frames", QLC_SIZEOF(stats.encap_lso_frames),
+         QLC_OFF(stats.encap_lso_frames)},
+        {"encap_tx_csummed", QLC_SIZEOF(stats.encap_tx_csummed),
+         QLC_OFF(stats.encap_tx_csummed)},
+        {"encap_rx_csummed", QLC_SIZEOF(stats.encap_rx_csummed),
+         QLC_OFF(stats.encap_rx_csummed)},
        {"skb_alloc_failure", QLC_SIZEOF(stats.skb_alloc_failure),
         QLC_OFF(stats.skb_alloc_failure)},
        {"mac_filter_limit_overrun", QLC_SIZEOF(stats.mac_filter_limit_overrun),
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.h b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.h
index 576b301b11ef..cbe2399c30a0 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.h
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.h
@@ -98,6 +98,7 @@ enum qlcnic_regs {
 #define QLCNIC_CMD_GET_LINK_EVENT               0x48
 #define QLCNIC_CMD_CONFIGURE_MAC_RX_MODE        0x49
 #define QLCNIC_CMD_CONFIGURE_HW_LRO             0x4A
+#define QLCNIC_CMD_SET_INGRESS_ENCAP            0x4E
 #define QLCNIC_CMD_INIT_NIC_FUNC                0x60
 #define QLCNIC_CMD_STOP_NIC_FUNC                0x61
 #define QLCNIC_CMD_IDC_ACK                      0x63
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c
index 54ebf300332a..173b3d12991f 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c
@@ -13,16 +13,19 @@
 #include "qlcnic.h"
-#define TX_ETHER_PKT    0x01
+#define QLCNIC_TX_ETHER_PKT             0x01
-#define TX_TCP_PKT      0x02
+#define QLCNIC_TX_TCP_PKT               0x02
-#define TX_UDP_PKT      0x03
+#define QLCNIC_TX_UDP_PKT               0x03
-#define TX_IP_PKT       0x04
+#define QLCNIC_TX_IP_PKT                0x04
-#define TX_TCP_LSO      0x05
+#define QLCNIC_TX_TCP_LSO               0x05
-#define TX_TCP_LSO6     0x06
+#define QLCNIC_TX_TCP_LSO6              0x06
-#define TX_TCPV6_PKT    0x0b
+#define QLCNIC_TX_ENCAP_PKT             0x07
-#define TX_UDPV6_PKT    0x0c
+#define QLCNIC_TX_ENCAP_LSO             0x08
-#define FLAGS_VLAN_TAGGED       0x10
+#define QLCNIC_TX_TCPV6_PKT             0x0b
-#define FLAGS_VLAN_OOB          0x40
+#define QLCNIC_TX_UDPV6_PKT             0x0c
+#define QLCNIC_FLAGS_VLAN_TAGGED        0x10
+#define QLCNIC_FLAGS_VLAN_OOB           0x40
 #define qlcnic_set_tx_vlan_tci(cmd_desc, v)     \
        (cmd_desc)->vlan_TCI = cpu_to_le16(v);
@@ -364,6 +367,101 @@ static void qlcnic_send_filter(struct qlcnic_adapter *adapter,
        spin_unlock(&adapter->mac_learn_lock);
 }
+#define QLCNIC_ENCAP_VXLAN_PKT          BIT_0
+#define QLCNIC_ENCAP_OUTER_L3_IP6       BIT_1
+#define QLCNIC_ENCAP_INNER_L3_IP6       BIT_2
+#define QLCNIC_ENCAP_INNER_L4_UDP       BIT_3
+#define QLCNIC_ENCAP_DO_L3_CSUM         BIT_4
+#define QLCNIC_ENCAP_DO_L4_CSUM         BIT_5
+static int qlcnic_tx_encap_pkt(struct qlcnic_adapter *adapter,
+                               struct cmd_desc_type0 *first_desc,
+                               struct sk_buff *skb,
+                               struct qlcnic_host_tx_ring *tx_ring)
+{
+        u8 opcode = 0, inner_hdr_len = 0, outer_hdr_len = 0, total_hdr_len = 0;
+        int copied, copy_len, descr_size;
+        u32 producer = tx_ring->producer;
+        struct cmd_desc_type0 *hwdesc;
+        u16 flags = 0, encap_descr = 0;
+        opcode = QLCNIC_TX_ETHER_PKT;
+        encap_descr = QLCNIC_ENCAP_VXLAN_PKT;
+        if (skb_is_gso(skb)) {
+                inner_hdr_len = skb_inner_transport_header(skb) +
+                                inner_tcp_hdrlen(skb) -
+                                skb_inner_mac_header(skb);
+                /* VXLAN header size = 8 */
+                outer_hdr_len = skb_transport_offset(skb) + 8 +
+                                sizeof(struct udphdr);
+                first_desc->outer_hdr_length = outer_hdr_len;
+                total_hdr_len = inner_hdr_len + outer_hdr_len;
+                encap_descr |= QLCNIC_ENCAP_DO_L3_CSUM |
+                               QLCNIC_ENCAP_DO_L4_CSUM;
+                first_desc->mss = cpu_to_le16(skb_shinfo(skb)->gso_size);
+                first_desc->hdr_length = inner_hdr_len;
+                /* Copy inner and outer headers in Tx descriptor(s)
+                 * If total_hdr_len > cmd_desc_type0, use multiple
+                 * descriptors
+                 */
+                copied = 0;
+                descr_size = (int)sizeof(struct cmd_desc_type0);
+                while (copied < total_hdr_len) {
+                        copy_len = min(descr_size, (total_hdr_len - copied));
+                        hwdesc = &tx_ring->desc_head[producer];
+                        tx_ring->cmd_buf_arr[producer].skb = NULL;
+                        skb_copy_from_linear_data_offset(skb, copied,
+                                                         (char *)hwdesc,
+                                                         copy_len);
+                        copied += copy_len;
+                        producer = get_next_index(producer, tx_ring->num_desc);
+                }
+                tx_ring->producer = producer;
+                /* Make sure updated tx_ring->producer is visible
+                 * for qlcnic_tx_avail()
+                 */
+                smp_mb();
+                adapter->stats.encap_lso_frames++;
+                opcode = QLCNIC_TX_ENCAP_LSO;
+        } else if (skb->ip_summed == CHECKSUM_PARTIAL) {
+                if (inner_ip_hdr(skb)->version == 6) {
+                        if (inner_ipv6_hdr(skb)->nexthdr == IPPROTO_UDP)
+                                encap_descr |= QLCNIC_ENCAP_INNER_L4_UDP;
+                } else {
+                        if (inner_ip_hdr(skb)->protocol == IPPROTO_UDP)
+                                encap_descr |= QLCNIC_ENCAP_INNER_L4_UDP;
+                }
+                adapter->stats.encap_tx_csummed++;
+                opcode = QLCNIC_TX_ENCAP_PKT;
+        }
+        /* Prepare first 16 bits of byte offset 16 of Tx descriptor */
+        if (ip_hdr(skb)->version == 6)
+                encap_descr |= QLCNIC_ENCAP_OUTER_L3_IP6;
+        /* outer IP header's size in 32bit words size*/
+        encap_descr |= (skb_network_header_len(skb) >> 2) << 6;
+        /* outer IP header offset */
+        encap_descr |= skb_network_offset(skb) << 10;
+        first_desc->encap_descr = cpu_to_le16(encap_descr);
+        first_desc->tcp_hdr_offset = skb_inner_transport_header(skb) -
+                                     skb->data;
+        first_desc->ip_hdr_offset = skb_inner_network_offset(skb);
+        qlcnic_set_tx_flags_opcode(first_desc, flags, opcode);
+        return 0;
+}
 static int qlcnic_tx_pkt(struct qlcnic_adapter *adapter,
                         struct cmd_desc_type0 *first_desc, struct sk_buff *skb,
                         struct qlcnic_host_tx_ring *tx_ring)
@@ -378,11 +476,11 @@ static int qlcnic_tx_pkt(struct qlcnic_adapter *adapter,
        if (protocol == ETH_P_8021Q) {
                vh = (struct vlan_ethhdr *)skb->data;
-                flags = FLAGS_VLAN_TAGGED;
+                flags = QLCNIC_FLAGS_VLAN_TAGGED;
                vlan_tci = ntohs(vh->h_vlan_TCI);
                protocol = ntohs(vh->h_vlan_encapsulated_proto);
        } else if (vlan_tx_tag_present(skb)) {
-                flags = FLAGS_VLAN_OOB;
+                flags = QLCNIC_FLAGS_VLAN_OOB;
                vlan_tci = vlan_tx_tag_get(skb);
        }
        if (unlikely(adapter->tx_pvid)) {
@@ -391,7 +489,7 @@ static int qlcnic_tx_pkt(struct qlcnic_adapter *adapter,
                if (vlan_tci && (adapter->flags & QLCNIC_TAGGING_ENABLED))
                        goto set_flags;
-                flags = FLAGS_VLAN_OOB;
+                flags = QLCNIC_FLAGS_VLAN_OOB;
                vlan_tci = adapter->tx_pvid;
        }
 set_flags:
@@ -402,25 +500,26 @@ set_flags:
                flags |= BIT_0;
                memcpy(&first_desc->eth_addr, skb->data, ETH_ALEN);
        }
-        opcode = TX_ETHER_PKT;
+        opcode = QLCNIC_TX_ETHER_PKT;
        if (skb_is_gso(skb)) {
                hdr_len = skb_transport_offset(skb) + tcp_hdrlen(skb);
                first_desc->mss = cpu_to_le16(skb_shinfo(skb)->gso_size);
-                first_desc->total_hdr_length = hdr_len;
+                first_desc->hdr_length = hdr_len;
-                opcode = (protocol == ETH_P_IPV6) ? TX_TCP_LSO6 : TX_TCP_LSO;
+                opcode = (protocol == ETH_P_IPV6) ? QLCNIC_TX_TCP_LSO6 :
+                                                    QLCNIC_TX_TCP_LSO;
                /* For LSO, we need to copy the MAC/IP/TCP headers into
                * the descriptor ring */
                copied = 0;
                offset = 2;
-                if (flags & FLAGS_VLAN_OOB) {
+                if (flags & QLCNIC_FLAGS_VLAN_OOB) {
-                        first_desc->total_hdr_length += VLAN_HLEN;
+                        first_desc->hdr_length += VLAN_HLEN;
                        first_desc->tcp_hdr_offset = VLAN_HLEN;
                        first_desc->ip_hdr_offset = VLAN_HLEN;
                        /* Only in case of TSO on vlan device */
-                        flags |= FLAGS_VLAN_TAGGED;
+                        flags |= QLCNIC_FLAGS_VLAN_TAGGED;
                        /* Create a TSO vlan header template for firmware */
                        hwdesc = &tx_ring->desc_head[producer];
@@ -464,16 +563,16 @@ set_flags:
                        l4proto = ip_hdr(skb)->protocol;
                        if (l4proto == IPPROTO_TCP)
-                                opcode = TX_TCP_PKT;
+                                opcode = QLCNIC_TX_TCP_PKT;
                        else if (l4proto == IPPROTO_UDP)
-                                opcode = TX_UDP_PKT;
+                                opcode = QLCNIC_TX_UDP_PKT;
                } else if (protocol == ETH_P_IPV6) {
                        l4proto = ipv6_hdr(skb)->nexthdr;
                        if (l4proto == IPPROTO_TCP)
-                                opcode = TX_TCPV6_PKT;
+                                opcode = QLCNIC_TX_TCPV6_PKT;
                        else if (l4proto == IPPROTO_UDP)
-                                opcode = TX_UDPV6_PKT;
+                                opcode = QLCNIC_TX_UDPV6_PKT;
                }
        }
        first_desc->tcp_hdr_offset += skb_transport_offset(skb);
@@ -563,6 +662,8 @@ netdev_tx_t qlcnic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
        struct ethhdr *phdr;
        int i, k, frag_count, delta = 0;
        u32 producer, num_txd;
+        u16 protocol;
+        bool l4_is_udp = false;
        if (!test_bit(__QLCNIC_DEV_UP, &adapter->state)) {
                netif_tx_stop_all_queues(netdev);
@@ -653,8 +754,23 @@ netdev_tx_t qlcnic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
        tx_ring->producer = get_next_index(producer, num_txd);
        smp_mb();
-        if (unlikely(qlcnic_tx_pkt(adapter, first_desc, skb, tx_ring)))
+        protocol = ntohs(skb->protocol);
-                goto unwind_buff;
+        if (protocol == ETH_P_IP)
+                l4_is_udp = ip_hdr(skb)->protocol == IPPROTO_UDP;
+        else if (protocol == ETH_P_IPV6)
+                l4_is_udp = ipv6_hdr(skb)->nexthdr == IPPROTO_UDP;
+        /* Check if it is a VXLAN packet */
+        if (!skb->encapsulation || !l4_is_udp ||
+            !qlcnic_encap_tx_offload(adapter)) {
+                if (unlikely(qlcnic_tx_pkt(adapter, first_desc, skb,
+                                           tx_ring)))
+                        goto unwind_buff;
+        } else {
+                if (unlikely(qlcnic_tx_encap_pkt(adapter, first_desc,
+                                                 skb, tx_ring)))
+                        goto unwind_buff;
+        }
        if (adapter->drv_mac_learn)
                qlcnic_send_filter(adapter, first_desc, skb);
@@ -1587,6 +1703,13 @@ static inline int qlcnic_83xx_is_lb_pkt(u64 sts_data, int lro_pkt)
                return (sts_data & QLC_83XX_NORMAL_LB_PKT) ? 1 : 0;
 }
+#define QLCNIC_ENCAP_LENGTH_MASK        0x7f
+static inline u8 qlcnic_encap_length(u64 sts_data)
+{
+        return sts_data & QLCNIC_ENCAP_LENGTH_MASK;
+}
 static struct qlcnic_rx_buffer *
 qlcnic_83xx_process_rcv(struct qlcnic_adapter *adapter,
                        struct qlcnic_host_sds_ring *sds_ring,
@@ -1637,6 +1760,12 @@ qlcnic_83xx_process_rcv(struct qlcnic_adapter *adapter,
        skb->protocol = eth_type_trans(skb, netdev);
+        if (qlcnic_encap_length(sts_data[1]) &&
+            skb->ip_summed == CHECKSUM_UNNECESSARY) {
+                skb->encapsulation = 1;
+                adapter->stats.encap_rx_csummed++;
+        }
        if (vid != 0xffff)
                __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), vid);
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
index 4b92d9d90267..79be451a3ffc 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
@@ -21,6 +21,7 @@
 #include <linux/aer.h>
 #include <linux/log2.h>
 #include <linux/pci.h>
+#include <net/vxlan.h>
 MODULE_DESCRIPTION("QLogic 1/10 GbE Converged/Intelligent Ethernet Driver");
 MODULE_LICENSE("GPL");
@@ -461,6 +462,35 @@ static int qlcnic_get_phys_port_id(struct net_device *netdev,
        return 0;
 }
+static void qlcnic_add_vxlan_port(struct net_device *netdev,
+                                  sa_family_t sa_family, __be16 port)
+{
+        struct qlcnic_adapter *adapter = netdev_priv(netdev);
+        struct qlcnic_hardware_context *ahw = adapter->ahw;
+        /* Adapter supports only one VXLAN port. Use very first port
+         * for enabling offload
+         */
+        if (!qlcnic_encap_rx_offload(adapter) || ahw->vxlan_port)
+                return;
+        ahw->vxlan_port = ntohs(port);
+        adapter->flags |= QLCNIC_ADD_VXLAN_PORT;
+}
+static void qlcnic_del_vxlan_port(struct net_device *netdev,
+                                  sa_family_t sa_family, __be16 port)
+{
+        struct qlcnic_adapter *adapter = netdev_priv(netdev);
+        struct qlcnic_hardware_context *ahw = adapter->ahw;
+        if (!qlcnic_encap_rx_offload(adapter) || !ahw->vxlan_port ||
+            (ahw->vxlan_port != ntohs(port)))
+                return;
+        adapter->flags |= QLCNIC_DEL_VXLAN_PORT;
+}
 static const struct net_device_ops qlcnic_netdev_ops = {
        .ndo_open          = qlcnic_open,
        .ndo_stop          = qlcnic_close,
@@ -479,6 +509,8 @@ static const struct net_device_ops qlcnic_netdev_ops = {
        .ndo_fdb_del            = qlcnic_fdb_del,
        .ndo_fdb_dump           = qlcnic_fdb_dump,
        .ndo_get_phys_port_id   = qlcnic_get_phys_port_id,
+        .ndo_add_vxlan_port     = qlcnic_add_vxlan_port,
+        .ndo_del_vxlan_port     = qlcnic_del_vxlan_port,
 #ifdef CONFIG_NET_POLL_CONTROLLER
        .ndo_poll_controller = qlcnic_poll_controller,
 #endif
@@ -1943,6 +1975,9 @@ qlcnic_attach(struct qlcnic_adapter *adapter)
        qlcnic_create_sysfs_entries(adapter);
+        if (qlcnic_encap_rx_offload(adapter))
+                vxlan_get_rx_port(netdev);
        adapter->is_up = QLCNIC_ADAPTER_UP_MAGIC;
        return 0;
@@ -2205,6 +2240,19 @@ qlcnic_setup_netdev(struct qlcnic_adapter *adapter, struct net_device *netdev,
        if (adapter->ahw->capabilities & QLCNIC_FW_CAPABILITY_HW_LRO)
                netdev->features |= NETIF_F_LRO;
+        if (qlcnic_encap_tx_offload(adapter)) {
+                netdev->features |= NETIF_F_GSO_UDP_TUNNEL;
+                /* encapsulation Tx offload supported by Adapter */
+                netdev->hw_enc_features = NETIF_F_IP_CSUM        |
+                                          NETIF_F_GSO_UDP_TUNNEL |
+                                          NETIF_F_TSO            |
+                                          NETIF_F_TSO6;
+        }
+        if (qlcnic_encap_rx_offload(adapter))
+                netdev->hw_enc_features |= NETIF_F_RXCSUM;
        netdev->hw_features = netdev->features;
        netdev->priv_flags |= IFF_UNICAST_FLT;
        netdev->irq = adapter->msix_entries[0].vector;
diff --git a/drivers/net/ethernet/sfc/ptp.c b/drivers/net/ethernet/sfc/ptp.c
index 722344fcd155..6b861e3de4b0 100644
--- a/drivers/net/ethernet/sfc/ptp.c
+++ b/drivers/net/ethernet/sfc/ptp.c
@@ -1194,6 +1194,7 @@ static const struct ptp_clock_info efx_phc_clock_info = {
        .n_alarm        = 0,
        .n_ext_ts       = 0,
        .n_per_out      = 0,
+        .n_pins         = 0,
        .pps            = 1,
        .adjfreq        = efx_phc_adjfreq,
        .adjtime        = efx_phc_adjtime,
diff --git a/drivers/net/ethernet/silan/sc92031.c b/drivers/net/ethernet/silan/sc92031.c
index 5eb933c97bba..7daa7d433099 100644
--- a/drivers/net/ethernet/silan/sc92031.c
+++ b/drivers/net/ethernet/silan/sc92031.c
@@ -987,7 +987,7 @@ out_unlock:
        spin_unlock(&priv->lock);
 out:
-        dev_kfree_skb(skb);
+        dev_consume_skb_any(skb);
        return NETDEV_TX_OK;
 }
diff --git a/drivers/net/ethernet/sis/sis900.c b/drivers/net/ethernet/sis/sis900.c
index ff57a46388ee..6072f093e6b4 100644
--- a/drivers/net/ethernet/sis/sis900.c
+++ b/drivers/net/ethernet/sis/sis900.c
@@ -1614,7 +1614,7 @@ sis900_start_xmit(struct sk_buff *skb, struct net_device *net_dev)
                skb->data, skb->len, PCI_DMA_TODEVICE);
        if (unlikely(pci_dma_mapping_error(sis_priv->pci_dev,
                sis_priv->tx_ring[entry].bufptr))) {
-                        dev_kfree_skb(skb);
+                        dev_kfree_skb_any(skb);
                        sis_priv->tx_skbuff[entry] = NULL;
                        net_dev->stats.tx_dropped++;
                        spin_unlock_irqrestore(&sis_priv->lock, flags);
diff --git a/drivers/net/ethernet/smsc/smc911x.c b/drivers/net/ethernet/smsc/smc911x.c
index c50fb08c9905..66b05e62f70a 100644
--- a/drivers/net/ethernet/smsc/smc911x.c
+++ b/drivers/net/ethernet/smsc/smc911x.c
@@ -551,7 +551,7 @@ static int smc911x_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
                dev->stats.tx_errors++;
                dev->stats.tx_dropped++;
                spin_unlock_irqrestore(&lp->lock, flags);
-                dev_kfree_skb(skb);
+                dev_kfree_skb_any(skb);
                return NETDEV_TX_OK;
        }
diff --git a/drivers/net/ethernet/smsc/smc91x.c b/drivers/net/ethernet/smsc/smc91x.c
index 839c0e6cca01..d1b4dca53a9d 100644
--- a/drivers/net/ethernet/smsc/smc91x.c
+++ b/drivers/net/ethernet/smsc/smc91x.c
@@ -621,7 +621,7 @@ static void smc_hardware_send_pkt(unsigned long data)
 done:   if (!THROTTLE_TX_PKTS)
                netif_wake_queue(dev);
-        dev_kfree_skb(skb);
+        dev_consume_skb_any(skb);
 }
 /*
@@ -657,7 +657,7 @@ static int smc_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
                netdev_warn(dev, "Far too big packet error.\n");
                dev->stats.tx_errors++;
                dev->stats.tx_dropped++;
-                dev_kfree_skb(skb);
+                dev_kfree_skb_any(skb);
                return NETDEV_TX_OK;
        }
diff --git a/drivers/net/ethernet/smsc/smsc911x.c b/drivers/net/ethernet/smsc/smsc911x.c
index 95e2b9a20d40..ed36ff48af57 100644
--- a/drivers/net/ethernet/smsc/smsc911x.c
+++ b/drivers/net/ethernet/smsc/smsc911x.c
@@ -1672,7 +1672,7 @@ static int smsc911x_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
        pdata->ops->tx_writefifo(pdata, (unsigned int *)bufp, wrsz);
        freespace -= (skb->len + 32);
        skb_tx_timestamp(skb);
-        dev_kfree_skb(skb);
+        dev_consume_skb_any(skb);
        if (unlikely(smsc911x_tx_get_txstatcount(pdata) >= 30))
                smsc911x_tx_update_txcounters(dev);
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 8543e1cfd55e..d940034acdd4 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -1303,7 +1303,7 @@ static void stmmac_tx_clean(struct stmmac_priv *priv)
                priv->hw->mode->clean_desc3(priv, p);
                if (likely(skb != NULL)) {
-                        dev_kfree_skb(skb);
+                        dev_consume_skb_any(skb);
                        priv->tx_skbuff[entry] = NULL;
                }
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c
index 7680581ebe12..b7ad3565566c 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c
@@ -164,6 +164,7 @@ static struct ptp_clock_info stmmac_ptp_clock_ops = {
        .n_alarm = 0,
        .n_ext_ts = 0,
        .n_per_out = 0,
+        .n_pins = 0,
        .pps = 0,
        .adjfreq = stmmac_adjust_freq,
        .adjtime = stmmac_adjust_time,
diff --git a/drivers/net/ethernet/sun/sungem.c b/drivers/net/ethernet/sun/sungem.c
index c2799dc46325..102a66fc54a2 100644
--- a/drivers/net/ethernet/sun/sungem.c
+++ b/drivers/net/ethernet/sun/sungem.c
@@ -688,7 +688,7 @@ static __inline__ void gem_tx(struct net_device *dev, struct gem *gp, u32 gem_st
                }
                dev->stats.tx_packets++;
-                dev_kfree_skb(skb);
+                dev_consume_skb_any(skb);
        }
        gp->tx_old = entry;
diff --git a/drivers/net/ethernet/ti/cpts.c b/drivers/net/ethernet/ti/cpts.c
index 8c351f100aca..372cb192c5aa 100644
--- a/drivers/net/ethernet/ti/cpts.c
+++ b/drivers/net/ethernet/ti/cpts.c
@@ -217,6 +217,7 @@ static struct ptp_clock_info cpts_info = {
        .name           = "CTPS timer",
        .max_adj        = 1000000,
        .n_ext_ts       = 0,
+        .n_pins         = 0,
        .pps            = 0,
        .adjfreq        = cpts_ptp_adjfreq,
        .adjtime        = cpts_ptp_adjtime,
diff --git a/drivers/net/ethernet/tile/tilegx.c b/drivers/net/ethernet/tile/tilegx.c
index b43f1b3b9632..7e1c91d41a87 100644
--- a/drivers/net/ethernet/tile/tilegx.c
+++ b/drivers/net/ethernet/tile/tilegx.c
@@ -873,6 +873,7 @@ static struct ptp_clock_info ptp_mpipe_caps = {
        .name           = "mPIPE clock",
        .max_adj        = 999999999,
        .n_ext_ts       = 0,
+        .n_pins         = 0,
        .pps            = 0,
        .adjfreq        = ptp_mpipe_adjfreq,
        .adjtime        = ptp_mpipe_adjtime,
diff --git a/drivers/net/ethernet/tile/tilepro.c b/drivers/net/ethernet/tile/tilepro.c
index b94449b4bd34..e5a5c5d4ce0c 100644
--- a/drivers/net/ethernet/tile/tilepro.c
+++ b/drivers/net/ethernet/tile/tilepro.c
@@ -1824,7 +1824,7 @@ busy:
        /* Handle completions. */
        for (i = 0; i < nolds; i++)
-                kfree_skb(olds[i]);
+                dev_consume_skb_any(olds[i]);
        /* Update stats. */
        u64_stats_update_begin(&stats->syncp);
@@ -2008,7 +2008,7 @@ busy:
        /* Handle completions. */
        for (i = 0; i < nolds; i++)
-                kfree_skb(olds[i]);
+                dev_consume_skb_any(olds[i]);
        /* HACK: Track "expanded" size for short packets (e.g. 42 < 60). */
        u64_stats_update_begin(&stats->syncp);
diff --git a/drivers/net/ethernet/toshiba/spider_net.c b/drivers/net/ethernet/toshiba/spider_net.c
index 3f4a32e39d27..0282d0161859 100644
--- a/drivers/net/ethernet/toshiba/spider_net.c
+++ b/drivers/net/ethernet/toshiba/spider_net.c
@@ -860,7 +860,7 @@ spider_net_release_tx_chain(struct spider_net_card *card, int brutal)
                if (skb) {
                        pci_unmap_single(card->pdev, buf_addr, skb->len,
                                        PCI_DMA_TODEVICE);
-                        dev_kfree_skb(skb);
+                        dev_consume_skb_any(skb);
                }
        }
        return 0;
diff --git a/drivers/net/ethernet/via/via-rhine.c b/drivers/net/ethernet/via/via-rhine.c
index 9d93fa120578..ce2e4d14ab31 100644
--- a/drivers/net/ethernet/via/via-rhine.c
+++ b/drivers/net/ethernet/via/via-rhine.c
@@ -1676,7 +1676,7 @@ static netdev_tx_t rhine_start_tx(struct sk_buff *skb,
                /* Must use alignment buffer. */
                if (skb->len > PKT_BUF_SZ) {
                        /* packet too long, drop it */
-                        dev_kfree_skb(skb);
+                        dev_kfree_skb_any(skb);
                        rp->tx_skbuff[entry] = NULL;
                        dev->stats.tx_dropped++;
                        return NETDEV_TX_OK;
@@ -1696,7 +1696,7 @@ static netdev_tx_t rhine_start_tx(struct sk_buff *skb,
                        pci_map_single(rp->pdev, skb->data, skb->len,
                                       PCI_DMA_TODEVICE);
                if (dma_mapping_error(&rp->pdev->dev, rp->tx_skbuff_dma[entry])) {
-                        dev_kfree_skb(skb);
+                        dev_kfree_skb_any(skb);
                        rp->tx_skbuff_dma[entry] = 0;
                        dev->stats.tx_dropped++;
                        return NETDEV_TX_OK;
@@ -1834,7 +1834,7 @@ static void rhine_tx(struct net_device *dev)
                                         rp->tx_skbuff[entry]->len,
                                         PCI_DMA_TODEVICE);
                }
-                dev_kfree_skb(rp->tx_skbuff[entry]);
+                dev_consume_skb_any(rp->tx_skbuff[entry]);
                rp->tx_skbuff[entry] = NULL;
                entry = (++rp->dirty_tx) % TX_RING_SIZE;
        }
diff --git a/drivers/net/ethernet/via/via-velocity.c b/drivers/net/ethernet/via/via-velocity.c
index ad61d26a44f3..de08e86db209 100644
--- a/drivers/net/ethernet/via/via-velocity.c
+++ b/drivers/net/ethernet/via/via-velocity.c
@@ -2565,7 +2565,7 @@ static netdev_tx_t velocity_xmit(struct sk_buff *skb,
        /* The hardware can handle at most 7 memory segments, so merge
         * the skb if there are more */
        if (skb_shinfo(skb)->nr_frags > 6 && __skb_linearize(skb)) {
-                kfree_skb(skb);
+                dev_kfree_skb_any(skb);
                return NETDEV_TX_OK;
        }
diff --git a/drivers/net/ethernet/xilinx/xilinx_emaclite.c b/drivers/net/ethernet/xilinx/xilinx_emaclite.c
index 36052b98b3fc..58756617644f 100644
--- a/drivers/net/ethernet/xilinx/xilinx_emaclite.c
+++ b/drivers/net/ethernet/xilinx/xilinx_emaclite.c
@@ -1037,7 +1037,7 @@ static int xemaclite_send(struct sk_buff *orig_skb, struct net_device *dev)
        skb_tx_timestamp(new_skb);
        dev->stats.tx_bytes += len;
-        dev_kfree_skb(new_skb);
+        dev_consume_skb_any(new_skb);
        return 0;
 }
diff --git a/drivers/net/phy/dp83640.c b/drivers/net/phy/dp83640.c
index 98e7cbf720a5..352c5e45fe9c 100644
--- a/drivers/net/phy/dp83640.c
+++ b/drivers/net/phy/dp83640.c
@@ -47,6 +47,7 @@
 #define CAL_EVENT       7
 #define CAL_TRIGGER     7
 #define PER_TRIGGER     6
+#define DP83640_N_PINS  12
 #define MII_DP83640_MICR 0x11
 #define MII_DP83640_MISR 0x12
@@ -173,6 +174,37 @@ MODULE_PARM_DESC(chosen_phy, \
 MODULE_PARM_DESC(gpio_tab, \
        "Which GPIO line to use for which purpose: cal,perout,extts1,...,extts6");
+static void dp83640_gpio_defaults(struct ptp_pin_desc *pd)
+{
+        int i, index;
+        for (i = 0; i < DP83640_N_PINS; i++) {
+                snprintf(pd[i].name, sizeof(pd[i].name), "GPIO%d", 1 + i);
+                pd[i].index = i;
+        }
+        for (i = 0; i < GPIO_TABLE_SIZE; i++) {
+                if (gpio_tab[i] < 1 || gpio_tab[i] > DP83640_N_PINS) {
+                        pr_err("gpio_tab[%d]=%hu out of range", i, gpio_tab[i]);
+                        return;
+                }
+        }
+        index = gpio_tab[CALIBRATE_GPIO] - 1;
+        pd[index].func = PTP_PF_PHYSYNC;
+        pd[index].chan = 0;
+        index = gpio_tab[PEROUT_GPIO] - 1;
+        pd[index].func = PTP_PF_PEROUT;
+        pd[index].chan = 0;
+        for (i = EXTTS0_GPIO; i < GPIO_TABLE_SIZE; i++) {
+                index = gpio_tab[i] - 1;
+                pd[index].func = PTP_PF_EXTTS;
+                pd[index].chan = i - EXTTS0_GPIO;
+        }
+}
 /* a list of clocks and a mutex to protect it */
 static LIST_HEAD(phyter_clocks);
 static DEFINE_MUTEX(phyter_clocks_lock);
@@ -266,15 +298,22 @@ static u64 phy2txts(struct phy_txts *p)
        return ns;
 }
-static void periodic_output(struct dp83640_clock *clock,
+static int periodic_output(struct dp83640_clock *clock,
-                            struct ptp_clock_request *clkreq, bool on)
+                           struct ptp_clock_request *clkreq, bool on)
 {
        struct dp83640_private *dp83640 = clock->chosen;
        struct phy_device *phydev = dp83640->phydev;
-        u32 sec, nsec, period;
+        u32 sec, nsec, pwidth;
        u16 gpio, ptp_trig, trigger, val;
-        gpio = on ? gpio_tab[PEROUT_GPIO] : 0;
+        if (on) {
+                gpio = 1 + ptp_find_pin(clock->ptp_clock, PTP_PF_PEROUT, 0);
+                if (gpio < 1)
+                        return -EINVAL;
+        } else {
+                gpio = 0;
+        }
        trigger = PER_TRIGGER;
        ptp_trig = TRIG_WR |
@@ -291,13 +330,14 @@ static void periodic_output(struct dp83640_clock *clock,
                ext_write(0, phydev, PAGE5, PTP_TRIG, ptp_trig);
                ext_write(0, phydev, PAGE4, PTP_CTL, val);
                mutex_unlock(&clock->extreg_lock);
-                return;
+                return 0;
        }
        sec = clkreq->perout.start.sec;
        nsec = clkreq->perout.start.nsec;
-        period = clkreq->perout.period.sec * 1000000000UL;
+        pwidth = clkreq->perout.period.sec * 1000000000UL;
-        period += clkreq->perout.period.nsec;
+        pwidth += clkreq->perout.period.nsec;
+        pwidth /= 2;
        mutex_lock(&clock->extreg_lock);
@@ -310,8 +350,8 @@ static void periodic_output(struct dp83640_clock *clock,
        ext_write(0, phydev, PAGE4, PTP_TDR, nsec >> 16);      /* ns[31:16] */
        ext_write(0, phydev, PAGE4, PTP_TDR, sec & 0xffff);    /* sec[15:0] */
        ext_write(0, phydev, PAGE4, PTP_TDR, sec >> 16);       /* sec[31:16] */
-        ext_write(0, phydev, PAGE4, PTP_TDR, period & 0xffff); /* ns[15:0] */
+        ext_write(0, phydev, PAGE4, PTP_TDR, pwidth & 0xffff); /* ns[15:0] */
-        ext_write(0, phydev, PAGE4, PTP_TDR, period >> 16);    /* ns[31:16] */
+        ext_write(0, phydev, PAGE4, PTP_TDR, pwidth >> 16);    /* ns[31:16] */
        /*enable trigger*/
        val &= ~TRIG_LOAD;
@@ -319,6 +359,7 @@ static void periodic_output(struct dp83640_clock *clock,
        ext_write(0, phydev, PAGE4, PTP_CTL, val);
        mutex_unlock(&clock->extreg_lock);
+        return 0;
 }
 /* ptp clock methods */
@@ -424,18 +465,21 @@ static int ptp_dp83640_enable(struct ptp_clock_info *ptp,
        struct dp83640_clock *clock =
                container_of(ptp, struct dp83640_clock, caps);
        struct phy_device *phydev = clock->chosen->phydev;
-        int index;
+        unsigned int index;
        u16 evnt, event_num, gpio_num;
        switch (rq->type) {
        case PTP_CLK_REQ_EXTTS:
                index = rq->extts.index;
-                if (index < 0 || index >= N_EXT_TS)
+                if (index >= N_EXT_TS)
                        return -EINVAL;
                event_num = EXT_EVENT + index;
                evnt = EVNT_WR | (event_num & EVNT_SEL_MASK) << EVNT_SEL_SHIFT;
                if (on) {
-                        gpio_num = gpio_tab[EXTTS0_GPIO + index];
+                        gpio_num = 1 + ptp_find_pin(clock->ptp_clock,
+                                                    PTP_PF_EXTTS, index);
+                        if (gpio_num < 1)
+                                return -EINVAL;
                        evnt |= (gpio_num & EVNT_GPIO_MASK) << EVNT_GPIO_SHIFT;
                        if (rq->extts.flags & PTP_FALLING_EDGE)
                                evnt |= EVNT_FALL;
@@ -448,8 +492,7 @@ static int ptp_dp83640_enable(struct ptp_clock_info *ptp,
        case PTP_CLK_REQ_PEROUT:
                if (rq->perout.index != 0)
                        return -EINVAL;
-                periodic_output(clock, rq, on);
+                return periodic_output(clock, rq, on);
-                return 0;
        default:
                break;
@@ -458,6 +501,12 @@ static int ptp_dp83640_enable(struct ptp_clock_info *ptp,
        return -EOPNOTSUPP;
 }
+static int ptp_dp83640_verify(struct ptp_clock_info *ptp, unsigned int pin,
+                              enum ptp_pin_function func, unsigned int chan)
+{
+        return 0;
+}
 static u8 status_frame_dst[6] = { 0x01, 0x1B, 0x19, 0x00, 0x00, 0x00 };
 static u8 status_frame_src[6] = { 0x08, 0x00, 0x17, 0x0B, 0x6B, 0x0F };
@@ -875,6 +924,7 @@ static void dp83640_free_clocks(void)
                mutex_destroy(&clock->extreg_lock);
                mutex_destroy(&clock->clock_lock);
                put_device(&clock->bus->dev);
+                kfree(clock->caps.pin_config);
                kfree(clock);
        }
@@ -894,12 +944,18 @@ static void dp83640_clock_init(struct dp83640_clock *clock, struct mii_bus *bus)
        clock->caps.n_alarm     = 0;
        clock->caps.n_ext_ts    = N_EXT_TS;
        clock->caps.n_per_out   = 1;
+        clock->caps.n_pins      = DP83640_N_PINS;
        clock->caps.pps         = 0;
        clock->caps.adjfreq     = ptp_dp83640_adjfreq;
        clock->caps.adjtime     = ptp_dp83640_adjtime;
        clock->caps.gettime     = ptp_dp83640_gettime;
        clock->caps.settime     = ptp_dp83640_settime;
        clock->caps.enable      = ptp_dp83640_enable;
+        clock->caps.verify      = ptp_dp83640_verify;
+        /*
+         * Convert the module param defaults into a dynamic pin configuration.
+         */
+        dp83640_gpio_defaults(clock->caps.pin_config);
        /*
         * Get a reference to this bus instance.
         */
@@ -950,6 +1006,13 @@ static struct dp83640_clock *dp83640_clock_get_bus(struct mii_bus *bus)
        if (!clock)
                goto out;
+        clock->caps.pin_config = kzalloc(sizeof(struct ptp_pin_desc) *
+                                         DP83640_N_PINS, GFP_KERNEL);
+        if (!clock->caps.pin_config) {
+                kfree(clock);
+                clock = NULL;
+                goto out;
+        }
        dp83640_clock_init(clock, bus);
        list_add_tail(&phyter_clocks, &clock->list);
 out:
@@ -1363,7 +1426,7 @@ static void __exit dp83640_exit(void)
 }
 MODULE_DESCRIPTION("National Semiconductor DP83640 PHY driver");
-MODULE_AUTHOR("Richard Cochran <richardcochran@gmail.at>");
+MODULE_AUTHOR("Richard Cochran <richardcochran@gmail.com>");
 MODULE_LICENSE("GPL");
 module_init(dp83640_init);
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 80d84c446962..99fa48c941c6 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -883,7 +883,7 @@ static netdev_tx_t start_xmit(struct sk_buff *skb, struct net_device *dev)
                        dev_warn(&dev->dev,
                                 "Unexpected TXQ (%d) queue failure: %d\n", qnum, err);
                dev->stats.tx_dropped++;
-                kfree_skb(skb);
+                dev_kfree_skb_any(skb);
                return NETDEV_TX_OK;
        }
diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c
index 28965adfeebd..97394345e5dd 100644
--- a/drivers/net/vmxnet3/vmxnet3_drv.c
+++ b/drivers/net/vmxnet3/vmxnet3_drv.c
@@ -1078,7 +1078,7 @@ unlock_drop_pkt:
        spin_unlock_irqrestore(&tq->tx_lock, flags);
 drop_pkt:
        tq->stats.drop_total++;
-        dev_kfree_skb(skb);
+        dev_kfree_skb_any(skb);
        return NETDEV_TX_OK;
 }
diff --git a/drivers/net/xen-netback/common.h b/drivers/net/xen-netback/common.h
index bef37be402b8..0355f8767e3b 100644
--- a/drivers/net/xen-netback/common.h
+++ b/drivers/net/xen-netback/common.h
@@ -137,8 +137,6 @@ struct xenvif {
        u16 dealloc_ring[MAX_PENDING_REQS];
        struct task_struct *dealloc_task;
        wait_queue_head_t dealloc_wq;
-        struct timer_list dealloc_delay;
-        bool dealloc_delay_timed_out;
        /* Use kthread for guest RX */
        struct task_struct *task;
diff --git a/drivers/net/xen-netback/interface.c b/drivers/net/xen-netback/interface.c
index a6a8c1579eb9..23bb2f4b18fe 100644
--- a/drivers/net/xen-netback/interface.c
+++ b/drivers/net/xen-netback/interface.c
@@ -407,7 +407,6 @@ struct xenvif *xenvif_alloc(struct device *parent, domid_t domid,
                          .desc = i };
                vif->grant_tx_handle[i] = NETBACK_INVALID_HANDLE;
        }
-        init_timer(&vif->dealloc_delay);
        /*
         * Initialise a dummy MAC address. We choose the numerically
@@ -556,7 +555,6 @@ void xenvif_disconnect(struct xenvif *vif)
        }
        if (vif->dealloc_task) {
-                del_timer_sync(&vif->dealloc_delay);
                kthread_stop(vif->dealloc_task);
                vif->dealloc_task = NULL;
        }
diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c
index 5a8c4a43c522..1e4628724778 100644
--- a/drivers/net/xen-netback/netback.c
+++ b/drivers/net/xen-netback/netback.c
@@ -133,11 +133,6 @@ static inline pending_ring_idx_t pending_index(unsigned i)
        return i & (MAX_PENDING_REQS-1);
 }
-static inline pending_ring_idx_t nr_free_slots(struct xen_netif_tx_back_ring *ring)
-{
-        return ring->nr_ents -  (ring->sring->req_prod - ring->rsp_prod_pvt);
-}
 bool xenvif_rx_ring_slots_available(struct xenvif *vif, int needed)
 {
        RING_IDX prod, cons;
@@ -1574,7 +1569,7 @@ static inline void xenvif_tx_dealloc_action(struct xenvif *vif)
                                        vif->pages_to_unmap,
                                        gop - vif->tx_unmap_ops);
                if (ret) {
-                        netdev_err(vif->dev, "Unmap fail: nr_ops %x ret %d\n",
+                        netdev_err(vif->dev, "Unmap fail: nr_ops %tx ret %d\n",
                                   gop - vif->tx_unmap_ops, ret);
                        for (i = 0; i < gop - vif->tx_unmap_ops; ++i) {
                                if (gop[i].status != GNTST_okay)
@@ -1718,36 +1713,9 @@ static inline int tx_work_todo(struct xenvif *vif)
        return 0;
 }
-static void xenvif_dealloc_delay(unsigned long data)
-{
-        struct xenvif *vif = (struct xenvif *)data;
-        vif->dealloc_delay_timed_out = true;
-        wake_up(&vif->dealloc_wq);
-}
 static inline bool tx_dealloc_work_todo(struct xenvif *vif)
 {
-        if (vif->dealloc_cons != vif->dealloc_prod) {
+        return vif->dealloc_cons != vif->dealloc_prod;
-                if ((nr_free_slots(&vif->tx) > 2 * XEN_NETBK_LEGACY_SLOTS_MAX) &&
-                    (vif->dealloc_prod - vif->dealloc_cons < MAX_PENDING_REQS / 4) &&
-                    !vif->dealloc_delay_timed_out) {
-                        if (!timer_pending(&vif->dealloc_delay)) {
-                                vif->dealloc_delay.function =
-                                        xenvif_dealloc_delay;
-                                vif->dealloc_delay.data = (unsigned long)vif;
-                                mod_timer(&vif->dealloc_delay,
-                                          jiffies + msecs_to_jiffies(1));
-                        }
-                        return false;
-                }
-                del_timer_sync(&vif->dealloc_delay);
-                vif->dealloc_delay_timed_out = false;
-                return true;
-        }
-        return false;
 }
 void xenvif_unmap_frontend_rings(struct xenvif *vif)
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index 49f3b3dbbed8..057b05700f8b 100644
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -658,7 +658,7 @@ static int xennet_start_xmit(struct sk_buff *skb, struct net_device *dev)
 drop:
        dev->stats.tx_dropped++;
-        dev_kfree_skb(skb);
+        dev_kfree_skb_any(skb);
        return NETDEV_TX_OK;
 }
diff --git a/drivers/ptp/ptp_chardev.c b/drivers/ptp/ptp_chardev.c
index 34a0c607318e..419056d7887e 100644
--- a/drivers/ptp/ptp_chardev.c
+++ b/drivers/ptp/ptp_chardev.c
@@ -25,6 +25,96 @@
 #include "ptp_private.h"
+static int ptp_disable_pinfunc(struct ptp_clock_info *ops,
+                               enum ptp_pin_function func, unsigned int chan)
+{
+        struct ptp_clock_request rq;
+        int err = 0;
+        memset(&rq, 0, sizeof(rq));
+        switch (func) {
+        case PTP_PF_NONE:
+                break;
+        case PTP_PF_EXTTS:
+                rq.type = PTP_CLK_REQ_EXTTS;
+                rq.extts.index = chan;
+                err = ops->enable(ops, &rq, 0);
+                break;
+        case PTP_PF_PEROUT:
+                rq.type = PTP_CLK_REQ_PEROUT;
+                rq.perout.index = chan;
+                err = ops->enable(ops, &rq, 0);
+                break;
+        case PTP_PF_PHYSYNC:
+                break;
+        default:
+                return -EINVAL;
+        }
+        return err;
+}
+int ptp_set_pinfunc(struct ptp_clock *ptp, unsigned int pin,
+                    enum ptp_pin_function func, unsigned int chan)
+{
+        struct ptp_clock_info *info = ptp->info;
+        struct ptp_pin_desc *pin1 = NULL, *pin2 = &info->pin_config[pin];
+        unsigned int i;
+        /* Check to see if any other pin previously had this function. */
+        for (i = 0; i < info->n_pins; i++) {
+                if (info->pin_config[i].func == func &&
+                    info->pin_config[i].chan == chan) {
+                        pin1 = &info->pin_config[i];
+                        break;
+                }
+        }
+        if (pin1 && i == pin)
+                return 0;
+        /* Check the desired function and channel. */
+        switch (func) {
+        case PTP_PF_NONE:
+                break;
+        case PTP_PF_EXTTS:
+                if (chan >= info->n_ext_ts)
+                        return -EINVAL;
+                break;
+        case PTP_PF_PEROUT:
+                if (chan >= info->n_per_out)
+                        return -EINVAL;
+                break;
+        case PTP_PF_PHYSYNC:
+                pr_err("sorry, cannot reassign the calibration pin\n");
+                return -EINVAL;
+        default:
+                return -EINVAL;
+        }
+        if (pin2->func == PTP_PF_PHYSYNC) {
+                pr_err("sorry, cannot reprogram the calibration pin\n");
+                return -EINVAL;
+        }
+        if (info->verify(info, pin, func, chan)) {
+                pr_err("driver cannot use function %u on pin %u\n", func, chan);
+                return -EOPNOTSUPP;
+        }
+        /* Disable whatever function was previously assigned. */
+        if (pin1) {
+                ptp_disable_pinfunc(info, func, chan);
+                pin1->func = PTP_PF_NONE;
+                pin1->chan = 0;
+        }
+        ptp_disable_pinfunc(info, pin2->func, pin2->chan);
+        pin2->func = func;
+        pin2->chan = chan;
+        return 0;
+}
 int ptp_open(struct posix_clock *pc, fmode_t fmode)
 {
        return 0;
@@ -35,12 +125,13 @@ long ptp_ioctl(struct posix_clock *pc, unsigned int cmd, unsigned long arg)
        struct ptp_clock_caps caps;
        struct ptp_clock_request req;
        struct ptp_sys_offset *sysoff = NULL;
+        struct ptp_pin_desc pd;
        struct ptp_clock *ptp = container_of(pc, struct ptp_clock, clock);
        struct ptp_clock_info *ops = ptp->info;
        struct ptp_clock_time *pct;
        struct timespec ts;
        int enable, err = 0;
-        unsigned int i;
+        unsigned int i, pin_index;
        switch (cmd) {
@@ -51,6 +142,7 @@ long ptp_ioctl(struct posix_clock *pc, unsigned int cmd, unsigned long arg)
                caps.n_ext_ts = ptp->info->n_ext_ts;
                caps.n_per_out = ptp->info->n_per_out;
                caps.pps = ptp->info->pps;
+                caps.n_pins = ptp->info->n_pins;
                if (copy_to_user((void __user *)arg, &caps, sizeof(caps)))
                        err = -EFAULT;
                break;
@@ -126,6 +218,40 @@ long ptp_ioctl(struct posix_clock *pc, unsigned int cmd, unsigned long arg)
                        err = -EFAULT;
                break;
+        case PTP_PIN_GETFUNC:
+                if (copy_from_user(&pd, (void __user *)arg, sizeof(pd))) {
+                        err = -EFAULT;
+                        break;
+                }
+                pin_index = pd.index;
+                if (pin_index >= ops->n_pins) {
+                        err = -EINVAL;
+                        break;
+                }
+                if (mutex_lock_interruptible(&ptp->pincfg_mux))
+                        return -ERESTARTSYS;
+                pd = ops->pin_config[pin_index];
+                mutex_unlock(&ptp->pincfg_mux);
+                if (!err && copy_to_user((void __user *)arg, &pd, sizeof(pd)))
+                        err = -EFAULT;
+                break;
+        case PTP_PIN_SETFUNC:
+                if (copy_from_user(&pd, (void __user *)arg, sizeof(pd))) {
+                        err = -EFAULT;
+                        break;
+                }
+                pin_index = pd.index;
+                if (pin_index >= ops->n_pins) {
+                        err = -EINVAL;
+                        break;
+                }
+                if (mutex_lock_interruptible(&ptp->pincfg_mux))
+                        return -ERESTARTSYS;
+                err = ptp_set_pinfunc(ptp, pin_index, pd.func, pd.chan);
+                mutex_unlock(&ptp->pincfg_mux);
+                break;
        default:
                err = -ENOTTY;
                break;
diff --git a/drivers/ptp/ptp_clock.c b/drivers/ptp/ptp_clock.c
index a8319b266643..e25d2bc898e5 100644
--- a/drivers/ptp/ptp_clock.c
+++ b/drivers/ptp/ptp_clock.c
@@ -169,6 +169,7 @@ static void delete_ptp_clock(struct posix_clock *pc)
        struct ptp_clock *ptp = container_of(pc, struct ptp_clock, clock);
        mutex_destroy(&ptp->tsevq_mux);
+        mutex_destroy(&ptp->pincfg_mux);
        ida_simple_remove(&ptp_clocks_map, ptp->index);
        kfree(ptp);
 }
@@ -203,6 +204,7 @@ struct ptp_clock *ptp_clock_register(struct ptp_clock_info *info,
        ptp->index = index;
        spin_lock_init(&ptp->tsevq.lock);
        mutex_init(&ptp->tsevq_mux);
+        mutex_init(&ptp->pincfg_mux);
        init_waitqueue_head(&ptp->tsev_wq);
        /* Create a new device in our class. */
@@ -249,6 +251,7 @@ no_sysfs:
        device_destroy(ptp_class, ptp->devid);
 no_device:
        mutex_destroy(&ptp->tsevq_mux);
+        mutex_destroy(&ptp->pincfg_mux);
 no_slot:
        kfree(ptp);
 no_memory:
@@ -305,6 +308,26 @@ int ptp_clock_index(struct ptp_clock *ptp)
 }
 EXPORT_SYMBOL(ptp_clock_index);
+int ptp_find_pin(struct ptp_clock *ptp,
+                 enum ptp_pin_function func, unsigned int chan)
+{
+        struct ptp_pin_desc *pin = NULL;
+        int i;
+        mutex_lock(&ptp->pincfg_mux);
+        for (i = 0; i < ptp->info->n_pins; i++) {
+                if (ptp->info->pin_config[i].func == func &&
+                    ptp->info->pin_config[i].chan == chan) {
+                        pin = &ptp->info->pin_config[i];
+                        break;
+                }
+        }
+        mutex_unlock(&ptp->pincfg_mux);
+        return pin ? i : -1;
+}
+EXPORT_SYMBOL(ptp_find_pin);
 /* module operations */
 static void __exit ptp_exit(void)
diff --git a/drivers/ptp/ptp_ixp46x.c b/drivers/ptp/ptp_ixp46x.c
index 4a08727fcaf3..604d340f2095 100644
--- a/drivers/ptp/ptp_ixp46x.c
+++ b/drivers/ptp/ptp_ixp46x.c
@@ -244,6 +244,7 @@ static struct ptp_clock_info ptp_ixp_caps = {
        .name           = "IXP46X timer",
        .max_adj        = 66666655,
        .n_ext_ts       = N_EXT_TS,
+        .n_pins         = 0,
        .pps            = 0,
        .adjfreq        = ptp_ixp_adjfreq,
        .adjtime        = ptp_ixp_adjtime,
diff --git a/drivers/ptp/ptp_pch.c b/drivers/ptp/ptp_pch.c
index 71a2559278d7..90a106308c4f 100644
--- a/drivers/ptp/ptp_pch.c
+++ b/drivers/ptp/ptp_pch.c
@@ -514,6 +514,7 @@ static struct ptp_clock_info ptp_pch_caps = {
        .name           = "PCH timer",
        .max_adj        = 50000000,
        .n_ext_ts       = N_EXT_TS,
+        .n_pins         = 0,
        .pps            = 0,
        .adjfreq        = ptp_pch_adjfreq,
        .adjtime        = ptp_pch_adjtime,
diff --git a/drivers/ptp/ptp_private.h b/drivers/ptp/ptp_private.h
index df03f2e30ad9..9c5d41421b65 100644
--- a/drivers/ptp/ptp_private.h
+++ b/drivers/ptp/ptp_private.h
@@ -48,8 +48,12 @@ struct ptp_clock {
        long dialed_frequency; /* remembers the frequency adjustment */
        struct timestamp_event_queue tsevq; /* simple fifo for time stamps */
        struct mutex tsevq_mux; /* one process at a time reading the fifo */
+        struct mutex pincfg_mux; /* protect concurrent info->pin_config access */
        wait_queue_head_t tsev_wq;
        int defunct; /* tells readers to go away when clock is being removed */
+        struct device_attribute *pin_dev_attr;
+        struct attribute **pin_attr;
+        struct attribute_group pin_attr_group;
 };
 /*
@@ -69,6 +73,10 @@ static inline int queue_cnt(struct timestamp_event_queue *q)
 * see ptp_chardev.c
 */
+/* caller must hold pincfg_mux */
+int ptp_set_pinfunc(struct ptp_clock *ptp, unsigned int pin,
+                    enum ptp_pin_function func, unsigned int chan);
 long ptp_ioctl(struct posix_clock *pc,
               unsigned int cmd, unsigned long arg);
diff --git a/drivers/ptp/ptp_sysfs.c b/drivers/ptp/ptp_sysfs.c
index 13ec5311746a..302e626fe6b0 100644
--- a/drivers/ptp/ptp_sysfs.c
+++ b/drivers/ptp/ptp_sysfs.c
@@ -18,6 +18,7 @@
 *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 #include <linux/capability.h>
+#include <linux/slab.h>
 #include "ptp_private.h"
@@ -42,6 +43,7 @@ PTP_SHOW_INT(max_adjustment, max_adj);
 PTP_SHOW_INT(n_alarms, n_alarm);
 PTP_SHOW_INT(n_external_timestamps, n_ext_ts);
 PTP_SHOW_INT(n_periodic_outputs, n_per_out);
+PTP_SHOW_INT(n_programmable_pins, n_pins);
 PTP_SHOW_INT(pps_available, pps);
 static struct attribute *ptp_attrs[] = {
@@ -50,6 +52,7 @@ static struct attribute *ptp_attrs[] = {
        &dev_attr_n_alarms.attr,
        &dev_attr_n_external_timestamps.attr,
        &dev_attr_n_periodic_outputs.attr,
+        &dev_attr_n_programmable_pins.attr,
        &dev_attr_pps_available.attr,
        NULL,
 };
@@ -175,6 +178,63 @@ out:
        return err;
 }
+static int ptp_pin_name2index(struct ptp_clock *ptp, const char *name)
+{
+        int i;
+        for (i = 0; i < ptp->info->n_pins; i++) {
+                if (!strcmp(ptp->info->pin_config[i].name, name))
+                        return i;
+        }
+        return -1;
+}
+static ssize_t ptp_pin_show(struct device *dev, struct device_attribute *attr,
+                            char *page)
+{
+        struct ptp_clock *ptp = dev_get_drvdata(dev);
+        unsigned int func, chan;
+        int index;
+        index = ptp_pin_name2index(ptp, attr->attr.name);
+        if (index < 0)
+                return -EINVAL;
+        if (mutex_lock_interruptible(&ptp->pincfg_mux))
+                return -ERESTARTSYS;
+        func = ptp->info->pin_config[index].func;
+        chan = ptp->info->pin_config[index].chan;
+        mutex_unlock(&ptp->pincfg_mux);
+        return snprintf(page, PAGE_SIZE, "%u %u\n", func, chan);
+}
+static ssize_t ptp_pin_store(struct device *dev, struct device_attribute *attr,
+                             const char *buf, size_t count)
+{
+        struct ptp_clock *ptp = dev_get_drvdata(dev);
+        unsigned int func, chan;
+        int cnt, err, index;
+        cnt = sscanf(buf, "%u %u", &func, &chan);
+        if (cnt != 2)
+                return -EINVAL;
+        index = ptp_pin_name2index(ptp, attr->attr.name);
+        if (index < 0)
+                return -EINVAL;
+        if (mutex_lock_interruptible(&ptp->pincfg_mux))
+                return -ERESTARTSYS;
+        err = ptp_set_pinfunc(ptp, index, func, chan);
+        mutex_unlock(&ptp->pincfg_mux);
+        if (err)
+                return err;
+        return count;
+}
 static DEVICE_ATTR(extts_enable, 0220, NULL, extts_enable_store);
 static DEVICE_ATTR(fifo,         0444, extts_fifo_show, NULL);
 static DEVICE_ATTR(period,       0220, NULL, period_store);
@@ -195,9 +255,56 @@ int ptp_cleanup_sysfs(struct ptp_clock *ptp)
        if (info->pps)
                device_remove_file(dev, &dev_attr_pps_enable);
+        if (info->n_pins) {
+                sysfs_remove_group(&dev->kobj, &ptp->pin_attr_group);
+                kfree(ptp->pin_attr);
+                kfree(ptp->pin_dev_attr);
+        }
        return 0;
 }
+static int ptp_populate_pins(struct ptp_clock *ptp)
+{
+        struct device *dev = ptp->dev;
+        struct ptp_clock_info *info = ptp->info;
+        int err = -ENOMEM, i, n_pins = info->n_pins;
+        ptp->pin_dev_attr = kzalloc(n_pins * sizeof(*ptp->pin_dev_attr),
+                                    GFP_KERNEL);
+        if (!ptp->pin_dev_attr)
+                goto no_dev_attr;
+        ptp->pin_attr = kzalloc((1 + n_pins) * sizeof(struct attribute *),
+                                GFP_KERNEL);
+        if (!ptp->pin_attr)
+                goto no_pin_attr;
+        for (i = 0; i < n_pins; i++) {
+                struct device_attribute *da = &ptp->pin_dev_attr[i];
+                sysfs_attr_init(&da->attr);
+                da->attr.name = info->pin_config[i].name;
+                da->attr.mode = 0644;
+                da->show = ptp_pin_show;
+                da->store = ptp_pin_store;
+                ptp->pin_attr[i] = &da->attr;
+        }
+        ptp->pin_attr_group.name = "pins";
+        ptp->pin_attr_group.attrs = ptp->pin_attr;
+        err = sysfs_create_group(&dev->kobj, &ptp->pin_attr_group);
+        if (err)
+                goto no_group;
+        return 0;
+no_group:
+        kfree(ptp->pin_attr);
+no_pin_attr:
+        kfree(ptp->pin_dev_attr);
+no_dev_attr:
+        return err;
+}
 int ptp_populate_sysfs(struct ptp_clock *ptp)
 {
        struct device *dev = ptp->dev;
@@ -222,7 +329,15 @@ int ptp_populate_sysfs(struct ptp_clock *ptp)
                if (err)
                        goto out4;
        }
+        if (info->n_pins) {
+                err = ptp_populate_pins(ptp);
+                if (err)
+                        goto out5;
+        }
        return 0;
+out5:
+        if (info->pps)
+                device_remove_file(dev, &dev_attr_pps_enable);
 out4:
        if (info->n_per_out)
                device_remove_file(dev, &dev_attr_period);
diff --git a/drivers/staging/octeon/ethernet-tx.c b/drivers/staging/octeon/ethernet-tx.c
index 47541e1608f3..ebb3ebc7176b 100644
--- a/drivers/staging/octeon/ethernet-tx.c
+++ b/drivers/staging/octeon/ethernet-tx.c
@@ -554,7 +554,7 @@ int cvm_oct_xmit_pow(struct sk_buff *skb, struct net_device *dev)
                printk_ratelimited("%s: Failed to allocate a work queue entry\n",
                                   dev->name);
                priv->stats.tx_dropped++;
-                dev_kfree_skb(skb);
+                dev_kfree_skb_any(skb);
                return 0;
        }
@@ -565,7 +565,7 @@ int cvm_oct_xmit_pow(struct sk_buff *skb, struct net_device *dev)
                                   dev->name);
                cvmx_fpa_free(work, CVMX_FPA_WQE_POOL, DONT_WRITEBACK(1));
                priv->stats.tx_dropped++;
-                dev_kfree_skb(skb);
+                dev_kfree_skb_any(skb);
                return 0;
        }
@@ -682,7 +682,7 @@ int cvm_oct_xmit_pow(struct sk_buff *skb, struct net_device *dev)
                             work->grp);
        priv->stats.tx_packets++;
        priv->stats.tx_bytes += skb->len;
-        dev_kfree_skb(skb);
+        dev_consume_skb_any(skb);
        return 0;
 }
diff --git a/drivers/staging/wlags49_h2/wl_netdev.c b/drivers/staging/wlags49_h2/wl_netdev.c
index 965b1c0a4753..69bc0a01ae14 100644
--- a/drivers/staging/wlags49_h2/wl_netdev.c
+++ b/drivers/staging/wlags49_h2/wl_netdev.c
@@ -715,7 +715,7 @@ int wl_send( struct wl_private *lp )
        /* Free the skb and perform queue cleanup, as the buffer was
            transmitted successfully */
-        dev_kfree_skb( lp->txF.skb );
+        dev_consume_skb_any( lp->txF.skb );
        lp->txF.skb = NULL;
        lp->txF.port = 0;
@@ -1730,7 +1730,7 @@ int wl_send_dma( struct wl_private *lp, struct sk_buff *skb, int port )
            WL_WDS_NETIF_STOP_QUEUE( lp );
            lp->netif_queue_on = FALSE;
-            dev_kfree_skb( skb );
+            dev_kfree_skb_any( skb );
            return 0;
        }
    }
@@ -1755,7 +1755,7 @@ int wl_send_dma( struct wl_private *lp, struct sk_buff *skb, int port )
    /* Free the skb and perform queue cleanup, as the buffer was
            transmitted successfully */
-    dev_kfree_skb( skb );
+    dev_consume_skb_any( skb );
    return TRUE;
 } // wl_send_dma