22 files changed, 354 insertions, 101 deletions

diff --git a/drivers/isdn/hisax/isdnl2.c b/drivers/isdn/hisax/isdnl2.c
index 18accb0a79cc..c53a53f6efb6 100644
--- a/drivers/isdn/hisax/isdnl2.c
+++ b/drivers/isdn/hisax/isdnl2.c
@@ -1247,7 +1247,7 @@ static void
 l2_pull_iqueue(struct FsmInst *fi, int event, void *arg)
 {
         struct PStack *st = fi->userdata;
-        struct sk_buff *skb;
+        struct sk_buff *skb, *nskb;
         struct Layer2 *l2 = &st->l2;
         u_char header[MAX_HEADER_LEN];
         int i, hdr_space_needed;
@@ -1262,14 +1262,10 @@ l2_pull_iqueue(struct FsmInst *fi, int event, void *arg)
                 return;
 
         hdr_space_needed = l2headersize(l2, 0);
-        if (hdr_space_needed > skb_headroom(skb)) {
-                struct sk_buff *orig_skb = skb;
-
-                skb = skb_realloc_headroom(skb, hdr_space_needed);
-                if (!skb) {
-                        dev_kfree_skb(orig_skb);
-                        return;
-                }
+        nskb = skb_realloc_headroom(skb, hdr_space_needed);
+        if (!nskb) {
+                skb_queue_head(&l2->i_queue, skb);
+                return;
         }
         spin_lock_irqsave(&l2->lock, flags);
         if (test_bit(FLG_MOD128, &l2->flag))
@@ -1282,7 +1278,7 @@ l2_pull_iqueue(struct FsmInst *fi, int event, void *arg)
                        p1);
                 dev_kfree_skb(l2->windowar[p1]);
         }
-        l2->windowar[p1] = skb_clone(skb, GFP_ATOMIC);
+        l2->windowar[p1] = skb;
 
         i = sethdraddr(&st->l2, header, CMD);
 
@@ -1295,8 +1291,8 @@ l2_pull_iqueue(struct FsmInst *fi, int event, void *arg)
                 l2->vs = (l2->vs + 1) % 8;
         }
         spin_unlock_irqrestore(&l2->lock, flags);
