21 files changed, 212 insertions, 65 deletions

diff --git a/drivers/net/arcnet/com20020-pci.c b/drivers/net/arcnet/com20020-pci.c
index 945f532078e9..96edc1346124 100644
--- a/drivers/net/arcnet/com20020-pci.c
+++ b/drivers/net/arcnet/com20020-pci.c
@@ -214,8 +214,17 @@ static struct com20020_pci_card_info card_info_sohard = {
         .flags = ARC_CAN_10MBIT,
 };
 
-static struct com20020_pci_card_info card_info_eae = {
-        .name = "EAE PLX-PCI",
+static struct com20020_pci_card_info card_info_eae_arc1 = {
+        .name = "EAE PLX-PCI ARC1",
+        .devcount = 1,
+        .chan_map_tbl = {
+                { 2, 0x00, 0x08 },
+        },
+        .flags = ARC_CAN_10MBIT,
+};
+
+static struct com20020_pci_card_info card_info_eae_ma1 = {
+        .name = "EAE PLX-PCI MA1",
         .devcount = 2,
         .chan_map_tbl = {
                 { 2, 0x00, 0x08 },
@@ -359,9 +368,15 @@ static const struct pci_device_id com20020pci_id_table[] = {
         },
         {
                 0x10B5, 0x9050,
+                0x10B5, 0x3263,
+                0, 0,
+                (kernel_ulong_t)&card_info_eae_arc1
+        },
+        {
+                0x10B5, 0x9050,
                 0x10B5, 0x3292,
                 0, 0,
-                (kernel_ulong_t)&card_info_eae
+                (kernel_ulong_t)&card_info_eae_ma1
         },
         {
                 0x14BA, 0x6000,
diff --git a/drivers/net/ethernet/3com/3c589_cs.c b/drivers/net/ethernet/3com/3c589_cs.c
index f18647c23559..c5a320507556 100644
--- a/drivers/net/ethernet/3com/3c589_cs.c
+++ b/drivers/net/ethernet/3com/3c589_cs.c
@@ -518,11 +518,8 @@ static int el3_open(struct net_device *dev)
         netif_start_queue(dev);
 
         tc589_reset(dev);
-        init_timer(&lp->media);
-        lp->media.function = media_check;
-        lp->media.data = (unsigned long) dev;
-        lp->media.expires = jiffies + HZ;
-        add_timer(&lp->media);
+        setup_timer(&lp->media, media_check, (unsigned long)dev);
+        mod_timer(&lp->media, jiffies + HZ);
 
         dev_dbg(&link->dev, "%s: opened, status %4.4x.\n",
           dev->name, inw(dev->base_addr + EL3_STATUS));
diff --git a/drivers/net/ethernet/agere/et131x.c b/drivers/net/ethernet/agere/et131x.c
index 384dc163851b..e0f3d197e7f2 100644
--- a/drivers/net/ethernet/agere/et131x.c
+++ b/drivers/net/ethernet/agere/et131x.c
@@ -3127,7 +3127,8 @@ static void et131x_error_timer_handler(unsigned long data)
         }
 
         /* This is a periodic timer, so reschedule */
-        mod_timer(&adapter->error_timer, jiffies + TX_ERROR_PERIOD * HZ / 1000);
+        mod_timer(&adapter->error_timer, jiffies +
+                  msecs_to_jiffies(TX_ERROR_PERIOD));
 }
 
 static void et131x_adapter_memory_free(struct et131x_adapter *adapter)
@@ -3647,7 +3648,8 @@ static int et131x_open(struct net_device *netdev)
 
         /* Start the timer to track NIC errors */
         init_timer(&adapter->error_timer);
-        adapter->error_timer.expires = jiffies + TX_ERROR_PERIOD * HZ / 1000;
+        adapter->error_timer.expires = jiffies +
+                msecs_to_jiffies(TX_ERROR_PERIOD);
         adapter->error_timer.function = et131x_error_timer_handler;
         adapter->error_timer.data = (unsigned long)adapter;
         add_timer(&adapter->error_timer);
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
index 44b15373d6b3..4de62b210c85 100644
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
@@ -1030,12 +1030,14 @@ static const struct acpi_device_id xgene_enet_acpi_match[] = {
 MODULE_DEVICE_TABLE(acpi, xgene_enet_acpi_match);
 #endif
 
+#ifdef CONFIG_OF
 static struct of_device_id xgene_enet_of_match[] = {
         {.compatible = "apm,xgene-enet",},
         {},
 };
 
 MODULE_DEVICE_TABLE(of, xgene_enet_of_match);
+#endif
 
 static struct platform_driver xgene_enet_driver = {
         .driver = {
diff --git a/drivers/net/ethernet/broadcom/b44.c b/drivers/net/ethernet/broadcom/b44.c
index d86d6baf9681..bd5916a60cb5 100644
--- a/drivers/net/ethernet/broadcom/b44.c
+++ b/drivers/net/ethernet/broadcom/b44.c
@@ -121,7 +121,7 @@ static struct pci_driver b44_pci_driver = {
 
 static const struct ssb_device_id b44_ssb_tbl[] = {
         SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_ETHERNET, SSB_ANY_REV),
-        SSB_DEVTABLE_END
+        {},
 };
 MODULE_DEVICE_TABLE(ssb, b44_ssb_tbl);
 
diff --git a/drivers/net/ethernet/broadcom/bgmac.c b/drivers/net/ethernet/broadcom/bgmac.c
index 3007d95fbb9f..676ffe093180 100644
--- a/drivers/net/ethernet/broadcom/bgmac.c
+++ b/drivers/net/ethernet/broadcom/bgmac.c
@@ -21,7 +21,7 @@
 static const struct bcma_device_id bgmac_bcma_tbl[] = {
         BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_4706_MAC_GBIT, BCMA_ANY_REV, BCMA_ANY_CLASS),
         BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_MAC_GBIT, BCMA_ANY_REV, BCMA_ANY_CLASS),
-        BCMA_CORETABLE_END
+        {},
 };
 MODULE_DEVICE_TABLE(bcma, bgmac_bcma_tbl);
 
@@ -1412,6 +1412,7 @@ static void bgmac_mii_unregister(struct bgmac *bgmac)
 /* http://bcm-v4.sipsolutions.net/mac-gbit/gmac/chipattach */
 static int bgmac_probe(struct bcma_device *core)
 {
+        struct bcma_chipinfo *ci = &core->bus->chipinfo;
         struct net_device *net_dev;
         struct bgmac *bgmac;
         struct ssb_sprom *sprom = &core->bus->sprom;
@@ -1474,8 +1475,8 @@ static int bgmac_probe(struct bcma_device *core)
         bgmac_chip_reset(bgmac);
 
         /* For Northstar, we have to take all GMAC core out of reset */
-        if (core->id.id == BCMA_CHIP_ID_BCM4707 ||
-            core->id.id == BCMA_CHIP_ID_BCM53018) {
+        if (ci->id == BCMA_CHIP_ID_BCM4707 ||
+            ci->id == BCMA_CHIP_ID_BCM53018) {
                 struct bcma_device *ns_core;
                 int ns_gmac;
 
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
index 615a6dbde047..23a019cee279 100644
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
@@ -17855,8 +17855,10 @@ static int tg3_init_one(struct pci_dev *pdev,
          */
         if ((tr32(HOSTCC_MODE) & HOSTCC_MODE_ENABLE) ||
             (tr32(WDMAC_MODE) & WDMAC_MODE_ENABLE)) {
+                tg3_full_lock(tp, 0);
                 tw32(MEMARB_MODE, MEMARB_MODE_ENABLE);
                 tg3_halt(tp, RESET_KIND_SHUTDOWN, 1);
+                tg3_full_unlock(tp);
         }
 
         err = tg3_test_dma(tp);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/main.c b/drivers/net/ethernet/mellanox/mlx5/core/main.c
index d6651937d899..5394a8486558 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c
@@ -291,6 +291,7 @@ static void copy_rw_fields(void *to, struct mlx5_caps *from)
         MLX5_SET(cmd_hca_cap, to, log_max_ra_req_dc, from->gen.log_max_ra_req_dc);
         MLX5_SET(cmd_hca_cap, to, log_max_ra_res_dc, from->gen.log_max_ra_res_dc);
         MLX5_SET(cmd_hca_cap, to, pkey_table_size, to_fw_pkey_sz(from->gen.pkey_table_size));
+        MLX5_SET(cmd_hca_cap, to, log_uar_page_sz, PAGE_SHIFT - 12);
         v64 = from->gen.flags & MLX5_CAP_BITS_RW_MASK;
         *flags_off = cpu_to_be64(v64);
 }
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h b/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
index e56c1bb36141..fa4317611fd6 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
@@ -848,10 +848,17 @@ struct qlcnic_cardrsp_tx_ctx {
 #define QLCNIC_MAC_VLAN_ADD     3
 #define QLCNIC_MAC_VLAN_DEL     4
 
+enum qlcnic_mac_type {
+        QLCNIC_UNICAST_MAC,
+        QLCNIC_MULTICAST_MAC,
+        QLCNIC_BROADCAST_MAC,
+};
+
 struct qlcnic_mac_vlan_list {
         struct list_head list;
         uint8_t mac_addr[ETH_ALEN+2];
         u16 vlan_id;
+        enum qlcnic_mac_type mac_type;
 };
 
 /* MAC Learn */
@@ -1615,7 +1622,9 @@ void qlcnic_watchdog_task(struct work_struct *work);
 void qlcnic_post_rx_buffers(struct qlcnic_adapter *adapter,
                 struct qlcnic_host_rds_ring *rds_ring, u8 ring_id);
 void qlcnic_set_multi(struct net_device *netdev);
-int qlcnic_nic_add_mac(struct qlcnic_adapter *, const u8 *, u16);
+void qlcnic_flush_mcast_mac(struct qlcnic_adapter *);
+int qlcnic_nic_add_mac(struct qlcnic_adapter *, const u8 *, u16,
+                       enum qlcnic_mac_type);
 int qlcnic_nic_del_mac(struct qlcnic_adapter *, const u8 *);
 void qlcnic_82xx_free_mac_list(struct qlcnic_adapter *adapter);
 int qlcnic_82xx_read_phys_port_id(struct qlcnic_adapter *);
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c
index 69b46c051cc0..3e0f705a4311 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c
@@ -487,7 +487,8 @@ int qlcnic_nic_del_mac(struct qlcnic_adapter *adapter, const u8 *addr)
         return err;
 }
 
-int qlcnic_nic_add_mac(struct qlcnic_adapter *adapter, const u8 *addr, u16 vlan)
+int qlcnic_nic_add_mac(struct qlcnic_adapter *adapter, const u8 *addr, u16 vlan,
+                       enum qlcnic_mac_type mac_type)
 {
         struct qlcnic_mac_vlan_list *cur;
         struct list_head *head;
@@ -513,10 +514,29 @@ int qlcnic_nic_add_mac(struct qlcnic_adapter *adapter, const u8 *addr, u16 vlan)
         }
 
         cur->vlan_id = vlan;
+        cur->mac_type = mac_type;
+
         list_add_tail(&cur->list, &adapter->mac_list);
         return 0;
 }
 
+void qlcnic_flush_mcast_mac(struct qlcnic_adapter *adapter)
+{
+        struct qlcnic_mac_vlan_list *cur;
+        struct list_head *head, *tmp;
+
+        list_for_each_safe(head, tmp, &adapter->mac_list) {
+                cur = list_entry(head, struct qlcnic_mac_vlan_list, list);
+                if (cur->mac_type != QLCNIC_MULTICAST_MAC)
+                        continue;
+
+                qlcnic_sre_macaddr_change(adapter, cur->mac_addr,
+                                          cur->vlan_id, QLCNIC_MAC_DEL);
+                list_del(&cur->list);
+                kfree(cur);
+        }
+}
+
 static void __qlcnic_set_multi(struct net_device *netdev, u16 vlan)
 {
         struct qlcnic_adapter *adapter = netdev_priv(netdev);
@@ -530,8 +550,9 @@ static void __qlcnic_set_multi(struct net_device *netdev, u16 vlan)
         if (!test_bit(__QLCNIC_FW_ATTACHED, &adapter->state))
                 return;
 
-        qlcnic_nic_add_mac(adapter, adapter->mac_addr, vlan);
-        qlcnic_nic_add_mac(adapter, bcast_addr, vlan);
+        qlcnic_nic_add_mac(adapter, adapter->mac_addr, vlan,
+                           QLCNIC_UNICAST_MAC);
+        qlcnic_nic_add_mac(adapter, bcast_addr, vlan, QLCNIC_BROADCAST_MAC);
 
         if (netdev->flags & IFF_PROMISC) {
                 if (!(adapter->flags & QLCNIC_PROMISC_DISABLED))
@@ -540,8 +561,10 @@ static void __qlcnic_set_multi(struct net_device *netdev, u16 vlan)
                    (netdev_mc_count(netdev) > ahw->max_mc_count)) {
                 mode = VPORT_MISS_MODE_ACCEPT_MULTI;
         } else if (!netdev_mc_empty(netdev)) {
+                qlcnic_flush_mcast_mac(adapter);
                 netdev_for_each_mc_addr(ha, netdev)
-                        qlcnic_nic_add_mac(adapter, ha->addr, vlan);
+                        qlcnic_nic_add_mac(adapter, ha->addr, vlan,
+                                           QLCNIC_MULTICAST_MAC);
         }
 
         /* configure unicast MAC address, if there is not sufficient space
@@ -551,7 +574,8 @@ static void __qlcnic_set_multi(struct net_device *netdev, u16 vlan)
                 mode = VPORT_MISS_MODE_ACCEPT_ALL;
         } else if (!netdev_uc_empty(netdev)) {
                 netdev_for_each_uc_addr(ha, netdev)
-                        qlcnic_nic_add_mac(adapter, ha->addr, vlan);
+                        qlcnic_nic_add_mac(adapter, ha->addr, vlan,
+                                           QLCNIC_UNICAST_MAC);
         }
 
         if (mode == VPORT_MISS_MODE_ACCEPT_ALL &&
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_common.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_common.c
index 1659c804f1d5..e6312465fe45 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_common.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_common.c
@@ -1489,7 +1489,8 @@ out:
         return ret;
 }
 
-static void qlcnic_vf_add_mc_list(struct net_device *netdev, const u8 *mac)
+static void qlcnic_vf_add_mc_list(struct net_device *netdev, const u8 *mac,
+                                  enum qlcnic_mac_type mac_type)
 {
         struct qlcnic_adapter *adapter = netdev_priv(netdev);
         struct qlcnic_sriov *sriov = adapter->ahw->sriov;
@@ -1500,17 +1501,18 @@ static void qlcnic_vf_add_mc_list(struct net_device *netdev, const u8 *mac)
         vf = &adapter->ahw->sriov->vf_info[0];
 
         if (!qlcnic_sriov_check_any_vlan(vf)) {
-                qlcnic_nic_add_mac(adapter, mac, 0);
+                qlcnic_nic_add_mac(adapter, mac, 0, mac_type);
         } else {
                 spin_lock(&vf->vlan_list_lock);
                 for (i = 0; i < sriov->num_allowed_vlans; i++) {
                         vlan_id = vf->sriov_vlans[i];
                         if (vlan_id)
-                                qlcnic_nic_add_mac(adapter, mac, vlan_id);
+                                qlcnic_nic_add_mac(adapter, mac, vlan_id,
+                                                   mac_type);
                 }
                 spin_unlock(&vf->vlan_list_lock);
                 if (qlcnic_84xx_check(adapter))
-                        qlcnic_nic_add_mac(adapter, mac, 0);
+                        qlcnic_nic_add_mac(adapter, mac, 0, mac_type);
         }
 }
 
@@ -1549,10 +1551,12 @@ void qlcnic_sriov_vf_set_multi(struct net_device *netdev)
                    (netdev_mc_count(netdev) > ahw->max_mc_count)) {
                 mode = VPORT_MISS_MODE_ACCEPT_MULTI;
         } else {
-                qlcnic_vf_add_mc_list(netdev, bcast_addr);
+                qlcnic_vf_add_mc_list(netdev, bcast_addr, QLCNIC_BROADCAST_MAC);
                 if (!netdev_mc_empty(netdev)) {
+                        qlcnic_flush_mcast_mac(adapter);
                         netdev_for_each_mc_addr(ha, netdev)
-                                qlcnic_vf_add_mc_list(netdev, ha->addr);
+                                qlcnic_vf_add_mc_list(netdev, ha->addr,
+                                                      QLCNIC_MULTICAST_MAC);
                 }
         }
 
@@ -1563,7 +1567,8 @@ void qlcnic_sriov_vf_set_multi(struct net_device *netdev)
                 mode = VPORT_MISS_MODE_ACCEPT_ALL;
         } else if (!netdev_uc_empty(netdev)) {
                 netdev_for_each_uc_addr(ha, netdev)
-                        qlcnic_vf_add_mc_list(netdev, ha->addr);
+                        qlcnic_vf_add_mc_list(netdev, ha->addr,
+                                              QLCNIC_UNICAST_MAC);
         }
 
         if (adapter->pdev->is_virtfn) {
diff --git a/drivers/net/ethernet/sun/sunvnet.c b/drivers/net/ethernet/sun/sunvnet.c
index 2b10b85d8a08..22e0cad1b4b5 100644
--- a/drivers/net/ethernet/sun/sunvnet.c
+++ b/drivers/net/ethernet/sun/sunvnet.c
@@ -1192,23 +1192,16 @@ static int vnet_handle_offloads(struct vnet_port *port, struct sk_buff *skb)
         skb_pull(skb, maclen);
 
         if (port->tso && gso_size < datalen) {
+                if (skb_unclone(skb, GFP_ATOMIC))
+                        goto out_dropped;
+
                 /* segment to TSO size */
                 skb_shinfo(skb)->gso_size = datalen;
                 skb_shinfo(skb)->gso_segs = gso_segs;
-
-                segs = skb_gso_segment(skb, dev->features & ~NETIF_F_TSO);
-
-                /* restore gso_size & gso_segs */
-                skb_shinfo(skb)->gso_size = gso_size;
-                skb_shinfo(skb)->gso_segs = DIV_ROUND_UP(skb->len - hlen,
-                                                         gso_size);
-        } else
-                segs = skb_gso_segment(skb, dev->features & ~NETIF_F_TSO);
-        if (IS_ERR(segs)) {
-                dev->stats.tx_dropped++;
-                dev_kfree_skb_any(skb);
-                return NETDEV_TX_OK;
         }
+        segs = skb_gso_segment(skb, dev->features & ~NETIF_F_TSO);
+        if (IS_ERR(segs))
+                goto out_dropped;
 
         skb_push(skb, maclen);
         skb_reset_mac_header(skb);
@@ -1246,6 +1239,10 @@ static int vnet_handle_offloads(struct vnet_port *port, struct sk_buff *skb)
         if (!(status & NETDEV_TX_MASK))
                 dev_kfree_skb_any(skb);
         return status;
+out_dropped:
+        dev->stats.tx_dropped++;
+        dev_kfree_skb_any(skb);
+        return NETDEV_TX_OK;
 }
 
 static int vnet_start_xmit(struct sk_buff *skb, struct net_device *dev)
diff --git a/drivers/net/ipvlan/ipvlan.h b/drivers/net/ipvlan/ipvlan.h
index 2729f64b3e7e..924ea98bd531 100644
--- a/drivers/net/ipvlan/ipvlan.h
+++ b/drivers/net/ipvlan/ipvlan.h
@@ -67,7 +67,7 @@ struct ipvl_dev {
         struct list_head        addrs;
         int                     ipv4cnt;
         int                     ipv6cnt;
-        struct ipvl_pcpu_stats  *pcpu_stats;
+        struct ipvl_pcpu_stats  __percpu *pcpu_stats;
         DECLARE_BITMAP(mac_filters, IPVLAN_MAC_FILTER_SIZE);
         netdev_features_t       sfeatures;
         u32                     msg_enable;
diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c
index 3ad8ca76196d..1190fd8f0088 100644
--- a/drivers/net/phy/micrel.c
+++ b/drivers/net/phy/micrel.c
@@ -32,6 +32,7 @@
 /* Operation Mode Strap Override */
 #define MII_KSZPHY_OMSO                         0x16
 #define KSZPHY_OMSO_B_CAST_OFF                  BIT(9)
+#define KSZPHY_OMSO_NAND_TREE_ON                BIT(5)
 #define KSZPHY_OMSO_RMII_OVERRIDE               BIT(1)
 #define KSZPHY_OMSO_MII_OVERRIDE                BIT(0)
 
@@ -76,6 +77,7 @@ struct kszphy_type {
         u32 led_mode_reg;
         u16 interrupt_level_mask;
         bool has_broadcast_disable;
+        bool has_nand_tree_disable;
         bool has_rmii_ref_clk_sel;
 };
 
@@ -89,6 +91,7 @@ struct kszphy_priv {
 static const struct kszphy_type ksz8021_type = {
         .led_mode_reg           = MII_KSZPHY_CTRL_2,
         .has_broadcast_disable  = true,
+        .has_nand_tree_disable  = true,
         .has_rmii_ref_clk_sel   = true,
 };
 
@@ -98,11 +101,13 @@ static const struct kszphy_type ksz8041_type = {
 
 static const struct kszphy_type ksz8051_type = {
         .led_mode_reg           = MII_KSZPHY_CTRL_2,
+        .has_nand_tree_disable  = true,
 };
 
 static const struct kszphy_type ksz8081_type = {
         .led_mode_reg           = MII_KSZPHY_CTRL_2,
         .has_broadcast_disable  = true,
+        .has_nand_tree_disable  = true,
         .has_rmii_ref_clk_sel   = true,
 };
 
@@ -231,6 +236,26 @@ out:
         return ret;
 }
 
+static int kszphy_nand_tree_disable(struct phy_device *phydev)
+{
+        int ret;
+
+        ret = phy_read(phydev, MII_KSZPHY_OMSO);
+        if (ret < 0)
+                goto out;
+
+        if (!(ret & KSZPHY_OMSO_NAND_TREE_ON))
+                return 0;
+
+        ret = phy_write(phydev, MII_KSZPHY_OMSO,
+                        ret & ~KSZPHY_OMSO_NAND_TREE_ON);
+out:
+        if (ret)
+                dev_err(&phydev->dev, "failed to disable NAND tree mode\n");
+
+        return ret;
+}
+
 static int kszphy_config_init(struct phy_device *phydev)
 {
         struct kszphy_priv *priv = phydev->priv;
@@ -245,6 +270,9 @@ static int kszphy_config_init(struct phy_device *phydev)
         if (type->has_broadcast_disable)
                 kszphy_broadcast_disable(phydev);
 
+        if (type->has_nand_tree_disable)
+                kszphy_nand_tree_disable(phydev);
+
         if (priv->rmii_ref_clk_sel) {
                 ret = kszphy_rmii_clk_sel(phydev, priv->rmii_ref_clk_sel_val);
                 if (ret) {
diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
index 6b8efcabb816..9cdfb3fe9c15 100644
--- a/drivers/net/usb/hso.c
+++ b/drivers/net/usb/hso.c
@@ -914,7 +914,7 @@ static void packetizeRx(struct hso_net *odev, unsigned char *ip_pkt,
                                         /* We got no receive buffer. */
                                         D1("could not allocate memory");
                                         odev->rx_parse_state = WAIT_SYNC;
-                                        return;
+                                        continue;
                                 }
 
                                 /* Copy what we got so far. make room for iphdr
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
index 5980ac6c48dd..438fc6bcaef1 100644
--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
@@ -40,6 +40,7 @@
 #define PLA_RXFIFO_CTRL0        0xc0a0
 #define PLA_RXFIFO_CTRL1        0xc0a4
 #define PLA_RXFIFO_CTRL2        0xc0a8
+#define PLA_DMY_REG0            0xc0b0
 #define PLA_FMC                 0xc0b4
 #define PLA_CFG_WOL             0xc0b6
 #define PLA_TEREDO_CFG          0xc0bc
@@ -90,8 +91,14 @@
 #define PLA_BP_7                0xfc36
 #define PLA_BP_EN               0xfc38
 
+#define USB_USB2PHY             0xb41e
+#define USB_SSPHYLINK2          0xb428
 #define USB_U2P3_CTRL           0xb460
+#define USB_CSR_DUMMY1          0xb464
+#define USB_CSR_DUMMY2          0xb466
 #define USB_DEV_STAT            0xb808
+#define USB_CONNECT_TIMER       0xcbf8
+#define USB_BURST_SIZE          0xcfc0
 #define USB_USB_CTRL            0xd406
 #define USB_PHY_CTRL            0xd408
 #define USB_TX_AGG              0xd40a
@@ -170,6 +177,9 @@
 #define TXFIFO_THR_NORMAL       0x00400008
 #define TXFIFO_THR_NORMAL2      0x01000008
 
+/* PLA_DMY_REG0 */
+#define ECM_ALDPS               0x0002
+
 /* PLA_FMC */
 #define FMC_FCR_MCU_EN          0x0001
 
@@ -289,6 +299,20 @@
 /* PLA_BOOT_CTRL */
 #define AUTOLOAD_DONE           0x0002
 
+/* USB_USB2PHY */
+#define USB2PHY_SUSPEND         0x0001
+#define USB2PHY_L1              0x0002
+
+/* USB_SSPHYLINK2 */
+#define pwd_dn_scale_mask       0x3ffe
+#define pwd_dn_scale(x)         ((x) << 1)
+
+/* USB_CSR_DUMMY1 */
+#define DYNAMIC_BURST           0x0001
+
+/* USB_CSR_DUMMY2 */
+#define EP4_FULL_FC             0x0001
+
 /* USB_DEV_STAT */
 #define STAT_SPEED_MASK         0x0006
 #define STAT_SPEED_HIGH         0x0000
@@ -334,9 +358,13 @@
 #define TIMER11_EN              0x0001
 
 /* USB_LPM_CTRL */
+/* bit 4 ~ 5: fifo empty boundary */
+#define FIFO_EMPTY_1FB          0x30    /* 0x1fb * 64 = 32448 bytes */
+/* bit 2 ~ 3: LMP timer */
 #define LPM_TIMER_MASK          0x0c
 #define LPM_TIMER_500MS         0x04    /* 500 ms */
 #define LPM_TIMER_500US         0x0c    /* 500 us */
+#define ROK_EXIT_LPM            0x02
 
 /* USB_AFE_CTRL2 */
 #define SEN_VAL_MASK            0xf800
@@ -3230,6 +3258,32 @@ static void r8153_init(struct r8152 *tp)
 
         r8153_u2p3en(tp, false);
 
+        if (tp->version == RTL_VER_04) {
+                ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_SSPHYLINK2);
+                ocp_data &= ~pwd_dn_scale_mask;
+                ocp_data |= pwd_dn_scale(96);
+                ocp_write_word(tp, MCU_TYPE_USB, USB_SSPHYLINK2, ocp_data);
+
+                ocp_data = ocp_read_byte(tp, MCU_TYPE_USB, USB_USB2PHY);
+                ocp_data |= USB2PHY_L1 | USB2PHY_SUSPEND;
+                ocp_write_byte(tp, MCU_TYPE_USB, USB_USB2PHY, ocp_data);
+        } else if (tp->version == RTL_VER_05) {
+                ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_DMY_REG0);
+                ocp_data &= ~ECM_ALDPS;
+                ocp_write_byte(tp, MCU_TYPE_PLA, PLA_DMY_REG0, ocp_data);
+
+                ocp_data = ocp_read_byte(tp, MCU_TYPE_USB, USB_CSR_DUMMY1);
+                if (ocp_read_word(tp, MCU_TYPE_USB, USB_BURST_SIZE) == 0)
+                        ocp_data &= ~DYNAMIC_BURST;
+                else
+                        ocp_data |= DYNAMIC_BURST;
+                ocp_write_byte(tp, MCU_TYPE_USB, USB_CSR_DUMMY1, ocp_data);
+        }
+
+        ocp_data = ocp_read_byte(tp, MCU_TYPE_USB, USB_CSR_DUMMY2);
+        ocp_data |= EP4_FULL_FC;
+        ocp_write_byte(tp, MCU_TYPE_USB, USB_CSR_DUMMY2, ocp_data);
+
         ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_WDT11_CTRL);
         ocp_data &= ~TIMER11_EN;
         ocp_write_word(tp, MCU_TYPE_USB, USB_WDT11_CTRL, ocp_data);
@@ -3238,8 +3292,7 @@ static void r8153_init(struct r8152 *tp)
         ocp_data &= ~LED_MODE_MASK;
         ocp_write_word(tp, MCU_TYPE_PLA, PLA_LED_FEATURE, ocp_data);
 
-        ocp_data = ocp_read_byte(tp, MCU_TYPE_USB, USB_LPM_CTRL);
-        ocp_data &= ~LPM_TIMER_MASK;
+        ocp_data = FIFO_EMPTY_1FB | ROK_EXIT_LPM;
         if (tp->version == RTL_VER_04 && tp->udev->speed != USB_SPEED_SUPER)
                 ocp_data |= LPM_TIMER_500MS;
         else
@@ -3251,6 +3304,8 @@ static void r8153_init(struct r8152 *tp)
         ocp_data |= SEN_VAL_NORMAL | SEL_RXIDLE;
         ocp_write_word(tp, MCU_TYPE_USB, USB_AFE_CTRL2, ocp_data);
 
+        ocp_write_word(tp, MCU_TYPE_USB, USB_CONNECT_TIMER, 0x0001);
+
         r8153_power_cut_en(tp, false);
         r8153_u1u2en(tp, true);
 
diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
index 0e57e862c399..1e0a775ea882 100644
--- a/drivers/net/vxlan.c
+++ b/drivers/net/vxlan.c
@@ -555,12 +555,13 @@ static int vxlan_fdb_append(struct vxlan_fdb *f,
 static struct vxlanhdr *vxlan_gro_remcsum(struct sk_buff *skb,
                                           unsigned int off,
                                           struct vxlanhdr *vh, size_t hdrlen,
-                                          u32 data)
+                                          u32 data, struct gro_remcsum *grc,
+                                          bool nopartial)
 {
         size_t start, offset, plen;
 
         if (skb->remcsum_offload)
-                return vh;
+                return NULL;
 
         if (!NAPI_GRO_CB(skb)->csum_valid)
                 return NULL;
@@ -579,7 +580,8 @@ static struct vxlanhdr *vxlan_gro_remcsum(struct sk_buff *skb,
                         return NULL;
         }
 
-        skb_gro_remcsum_process(skb, (void *)vh + hdrlen, start, offset);
+        skb_gro_remcsum_process(skb, (void *)vh + hdrlen,
+                                start, offset, grc, nopartial);
 
         skb->remcsum_offload = 1;
 
@@ -597,6 +599,9 @@ static struct sk_buff **vxlan_gro_receive(struct sk_buff **head,
         struct vxlan_sock *vs = container_of(uoff, struct vxlan_sock,
                                              udp_offloads);
         u32 flags;
+        struct gro_remcsum grc;
+
+        skb_gro_remcsum_init(&grc);
 
         off_vx = skb_gro_offset(skb);
         hlen = off_vx + sizeof(*vh);
@@ -614,7 +619,9 @@ static struct sk_buff **vxlan_gro_receive(struct sk_buff **head,
 
         if ((flags & VXLAN_HF_RCO) && (vs->flags & VXLAN_F_REMCSUM_RX)) {
                 vh = vxlan_gro_remcsum(skb, off_vx, vh, sizeof(struct vxlanhdr),
-                                       ntohl(vh->vx_vni));
+                                       ntohl(vh->vx_vni), &grc,
+                                       !!(vs->flags &
+                                          VXLAN_F_REMCSUM_NOPARTIAL));
 
                 if (!vh)
                         goto out;
@@ -637,6 +644,7 @@ static struct sk_buff **vxlan_gro_receive(struct sk_buff **head,
         pp = eth_gro_receive(head, skb);
 
 out:
+        skb_gro_remcsum_cleanup(skb, &grc);
         NAPI_GRO_CB(skb)->flush |= flush;
 
         return pp;
@@ -1150,16 +1158,10 @@ static void vxlan_igmp_leave(struct work_struct *work)
 }
 
 static struct vxlanhdr *vxlan_remcsum(struct sk_buff *skb, struct vxlanhdr *vh,
-                                      size_t hdrlen, u32 data)
+                                      size_t hdrlen, u32 data, bool nopartial)
 {
         size_t start, offset, plen;
 
-        if (skb->remcsum_offload) {
-                /* Already processed in GRO path */
-                skb->remcsum_offload = 0;
-                return vh;
-        }
-
         start = (data & VXLAN_RCO_MASK) << VXLAN_RCO_SHIFT;
         offset = start + ((data & VXLAN_RCO_UDP) ?
                           offsetof(struct udphdr, check) :
@@ -1172,7 +1174,8 @@ static struct vxlanhdr *vxlan_remcsum(struct sk_buff *skb, struct vxlanhdr *vh,
 
         vh = (struct vxlanhdr *)(udp_hdr(skb) + 1);
 
-        skb_remcsum_process(skb, (void *)vh + hdrlen, start, offset);
+        skb_remcsum_process(skb, (void *)vh + hdrlen, start, offset,
+                            nopartial);
 
         return vh;
 }
@@ -1209,7 +1212,8 @@ static int vxlan_udp_encap_recv(struct sock *sk, struct sk_buff *skb)
                 goto drop;
 
         if ((flags & VXLAN_HF_RCO) && (vs->flags & VXLAN_F_REMCSUM_RX)) {
-                vxh = vxlan_remcsum(skb, vxh, sizeof(struct vxlanhdr), vni);
+                vxh = vxlan_remcsum(skb, vxh, sizeof(struct vxlanhdr), vni,
+                                    !!(vs->flags & VXLAN_F_REMCSUM_NOPARTIAL));
                 if (!vxh)
                         goto drop;
 
@@ -2438,6 +2442,7 @@ static const struct nla_policy vxlan_policy[IFLA_VXLAN_MAX + 1] = {
         [IFLA_VXLAN_REMCSUM_TX] = { .type = NLA_U8 },
         [IFLA_VXLAN_REMCSUM_RX] = { .type = NLA_U8 },
         [IFLA_VXLAN_GBP]        = { .type = NLA_FLAG, },
+        [IFLA_VXLAN_REMCSUM_NOPARTIAL]  = { .type = NLA_FLAG },
 };
 
 static int vxlan_validate(struct nlattr *tb[], struct nlattr *data[])
@@ -2761,6 +2766,9 @@ static int vxlan_newlink(struct net *src_net, struct net_device *dev,
         if (data[IFLA_VXLAN_GBP])
                 vxlan->flags |= VXLAN_F_GBP;
 
+        if (data[IFLA_VXLAN_REMCSUM_NOPARTIAL])
+                vxlan->flags |= VXLAN_F_REMCSUM_NOPARTIAL;
+
         if (vxlan_find_vni(src_net, vni, use_ipv6 ? AF_INET6 : AF_INET,
                            vxlan->dst_port, vxlan->flags)) {
                 pr_info("duplicate VNI %u\n", vni);
@@ -2910,6 +2918,10 @@ static int vxlan_fill_info(struct sk_buff *skb, const struct net_device *dev)
             nla_put_flag(skb, IFLA_VXLAN_GBP))
                 goto nla_put_failure;
 
+        if (vxlan->flags & VXLAN_F_REMCSUM_NOPARTIAL &&
+            nla_put_flag(skb, IFLA_VXLAN_REMCSUM_NOPARTIAL))
+                goto nla_put_failure;
+
         return 0;
 
 nla_put_failure:
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index 2c9088633ec6..ccbdb05b28cd 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -127,7 +127,7 @@ static const struct bcma_device_id b43_bcma_tbl[] = {
         BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 0x1E, BCMA_ANY_CLASS),
         BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 0x28, BCMA_ANY_CLASS),
         BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 0x2A, BCMA_ANY_CLASS),
-        BCMA_CORETABLE_END
+        {},
 };
 MODULE_DEVICE_TABLE(bcma, b43_bcma_tbl);
 #endif
@@ -144,7 +144,7 @@ static const struct ssb_device_id b43_ssb_tbl[] = {
         SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_80211, 13),
         SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_80211, 15),
         SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_80211, 16),
-        SSB_DEVTABLE_END
+        {},
 };
 MODULE_DEVICE_TABLE(ssb, b43_ssb_tbl);
 #endif
diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c
index 1aec2146a2bf..4e58c0069830 100644
--- a/drivers/net/wireless/b43legacy/main.c
+++ b/drivers/net/wireless/b43legacy/main.c
@@ -86,7 +86,7 @@ MODULE_PARM_DESC(fwpostfix, "Postfix for the firmware files to load.");
 static const struct ssb_device_id b43legacy_ssb_tbl[] = {
         SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_80211, 2),
         SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_80211, 4),
-        SSB_DEVTABLE_END
+        {},
 };
 MODULE_DEVICE_TABLE(ssb, b43legacy_ssb_tbl);
 
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
index f95b52442281..48135063347e 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
@@ -99,7 +99,7 @@ static struct bcma_device_id brcms_coreid_table[] = {
         BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 17, BCMA_ANY_CLASS),
         BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 23, BCMA_ANY_CLASS),
         BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 24, BCMA_ANY_CLASS),
-        BCMA_CORETABLE_END
+        {},
 };
 MODULE_DEVICE_TABLE(bcma, brcms_coreid_table);
 
diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c
index ec456f0d972e..a62170ea0481 100644
--- a/drivers/net/wireless/rtlwifi/pci.c
+++ b/drivers/net/wireless/rtlwifi/pci.c
@@ -822,11 +822,8 @@ static void _rtl_pci_rx_interrupt(struct ieee80211_hw *hw)
 
                 /* get a new skb - if fail, old one will be reused */
                 new_skb = dev_alloc_skb(rtlpci->rxbuffersize);
-                if (unlikely(!new_skb)) {
-                        pr_err("Allocation of new skb failed in %s\n",
-                               __func__);
+                if (unlikely(!new_skb))
                         goto no_new;
-                }
                 if (rtlpriv->use_new_trx_flow) {
                         buffer_desc =
                           &rtlpci->rx_ring[rxring_idx].buffer_desc