-        memcpy(skb_push(skb, i), header, i);
-        st->l2.l2l1(st, PH_PULL | INDICATION, skb);
+        memcpy(skb_push(nskb, i), header, i);
+        st->l2.l2l1(st, PH_PULL | INDICATION, nskb);
         test_and_clear_bit(FLG_ACK_PEND, &st->l2.flag);
         if (!test_and_set_bit(FLG_T200_RUN, &st->l2.flag)) {
                 FsmDelTimer(&st->l2.t203, 13);
diff --git a/drivers/isdn/mISDN/layer2.c b/drivers/isdn/mISDN/layer2.c
index 949cabb88f1c..5eb380a25903 100644
--- a/drivers/isdn/mISDN/layer2.c
+++ b/drivers/isdn/mISDN/layer2.c
@@ -1476,7 +1476,7 @@ static void
 l2_pull_iqueue(struct FsmInst *fi, int event, void *arg)
 {
         struct layer2   *l2 = fi->userdata;
-        struct sk_buff  *skb, *nskb, *oskb;
+        struct sk_buff  *skb, *nskb;
         u_char          header[MAX_L2HEADER_LEN];
         u_int           i, p1;
 
@@ -1486,48 +1486,34 @@ l2_pull_iqueue(struct FsmInst *fi, int event, void *arg)
         skb = skb_dequeue(&l2->i_queue);
         if (!skb)
                 return;
-
-        if (test_bit(FLG_MOD128, &l2->flag))
-                p1 = (l2->vs - l2->va) % 128;
-        else
-                p1 = (l2->vs - l2->va) % 8;
-        p1 = (p1 + l2->sow) % l2->window;
-        if (l2->windowar[p1]) {
-                printk(KERN_WARNING "%s: l2 try overwrite ack queue entry %d\n",
-                       mISDNDevName4ch(&l2->ch), p1);
-                dev_kfree_skb(l2->windowar[p1]);
-        }
-        l2->windowar[p1] = skb;
         i = sethdraddr(l2, header, CMD);
         if (test_bit(FLG_MOD128, &l2->flag)) {
                 header[i++] = l2->vs << 1;
                 header[i++] = l2->vr << 1;
+        } else
+                header[i++] = (l2->vr << 5) | (l2->vs << 1);
+        nskb = skb_realloc_headroom(skb, i);
+        if (!nskb) {
+                printk(KERN_WARNING "%s: no headroom(%d) copy for IFrame\n",
+                       mISDNDevName4ch(&l2->ch), i);
+                skb_queue_head(&l2->i_queue, skb);
+                return;
+        }
+        if (test_bit(FLG_MOD128, &l2->flag)) {
+                p1 = (l2->vs - l2->va) % 128;
                 l2->vs = (l2->vs + 1) % 128;
         } else {
-                header[i++] = (l2->vr << 5) | (l2->vs << 1);
+                p1 = (l2->vs - l2->va) % 8;
                 l2->vs = (l2->vs + 1) % 8;
         }
-
-        nskb = skb_clone(skb, GFP_ATOMIC);
-        p1 = skb_headroom(nskb);
-        if (p1 >= i)
-                memcpy(skb_push(nskb, i), header, i);
-        else {
-                printk(KERN_WARNING
-                       "%s: L2 pull_iqueue skb header(%d/%d) too short\n",
-                       mISDNDevName4ch(&l2->ch), i, p1);
-                oskb = nskb;
-                nskb = mI_alloc_skb(oskb->len + i, GFP_ATOMIC);
-                if (!nskb) {
-                        dev_kfree_skb(oskb);
-                        printk(KERN_WARNING "%s: no skb mem in %s\n",
-                               mISDNDevName4ch(&l2->ch), __func__);
-                        return;
-                }
-                memcpy(skb_put(nskb, i), header, i);
-                memcpy(skb_put(nskb, oskb->len), oskb->data, oskb->len);
-                dev_kfree_skb(oskb);
+        p1 = (p1 + l2->sow) % l2->window;
+        if (l2->windowar[p1]) {
+                printk(KERN_WARNING "%s: l2 try overwrite ack queue entry %d\n",
+                       mISDNDevName4ch(&l2->ch), p1);
+                dev_kfree_skb(l2->windowar[p1]);
         }
+        l2->windowar[p1] = skb;
+        memcpy(skb_push(nskb, i), header, i);
         l2down(l2, PH_DATA_REQ, l2_newid(l2), nskb);
         test_and_clear_bit(FLG_ACK_PEND, &l2->flag);
         if (!test_and_set_bit(FLG_T200_RUN, &l2->flag)) {
diff --git a/drivers/net/ethernet/allwinner/sun4i-emac.c b/drivers/net/ethernet/allwinner/sun4i-emac.c
index 48ce83e443c2..8d50314ac3eb 100644
--- a/drivers/net/ethernet/allwinner/sun4i-emac.c
+++ b/drivers/net/ethernet/allwinner/sun4i-emac.c
@@ -847,21 +847,25 @@ static int emac_probe(struct platform_device *pdev)
         if (ndev->irq == -ENXIO) {
                 netdev_err(ndev, "No irq resource\n");
                 ret = ndev->irq;
-                goto out;
+                goto out_iounmap;
         }
 
         db->clk = devm_clk_get(&pdev->dev, NULL);
         if (IS_ERR(db->clk)) {
                 ret = PTR_ERR(db->clk);
-                goto out;
+                goto out_iounmap;
         }
 
-        clk_prepare_enable(db->clk);
+        ret = clk_prepare_enable(db->clk);
+        if (ret) {
+                dev_err(&pdev->dev, "Error couldn't enable clock (%d)\n", ret);
+                goto out_iounmap;
+        }
 
         ret = sunxi_sram_claim(&pdev->dev);
         if (ret) {
                 dev_err(&pdev->dev, "Error couldn't map SRAM to device\n");
-                goto out;
+                goto out_clk_disable_unprepare;
         }
 
         db->phy_node = of_parse_phandle(np, "phy", 0);
@@ -910,6 +914,10 @@ static int emac_probe(struct platform_device *pdev)
 
 out_release_sram:
         sunxi_sram_release(&pdev->dev);
+out_clk_disable_unprepare:
+        clk_disable_unprepare(db->clk);
+out_iounmap:
+        iounmap(db->membase);
 out:
         dev_err(db->dev, "not found (%d).\n", ret);
 
@@ -921,8 +929,12 @@ out:
 static int emac_remove(struct platform_device *pdev)
 {
         struct net_device *ndev = platform_get_drvdata(pdev);
+        struct emac_board_info *db = netdev_priv(ndev);
 
         unregister_netdev(ndev);
+        sunxi_sram_release(&pdev->dev);
+        clk_disable_unprepare(db->clk);
+        iounmap(db->membase);
         free_netdev(ndev);
 
         dev_dbg(&pdev->dev, "released and freed device\n");
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
index 45512242baea..112f1bc8bcee 100644
--- a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
+++ b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
@@ -1595,7 +1595,7 @@ static void xgbe_dev_xmit(struct xgbe_channel *channel)
                                   packet->rdesc_count, 1);
 
         /* Make sure ownership is written to the descriptor */
-        dma_wmb();
+        wmb();
 
         ring->cur = cur_index + 1;
         if (!packet->skb->xmit_more ||
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
index 49f796aaad4f..cff8940e1694 100644
--- a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
+++ b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
@@ -1811,6 +1811,7 @@ static int xgbe_tx_poll(struct xgbe_channel *channel)
         struct netdev_queue *txq;
         int processed = 0;
         unsigned int tx_packets = 0, tx_bytes = 0;
+        unsigned int cur;
 
         DBGPR("-->xgbe_tx_poll\n");
 
@@ -1818,10 +1819,11 @@ static int xgbe_tx_poll(struct xgbe_channel *channel)
         if (!ring)
                 return 0;
 
+        cur = ring->cur;
         txq = netdev_get_tx_queue(netdev, channel->queue_index);
 
         while ((processed < XGBE_TX_DESC_MAX_PROC) &&
-               (ring->dirty != ring->cur)) {
+               (ring->dirty != cur)) {
                 rdata = XGBE_GET_DESC_DATA(ring, ring->dirty);
                 rdesc = rdata->rdesc;
 
diff --git a/drivers/net/ethernet/broadcom/bcm63xx_enet.c b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
index 95af75d35bc5..8b1929e9f698 100644
--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
+++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
@@ -2048,7 +2048,7 @@ static void swphy_poll_timer(unsigned long data)
 
         for (i = 0; i < priv->num_ports; i++) {
                 struct bcm63xx_enetsw_port *port;
-                int val, j, up, advertise, lpa, lpa2, speed, duplex, media;
+                int val, j, up, advertise, lpa, speed, duplex, media;
                 int external_phy = bcm_enet_port_is_rgmii(i);
                 u8 override;
 
@@ -2091,22 +2091,27 @@ static void swphy_poll_timer(unsigned long data)
                 lpa = bcmenet_sw_mdio_read(priv, external_phy, port->phy_id,
                                            MII_LPA);
 
-                lpa2 = bcmenet_sw_mdio_read(priv, external_phy, port->phy_id,
-                                            MII_STAT1000);
-
                 /* figure out media and duplex from advertise and LPA values */
                 media = mii_nway_result(lpa & advertise);
                 duplex = (media & ADVERTISE_FULL) ? 1 : 0;
-                if (lpa2 & LPA_1000FULL)
-                        duplex = 1;
-
-                if (lpa2 & (LPA_1000FULL | LPA_1000HALF))
-                        speed = 1000;
-                else {
-                        if (media & (ADVERTISE_100FULL | ADVERTISE_100HALF))
-                                speed = 100;
-                        else
-                                speed = 10;
+
+                if (media & (ADVERTISE_100FULL | ADVERTISE_100HALF))
+                        speed = 100;
+                else
+                        speed = 10;
+
+                if (val & BMSR_ESTATEN) {
+                        advertise = bcmenet_sw_mdio_read(priv, external_phy,
+                                                port->phy_id, MII_CTRL1000);
+
+                        lpa = bcmenet_sw_mdio_read(priv, external_phy,
+                                                port->phy_id, MII_STAT1000);
+
+                        if (advertise & (ADVERTISE_1000FULL | ADVERTISE_1000HALF)
+                                        && lpa & (LPA_1000FULL | LPA_1000HALF)) {
+                                speed = 1000;
+                                duplex = (lpa & LPA_1000FULL);
+                        }
                 }
 
                 dev_info(&priv->pdev->dev,
diff --git a/drivers/net/ethernet/cavium/Kconfig b/drivers/net/ethernet/cavium/Kconfig
index 9b35d142f47a..8fb84e69c30e 100644
--- a/drivers/net/ethernet/cavium/Kconfig
+++ b/drivers/net/ethernet/cavium/Kconfig
@@ -3,7 +3,7 @@
 #
 
 config NET_VENDOR_CAVIUM
-        tristate "Cavium ethernet drivers"
+        bool "Cavium ethernet drivers"
         depends on PCI
         default y
         ---help---
diff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
index 8fd26fdd7705..3f385ffe420f 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
@@ -1406,6 +1406,12 @@ static void i40e_get_ethtool_stats(struct net_device *netdev,
                         data[i++] = (i40e_gstrings_veb_stats[j].sizeof_stat ==
                                      sizeof(u64)) ? *(u64 *)p : *(u32 *)p;
                 }
+                for (j = 0; j < I40E_MAX_TRAFFIC_CLASS; j++) {
+                        data[i++] = veb->tc_stats.tc_tx_packets[j];
+                        data[i++] = veb->tc_stats.tc_tx_bytes[j];
+                        data[i++] = veb->tc_stats.tc_rx_packets[j];
+                        data[i++] = veb->tc_stats.tc_rx_bytes[j];
+                }
         }
         for (j = 0; j < I40E_GLOBAL_STATS_LEN; j++) {
                 p = (char *)pf + i40e_gstrings_stats[j].stat_offset;
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index 3e595adfb0bf..b825f978d441 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -8154,6 +8154,7 @@ static int i40e_sw_init(struct i40e_pf *pf)
         if (pf->hw.func_caps.vmdq) {
                 pf->num_vmdq_vsis = I40E_DEFAULT_NUM_VMDQ_VSI;
                 pf->flags |= I40E_FLAG_VMDQ_ENABLED;
+                pf->num_vmdq_qps = i40e_default_queues_per_vmdq(pf);
         }
 
 #ifdef I40E_FCOE
diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c
index 603d29df5832..6bf725921e79 100644
--- a/drivers/net/ethernet/marvell/mv643xx_eth.c
+++ b/drivers/net/ethernet/marvell/mv643xx_eth.c
@@ -759,11 +759,23 @@ txq_put_data_tso(struct net_device *dev, struct tx_queue *txq,
 
         desc->l4i_chk = 0;
         desc->byte_cnt = length;
-        desc->buf_ptr = dma_map_single(dev->dev.parent, data,
-                                       length, DMA_TO_DEVICE);
-        if (unlikely(dma_mapping_error(dev->dev.parent, desc->buf_ptr))) {
-                WARN(1, "dma_map_single failed!\n");
-                return -ENOMEM;
+
+        if (length <= 8 && (uintptr_t)data & 0x7) {
+                /* Copy unaligned small data fragment to TSO header data area */
+                memcpy(txq->tso_hdrs + txq->tx_curr_desc * TSO_HEADER_SIZE,
+                       data, length);
+                desc->buf_ptr = txq->tso_hdrs_dma
+                        + txq->tx_curr_desc * TSO_HEADER_SIZE;
+        } else {
+                /* Alignment is okay, map buffer and hand off to hardware */
+                txq->tx_desc_mapping[tx_index] = DESC_DMA_MAP_SINGLE;
+                desc->buf_ptr = dma_map_single(dev->dev.parent, data,
+                        length, DMA_TO_DEVICE);
+                if (unlikely(dma_mapping_error(dev->dev.parent,
+                                               desc->buf_ptr))) {
+                        WARN(1, "dma_map_single failed!\n");
+                        return -ENOMEM;
+                }
         }
 
         cmd_sts = BUFFER_OWNED_BY_DMA;
@@ -779,7 +791,8 @@ txq_put_data_tso(struct net_device *dev, struct tx_queue *txq,
 }
 
 static inline void
-txq_put_hdr_tso(struct sk_buff *skb, struct tx_queue *txq, int length)
+txq_put_hdr_tso(struct sk_buff *skb, struct tx_queue *txq, int length,
+                u32 *first_cmd_sts, bool first_desc)
 {
         struct mv643xx_eth_private *mp = txq_to_mp(txq);
         int hdr_len = skb_transport_offset(skb) + tcp_hdrlen(skb);
@@ -788,6 +801,7 @@ txq_put_hdr_tso(struct sk_buff *skb, struct tx_queue *txq, int length)
         int ret;
         u32 cmd_csum = 0;
         u16 l4i_chk = 0;
+        u32 cmd_sts;
 
         tx_index = txq->tx_curr_desc;
         desc = &txq->tx_desc_area[tx_index];
@@ -803,9 +817,17 @@ txq_put_hdr_tso(struct sk_buff *skb, struct tx_queue *txq, int length)
         desc->byte_cnt = hdr_len;
         desc->buf_ptr = txq->tso_hdrs_dma +
                         txq->tx_curr_desc * TSO_HEADER_SIZE;
-        desc->cmd_sts = cmd_csum | BUFFER_OWNED_BY_DMA  | TX_FIRST_DESC |
+        cmd_sts = cmd_csum | BUFFER_OWNED_BY_DMA  | TX_FIRST_DESC |
                                    GEN_CRC;
 
+        /* Defer updating the first command descriptor until all
+         * following descriptors have been written.
+         */
+        if (first_desc)
+                *first_cmd_sts = cmd_sts;
+        else
+                desc->cmd_sts = cmd_sts;
+
         txq->tx_curr_desc++;
         if (txq->tx_curr_desc == txq->tx_ring_size)
                 txq->tx_curr_desc = 0;
@@ -819,6 +841,8 @@ static int txq_submit_tso(struct tx_queue *txq, struct sk_buff *skb,
         int desc_count = 0;
         struct tso_t tso;
         int hdr_len = skb_transport_offset(skb) + tcp_hdrlen(skb);
+        struct tx_desc *first_tx_desc;
+        u32 first_cmd_sts = 0;
 
         /* Count needed descriptors */
         if ((txq->tx_desc_count + tso_count_descs(skb)) >= txq->tx_ring_size) {
@@ -826,11 +850,14 @@ static int txq_submit_tso(struct tx_queue *txq, struct sk_buff *skb,
                 return -EBUSY;
         }
 
+        first_tx_desc = &txq->tx_desc_area[txq->tx_curr_desc];
+
         /* Initialize the TSO handler, and prepare the first payload */
         tso_start(skb, &tso);
 
         total_len = skb->len - hdr_len;
         while (total_len > 0) {
+                bool first_desc = (desc_count == 0);
                 char *hdr;
 
                 data_left = min_t(int, skb_shinfo(skb)->gso_size, total_len);
@@ -840,7 +867,8 @@ static int txq_submit_tso(struct tx_queue *txq, struct sk_buff *skb,
                 /* prepare packet headers: MAC + IP + TCP */
                 hdr = txq->tso_hdrs + txq->tx_curr_desc * TSO_HEADER_SIZE;
                 tso_build_hdr(skb, hdr, &tso, data_left, total_len == 0);
-                txq_put_hdr_tso(skb, txq, data_left);
+                txq_put_hdr_tso(skb, txq, data_left, &first_cmd_sts,
+                                first_desc);
 
                 while (data_left > 0) {
                         int size;
@@ -860,6 +888,10 @@ static int txq_submit_tso(struct tx_queue *txq, struct sk_buff *skb,
         __skb_queue_tail(&txq->tx_skb, skb);
         skb_tx_timestamp(skb);
 
+        /* ensure all other descriptors are written before first cmd_sts */
+        wmb();
+        first_tx_desc->cmd_sts = first_cmd_sts;
+
         /* clear TX_END status */
         mp->work_tx_end &= ~(1 << txq->index);
 
diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c
index 55d2d8577d07..040fbc1e5508 100644
--- a/drivers/net/ethernet/ti/cpsw.c
+++ b/drivers/net/ethernet/ti/cpsw.c
@@ -31,6 +31,7 @@
 #include <linux/pm_runtime.h>
 #include <linux/gpio.h>
 #include <linux/of.h>
+#include <linux/of_mdio.h>
 #include <linux/of_net.h>
 #include <linux/of_device.h>
 #include <linux/if_vlan.h>
@@ -366,6 +367,7 @@ struct cpsw_priv {
         spinlock_t                      lock;
         struct platform_device          *pdev;
         struct net_device               *ndev;
+        struct device_node              *phy_node;
         struct napi_struct              napi_rx;
         struct napi_struct              napi_tx;
         struct device                   *dev;
@@ -1146,7 +1148,11 @@ static void cpsw_slave_open(struct cpsw_slave *slave, struct cpsw_priv *priv)
                 cpsw_ale_add_mcast(priv->ale, priv->ndev->broadcast,
                                    1 << slave_port, 0, 0, ALE_MCAST_FWD_2);
 
-        slave->phy = phy_connect(priv->ndev, slave->data->phy_id,
+        if (priv->phy_node)
+                slave->phy = of_phy_connect(priv->ndev, priv->phy_node,
+                                 &cpsw_adjust_link, 0, slave->data->phy_if);
+        else
+                slave->phy = phy_connect(priv->ndev, slave->data->phy_id,
                                  &cpsw_adjust_link, slave->data->phy_if);
         if (IS_ERR(slave->phy)) {
                 dev_err(priv->dev, "phy %s not found on slave %d\n",
@@ -1934,11 +1940,12 @@ static void cpsw_slave_init(struct cpsw_slave *slave, struct cpsw_priv *priv,
         slave->port_vlan = data->dual_emac_res_vlan;
 }
 
-static int cpsw_probe_dt(struct cpsw_platform_data *data,
+static int cpsw_probe_dt(struct cpsw_priv *priv,
                          struct platform_device *pdev)
 {
         struct device_node *node = pdev->dev.of_node;
         struct device_node *slave_node;
+        struct cpsw_platform_data *data = &priv->data;
         int i = 0, ret;
         u32 prop;
 
@@ -2029,6 +2036,7 @@ static int cpsw_probe_dt(struct cpsw_platform_data *data,
                 if (strcmp(slave_node->name, "slave"))
                         continue;
 
+                priv->phy_node = of_parse_phandle(slave_node, "phy-handle", 0);
                 parp = of_get_property(slave_node, "phy_id", &lenp);
                 if ((parp == NULL) || (lenp != (sizeof(void *) * 2))) {
                         dev_err(&pdev->dev, "Missing slave[%d] phy_id property\n", i);
@@ -2044,7 +2052,6 @@ static int cpsw_probe_dt(struct cpsw_platform_data *data,
                 }
                 snprintf(slave_data->phy_id, sizeof(slave_data->phy_id),
                          PHY_ID_FMT, mdio->name, phyid);
-
                 slave_data->phy_if = of_get_phy_mode(slave_node);
                 if (slave_data->phy_if < 0) {
                         dev_err(&pdev->dev, "Missing or malformed slave[%d] phy-mode property\n",
@@ -2245,7 +2252,7 @@ static int cpsw_probe(struct platform_device *pdev)
         /* Select default pin state */
         pinctrl_pm_select_default_state(&pdev->dev);
 
-        if (cpsw_probe_dt(&priv->data, pdev)) {
+        if (cpsw_probe_dt(priv, pdev)) {
                 dev_err(&pdev->dev, "cpsw: platform data missing\n");
                 ret = -ENODEV;
                 goto clean_runtime_disable_ret;
diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c
index cde29f8a37bf..445071c163cb 100644
--- a/drivers/net/geneve.c
+++ b/drivers/net/geneve.c
@@ -594,14 +594,12 @@ static struct rtable *geneve_get_rt(struct sk_buff *skb,
         rt = ip_route_output_key(geneve->net, fl4);
         if (IS_ERR(rt)) {
                 netdev_dbg(dev, "no route to %pI4\n", &fl4->daddr);
-                dev->stats.tx_carrier_errors++;
-                return rt;
+                return ERR_PTR(-ENETUNREACH);
         }
         if (rt->dst.dev == dev) { /* is this necessary? */
                 netdev_dbg(dev, "circular route to %pI4\n", &fl4->daddr);
-                dev->stats.collisions++;
                 ip_rt_put(rt);
-                return ERR_PTR(-EINVAL);
+                return ERR_PTR(-ELOOP);
         }
         return rt;
 }
@@ -627,12 +625,12 @@ static netdev_tx_t geneve_xmit(struct sk_buff *skb, struct net_device *dev)
         struct ip_tunnel_info *info = NULL;
         struct rtable *rt = NULL;
         const struct iphdr *iip; /* interior IP header */
+        int err = -EINVAL;
         struct flowi4 fl4;
         __u8 tos, ttl;
         __be16 sport;
         bool udp_csum;
         __be16 df;
-        int err;
 
         if (geneve->collect_md) {
                 info = skb_tunnel_info(skb);
@@ -647,7 +645,7 @@ static netdev_tx_t geneve_xmit(struct sk_buff *skb, struct net_device *dev)
         rt = geneve_get_rt(skb, dev, &fl4, info);
         if (IS_ERR(rt)) {
                 netdev_dbg(dev, "no route to %pI4\n", &fl4.daddr);
-                dev->stats.tx_carrier_errors++;
+                err = PTR_ERR(rt);
                 goto tx_error;
         }
 
@@ -699,10 +697,37 @@ static netdev_tx_t geneve_xmit(struct sk_buff *skb, struct net_device *dev)
 tx_error:
         dev_kfree_skb(skb);
 err:
-        dev->stats.tx_errors++;
+        if (err == -ELOOP)
+                dev->stats.collisions++;
+        else if (err == -ENETUNREACH)
+                dev->stats.tx_carrier_errors++;
+        else
+                dev->stats.tx_errors++;
         return NETDEV_TX_OK;
 }
 
+static int geneve_fill_metadata_dst(struct net_device *dev, struct sk_buff *skb)
+{
+        struct ip_tunnel_info *info = skb_tunnel_info(skb);
+        struct geneve_dev *geneve = netdev_priv(dev);
+        struct rtable *rt;
+        struct flowi4 fl4;
+
+        if (ip_tunnel_info_af(info) != AF_INET)
+                return -EINVAL;
+
+        rt = geneve_get_rt(skb, dev, &fl4, info);
+        if (IS_ERR(rt))
+                return PTR_ERR(rt);
+
+        ip_rt_put(rt);
+        info->key.u.ipv4.src = fl4.saddr;
+        info->key.tp_src = udp_flow_src_port(geneve->net, skb,
+                                             1, USHRT_MAX, true);
+        info->key.tp_dst = geneve->dst_port;
+        return 0;
+}
+
 static const struct net_device_ops geneve_netdev_ops = {
         .ndo_init               = geneve_init,
         .ndo_uninit             = geneve_uninit,
@@ -713,6 +738,7 @@ static const struct net_device_ops geneve_netdev_ops = {
         .ndo_change_mtu         = eth_change_mtu,
         .ndo_validate_addr      = eth_validate_addr,
         .ndo_set_mac_address    = eth_mac_addr,
+        .ndo_fill_metadata_dst  = geneve_fill_metadata_dst,
 };
 
 static void geneve_get_drvinfo(struct net_device *dev,
diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
index 248478c6f6e4..197c93937c2d 100644
--- a/drivers/net/macvtap.c
+++ b/drivers/net/macvtap.c
@@ -137,7 +137,7 @@ static const struct proto_ops macvtap_socket_ops;
 #define TUN_OFFLOADS (NETIF_F_HW_CSUM | NETIF_F_TSO_ECN | NETIF_F_TSO | \
                       NETIF_F_TSO6 | NETIF_F_UFO)
 #define RX_OFFLOADS (NETIF_F_GRO | NETIF_F_LRO)
-#define TAP_FEATURES (NETIF_F_GSO | NETIF_F_SG)
+#define TAP_FEATURES (NETIF_F_GSO | NETIF_F_SG | NETIF_F_FRAGLIST)
 
 static struct macvlan_dev *macvtap_get_vlan_rcu(const struct net_device *dev)
 {
diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
index a7fb66580cee..60994a83a0d6 100644
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -141,6 +141,11 @@ config MICREL_PHY
         ---help---
           Supports the KSZ9021, VSC8201, KS8001 PHYs.
 
+config DP83848_PHY
+        tristate "Driver for Texas Instruments DP83848 PHY"
+        ---help---
+          Supports the DP83848 PHY.
+
 config DP83867_PHY
         tristate "Drivers for Texas Instruments DP83867 Gigabit PHY"
         ---help---
diff --git a/drivers/net/phy/Makefile b/drivers/net/phy/Makefile
index 7655d47ad8d8..f31a4e25cf15 100644
--- a/drivers/net/phy/Makefile
+++ b/drivers/net/phy/Makefile
@@ -26,6 +26,7 @@ obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o
 obj-$(CONFIG_MDIO_GPIO)         += mdio-gpio.o
 obj-$(CONFIG_NATIONAL_PHY)      += national.o
 obj-$(CONFIG_DP83640_PHY)       += dp83640.o
+obj-$(CONFIG_DP83848_PHY)       += dp83848.o
 obj-$(CONFIG_DP83867_PHY)       += dp83867.o
 obj-$(CONFIG_STE10XP)           += ste10Xp.o
 obj-$(CONFIG_MICREL_PHY)        += micrel.o
diff --git a/drivers/net/phy/dp83848.c b/drivers/net/phy/dp83848.c
new file mode 100644
index 000000000000..5ce9bef54468
--- /dev/null
+++ b/drivers/net/phy/dp83848.c
@@ -0,0 +1,99 @@
+/*
+ * Driver for the Texas Instruments DP83848 PHY
+ *
+ * Copyright (C) 2015 Texas Instruments Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <linux/module.h>
+#include <linux/phy.h>
+
+#define DP83848_PHY_ID                  0x20005c90
+
+/* Registers */
+#define DP83848_MICR                    0x11
+#define DP83848_MISR                    0x12
+
+/* MICR Register Fields */
+#define DP83848_MICR_INT_OE             BIT(0) /* Interrupt Output Enable */
+#define DP83848_MICR_INTEN              BIT(1) /* Interrupt Enable */
+
+/* MISR Register Fields */
+#define DP83848_MISR_RHF_INT_EN         BIT(0) /* Receive Error Counter */
+#define DP83848_MISR_FHF_INT_EN         BIT(1) /* False Carrier Counter */
+#define DP83848_MISR_ANC_INT_EN         BIT(2) /* Auto-negotiation complete */
+#define DP83848_MISR_DUP_INT_EN         BIT(3) /* Duplex Status */
+#define DP83848_MISR_SPD_INT_EN         BIT(4) /* Speed status */
+#define DP83848_MISR_LINK_INT_EN        BIT(5) /* Link status */
+#define DP83848_MISR_ED_INT_EN          BIT(6) /* Energy detect */
+#define DP83848_MISR_LQM_INT_EN         BIT(7) /* Link Quality Monitor */
+
+static int dp83848_ack_interrupt(struct phy_device *phydev)
+{
+        int err = phy_read(phydev, DP83848_MISR);
+
+        return err < 0 ? err : 0;
+}
+
+static int dp83848_config_intr(struct phy_device *phydev)
+{
+        int err;
+
+        if (phydev->interrupts == PHY_INTERRUPT_ENABLED) {
+                err = phy_write(phydev, DP83848_MICR,
+                                DP83848_MICR_INT_OE |
+                                DP83848_MICR_INTEN);
+                if (err < 0)
+                        return err;
+
+                return phy_write(phydev, DP83848_MISR,
+                                 DP83848_MISR_ANC_INT_EN |
+                                 DP83848_MISR_DUP_INT_EN |
+                                 DP83848_MISR_SPD_INT_EN |
+                                 DP83848_MISR_LINK_INT_EN);
+        }
+
+        return phy_write(phydev, DP83848_MICR, 0x0);
+}
+
+static struct mdio_device_id __maybe_unused dp83848_tbl[] = {
+        { DP83848_PHY_ID, 0xfffffff0 },
+        { }
+};
+MODULE_DEVICE_TABLE(mdio, dp83848_tbl);
+
+static struct phy_driver dp83848_driver[] = {
+        {
+                .phy_id         = DP83848_PHY_ID,
+                .phy_id_mask    = 0xfffffff0,
+                .name           = "TI DP83848",
+                .features       = PHY_BASIC_FEATURES,
+                .flags          = PHY_HAS_INTERRUPT,
+
+                .soft_reset     = genphy_soft_reset,
+                .config_init    = genphy_config_init,
+                .suspend        = genphy_suspend,
+                .resume         = genphy_resume,
+                .config_aneg    = genphy_config_aneg,
+                .read_status    = genphy_read_status,
+
+                /* IRQ related */
+                .ack_interrupt  = dp83848_ack_interrupt,
+                .config_intr    = dp83848_config_intr,
+
+                .driver         = { .owner = THIS_MODULE, },
+        },
+};
+module_phy_driver(dp83848_driver);
+
+MODULE_DESCRIPTION("Texas Instruments DP83848 PHY driver");
+MODULE_AUTHOR("Andrew F. Davis <afd@ti.com");
+MODULE_LICENSE("GPL");
diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c
index 499185eaf413..cf6312fafea5 100644
--- a/drivers/net/phy/micrel.c
+++ b/drivers/net/phy/micrel.c
@@ -514,6 +514,27 @@ static int ksz8873mll_read_status(struct phy_device *phydev)
         return 0;
 }
 
+static int ksz9031_read_status(struct phy_device *phydev)
+{
+        int err;
+        int regval;
+
+        err = genphy_read_status(phydev);
+        if (err)
+                return err;
+
+        /* Make sure the PHY is not broken. Read idle error count,
+         * and reset the PHY if it is maxed out.
+         */
+        regval = phy_read(phydev, MII_STAT1000);
+        if ((regval & 0xFF) == 0xFF) {
+                phy_init_hw(phydev);
+                phydev->link = 0;
+        }
+
+        return 0;
+}
+
 static int ksz8873mll_config_aneg(struct phy_device *phydev)
 {
         return 0;
@@ -772,7 +793,7 @@ static struct phy_driver ksphy_driver[] = {
         .driver_data    = &ksz9021_type,
         .config_init    = ksz9031_config_init,
         .config_aneg    = genphy_config_aneg,
-        .read_status    = genphy_read_status,
+        .read_status    = ksz9031_read_status,
         .ack_interrupt  = kszphy_ack_interrupt,
         .config_intr    = kszphy_config_intr,
         .suspend        = genphy_suspend,
diff --git a/drivers/net/phy/smsc.c b/drivers/net/phy/smsc.c
index 70b08958763a..dc2da8770918 100644
--- a/drivers/net/phy/smsc.c
+++ b/drivers/net/phy/smsc.c
@@ -43,16 +43,25 @@ static int smsc_phy_ack_interrupt(struct phy_device *phydev)
 
 static int smsc_phy_config_init(struct phy_device *phydev)
 {
+        int __maybe_unused len;
+        struct device *dev __maybe_unused = &phydev->dev;
+        struct device_node *of_node __maybe_unused = dev->of_node;
         int rc = phy_read(phydev, MII_LAN83C185_CTRL_STATUS);
+        int enable_energy = 1;
 
         if (rc < 0)
                 return rc;
 
-        /* Enable energy detect mode for this SMSC Transceivers */
-        rc = phy_write(phydev, MII_LAN83C185_CTRL_STATUS,
-                       rc | MII_LAN83C185_EDPWRDOWN);
-        if (rc < 0)
-                return rc;
+        if (of_find_property(of_node, "smsc,disable-energy-detect", &len))
+                enable_energy = 0;
+
+        if (enable_energy) {
+                /* Enable energy detect mode for this SMSC Transceivers */
+                rc = phy_write(phydev, MII_LAN83C185_CTRL_STATUS,
+                               rc | MII_LAN83C185_EDPWRDOWN);
+                if (rc < 0)
+                        return rc;
+        }
 
         return smsc_phy_ack_interrupt(phydev);
 }
diff --git a/drivers/net/ppp/pppoe.c b/drivers/net/ppp/pppoe.c
index 2ed75060da50..5e0b43283bce 100644
--- a/drivers/net/ppp/pppoe.c
+++ b/drivers/net/ppp/pppoe.c
@@ -589,7 +589,7 @@ static int pppoe_release(struct socket *sock)
 
         po = pppox_sk(sk);
 
-        if (sk->sk_state & (PPPOX_CONNECTED | PPPOX_BOUND | PPPOX_ZOMBIE)) {
+        if (po->pppoe_dev) {
                 dev_put(po->pppoe_dev);
                 po->pppoe_dev = NULL;
         }
diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c
index 4752e69de00e..75ae756e93cf 100644
--- a/drivers/net/usb/qmi_wwan.c
+++ b/drivers/net/usb/qmi_wwan.c
@@ -711,6 +711,10 @@ static const struct usb_device_id products[] = {
         {QMI_FIXED_INTF(0x1199, 0x9056, 8)},    /* Sierra Wireless Modem */
         {QMI_FIXED_INTF(0x1199, 0x9057, 8)},
         {QMI_FIXED_INTF(0x1199, 0x9061, 8)},    /* Sierra Wireless Modem */
+        {QMI_FIXED_INTF(0x1199, 0x9070, 8)},    /* Sierra Wireless MC74xx/EM74xx */
+        {QMI_FIXED_INTF(0x1199, 0x9070, 10)},   /* Sierra Wireless MC74xx/EM74xx */
+        {QMI_FIXED_INTF(0x1199, 0x9071, 8)},    /* Sierra Wireless MC74xx/EM74xx */
+        {QMI_FIXED_INTF(0x1199, 0x9071, 10)},   /* Sierra Wireless MC74xx/EM74xx */
         {QMI_FIXED_INTF(0x1bbb, 0x011e, 4)},    /* Telekom Speedstick LTE II (Alcatel One Touch L100V LTE) */
         {QMI_FIXED_INTF(0x1bbb, 0x0203, 2)},    /* Alcatel L800MA */
         {QMI_FIXED_INTF(0x2357, 0x0201, 4)},    /* TP-LINK HSUPA Modem MA180 */
diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
index cf262ccf5047..6369a5734d4c 100644
--- a/drivers/net/vxlan.c
+++ b/drivers/net/vxlan.c
@@ -2360,6 +2360,46 @@ static int vxlan_change_mtu(struct net_device *dev, int new_mtu)
         return 0;
 }
 
+static int egress_ipv4_tun_info(struct net_device *dev, struct sk_buff *skb,
+                                struct ip_tunnel_info *info,
+                                __be16 sport, __be16 dport)
+{
+        struct vxlan_dev *vxlan = netdev_priv(dev);
+        struct rtable *rt;
+        struct flowi4 fl4;
+
+        memset(&fl4, 0, sizeof(fl4));
+        fl4.flowi4_tos = RT_TOS(info->key.tos);
+        fl4.flowi4_mark = skb->mark;
+        fl4.flowi4_proto = IPPROTO_UDP;
+        fl4.daddr = info->key.u.ipv4.dst;
+
+        rt = ip_route_output_key(vxlan->net, &fl4);
+        if (IS_ERR(rt))
+                return PTR_ERR(rt);
+        ip_rt_put(rt);
+
+        info->key.u.ipv4.src = fl4.saddr;
+        info->key.tp_src = sport;
+        info->key.tp_dst = dport;
+        return 0;
+}
+
+static int vxlan_fill_metadata_dst(struct net_device *dev, struct sk_buff *skb)
+{
+        struct vxlan_dev *vxlan = netdev_priv(dev);
+        struct ip_tunnel_info *info = skb_tunnel_info(skb);
+        __be16 sport, dport;
+
+        sport = udp_flow_src_port(dev_net(dev), skb, vxlan->cfg.port_min,
+                                  vxlan->cfg.port_max, true);
+        dport = info->key.tp_dst ? : vxlan->cfg.dst_port;
+
+        if (ip_tunnel_info_af(info) == AF_INET)
+                return egress_ipv4_tun_info(dev, skb, info, sport, dport);
+        return -EINVAL;
+}
+
 static const struct net_device_ops vxlan_netdev_ops = {
         .ndo_init               = vxlan_init,
         .ndo_uninit             = vxlan_uninit,
@@ -2374,6 +2414,7 @@ static const struct net_device_ops vxlan_netdev_ops = {
         .ndo_fdb_add            = vxlan_fdb_add,
         .ndo_fdb_del            = vxlan_fdb_delete,
         .ndo_fdb_dump           = vxlan_fdb_dump,
+        .ndo_fill_metadata_dst  = vxlan_fill_metadata_dst,
 };
 
 /* Info for udev, that this is a virtual tunnel endpoint */
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index 9bf63c27a9b7..441b158d04f7 100644
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -1706,19 +1706,19 @@ static void xennet_destroy_queues(struct netfront_info *info)
 }
 
 static int xennet_create_queues(struct netfront_info *info,
-                                unsigned int num_queues)
+                                unsigned int *num_queues)
 {
         unsigned int i;
         int ret;
 
-        info->queues = kcalloc(num_queues, sizeof(struct netfront_queue),
+        info->queues = kcalloc(*num_queues, sizeof(struct netfront_queue),
                                GFP_KERNEL);
         if (!info->queues)
                 return -ENOMEM;
 
         rtnl_lock();
 
-        for (i = 0; i < num_queues; i++) {
+        for (i = 0; i < *num_queues; i++) {
                 struct netfront_queue *queue = &info->queues[i];
 
                 queue->id = i;
@@ -1728,7 +1728,7 @@ static int xennet_create_queues(struct netfront_info *info,
                 if (ret < 0) {
                         dev_warn(&info->netdev->dev,
                                  "only created %d queues\n", i);
-                        num_queues = i;
+                        *num_queues = i;
                         break;
                 }
 
@@ -1738,11 +1738,11 @@ static int xennet_create_queues(struct netfront_info *info,
                         napi_enable(&queue->napi);
         }
 
-        netif_set_real_num_tx_queues(info->netdev, num_queues);
+        netif_set_real_num_tx_queues(info->netdev, *num_queues);
 
         rtnl_unlock();
 
-        if (num_queues == 0) {
+        if (*num_queues == 0) {
                 dev_err(&info->netdev->dev, "no queues\n");
                 return -EINVAL;
         }
@@ -1788,7 +1788,7 @@ static int talk_to_netback(struct xenbus_device *dev,
         if (info->queues)
                 xennet_destroy_queues(info);
 
-        err = xennet_create_queues(info, num_queues);
+        err = xennet_create_queues(info, &num_queues);
         if (err < 0)
                 goto destroy_ring;