16 files changed, 175 insertions, 45 deletions

diff --git a/arch/arm64/net/bpf_jit_comp.c b/arch/arm64/net/bpf_jit_comp.c
index a34420a5df9a..b405bbb54431 100644
--- a/arch/arm64/net/bpf_jit_comp.c
+++ b/arch/arm64/net/bpf_jit_comp.c
@@ -476,6 +476,7 @@ emit_cond_jmp:
                 case BPF_JGE:
                         jmp_cond = A64_COND_CS;
                         break;
+                case BPF_JSET:
                 case BPF_JNE:
                         jmp_cond = A64_COND_NE;
                         break;
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_cle.c b/drivers/net/ethernet/apm/xgene/xgene_enet_cle.c
index b212488606da..11be8044e0d7 100644
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_cle.c
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_cle.c
@@ -43,6 +43,7 @@ static void xgene_cle_idt_to_hw(u32 dstqid, u32 fpsel,
 static void xgene_cle_dbptr_to_hw(struct xgene_enet_pdata *pdata,
                                   struct xgene_cle_dbptr *dbptr, u32 *buf)
 {
+        buf[0] = SET_VAL(CLE_DROP, dbptr->drop);
         buf[4] = SET_VAL(CLE_FPSEL, dbptr->fpsel) |
                  SET_VAL(CLE_DSTQIDL, dbptr->dstqid);
 
@@ -412,7 +413,7 @@ static int xgene_enet_cle_init(struct xgene_enet_pdata *pdata)
                         .branch = {
                                 {
                                         /* IPV4 */
-                                        .valid = 0,
+                                        .valid = 1,
                                         .next_packet_pointer = 22,
                                         .jump_bw = JMP_FW,
                                         .jump_rel = JMP_ABS,
@@ -420,7 +421,7 @@ static int xgene_enet_cle_init(struct xgene_enet_pdata *pdata)
                                         .next_node = PKT_PROT_NODE,
                                         .next_branch = 0,
                                         .data = 0x8,
-                                        .mask = 0xffff
+                                        .mask = 0x0
                                 },
                                 {
                                         .valid = 0,
@@ -456,7 +457,7 @@ static int xgene_enet_cle_init(struct xgene_enet_pdata *pdata)
                                         .next_node = RSS_IPV4_TCP_NODE,
                                         .next_branch = 0,
                                         .data = 0x0600,
-                                        .mask = 0xffff
+                                        .mask = 0x00ff
                                 },
                                 {
                                         /* UDP */
@@ -468,7 +469,7 @@ static int xgene_enet_cle_init(struct xgene_enet_pdata *pdata)
                                         .next_node = RSS_IPV4_UDP_NODE,
                                         .next_branch = 0,
                                         .data = 0x1100,
-                                        .mask = 0xffff
+                                        .mask = 0x00ff
                                 },
                                 {
                                         .valid = 0,
@@ -642,7 +643,7 @@ static int xgene_enet_cle_init(struct xgene_enet_pdata *pdata)
                                 {
                                         /* TCP DST Port */
                                         .valid = 0,
-                                        .next_packet_pointer = 256,
+                                        .next_packet_pointer = 258,
                                         .jump_bw = JMP_FW,
                                         .jump_rel = JMP_ABS,
                                         .operation = EQT,
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_cle.h b/drivers/net/ethernet/apm/xgene/xgene_enet_cle.h
index 29a17abdd828..3bf90683240e 100644
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_cle.h
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_cle.h
@@ -83,6 +83,8 @@
 #define CLE_TYPE_POS            0
 #define CLE_TYPE_LEN            2
 
+#define CLE_DROP_POS            28
+#define CLE_DROP_LEN            1
 #define CLE_DSTQIDL_POS         25
 #define CLE_DSTQIDL_LEN         7
 #define CLE_DSTQIDH_POS         0
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c b/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c
index 39e081a70f5b..513d2a62ee6d 100644
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c
@@ -219,27 +219,30 @@ void xgene_enet_parse_error(struct xgene_enet_desc_ring *ring,
                             struct xgene_enet_pdata *pdata,
                             enum xgene_enet_err_code status)
 {
-        struct rtnl_link_stats64 *stats = &pdata->stats;
-
         switch (status) {
         case INGRESS_CRC:
-                stats->rx_crc_errors++;
+                ring->rx_crc_errors++;
+                ring->rx_dropped++;
                 break;
         case INGRESS_CHECKSUM:
         case INGRESS_CHECKSUM_COMPUTE:
-                stats->rx_errors++;
+                ring->rx_errors++;
+                ring->rx_dropped++;
                 break;
         case INGRESS_TRUNC_FRAME:
-                stats->rx_frame_errors++;
+                ring->rx_frame_errors++;
+                ring->rx_dropped++;
                 break;
         case INGRESS_PKT_LEN:
-                stats->rx_length_errors++;
+                ring->rx_length_errors++;
+                ring->rx_dropped++;
                 break;
         case INGRESS_PKT_UNDER:
-                stats->rx_frame_errors++;
+                ring->rx_frame_errors++;
+                ring->rx_dropped++;
                 break;
         case INGRESS_FIFO_OVERRUN:
-                stats->rx_fifo_errors++;
+                ring->rx_fifo_errors++;
                 break;
         default:
                 break;
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_hw.h b/drivers/net/ethernet/apm/xgene/xgene_enet_hw.h
index ba7da98af2ef..45220be3122f 100644
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_hw.h
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_hw.h
@@ -86,7 +86,7 @@ enum xgene_enet_rm {
 #define RINGADDRL_POS           5
 #define RINGADDRL_LEN           27
 #define RINGADDRH_POS           0
-#define RINGADDRH_LEN           6
+#define RINGADDRH_LEN           7
 #define RINGSIZE_POS            23
 #define RINGSIZE_LEN            3
 #define RINGTYPE_POS            19
@@ -94,9 +94,9 @@ enum xgene_enet_rm {
 #define RINGMODE_POS            20
 #define RINGMODE_LEN            3
 #define RECOMTIMEOUTL_POS       28
-#define RECOMTIMEOUTL_LEN       3
+#define RECOMTIMEOUTL_LEN       4
 #define RECOMTIMEOUTH_POS       0
-#define RECOMTIMEOUTH_LEN       2
+#define RECOMTIMEOUTH_LEN       3
 #define NUMMSGSINQ_POS          1
 #define NUMMSGSINQ_LEN          16
 #define ACCEPTLERR              BIT(19)
@@ -201,6 +201,8 @@ enum xgene_enet_rm {
 #define USERINFO_LEN                    32
 #define FPQNUM_POS                      32
 #define FPQNUM_LEN                      12
+#define ELERR_POS                       46
+#define ELERR_LEN                       2
 #define NV_POS                          50
 #define NV_LEN                          1
 #define LL_POS                          51
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
index 99d7e580e166..fd200883d228 100644
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
@@ -443,8 +443,8 @@ static netdev_tx_t xgene_enet_start_xmit(struct sk_buff *skb,
 
         skb_tx_timestamp(skb);
 
-        pdata->stats.tx_packets++;
-        pdata->stats.tx_bytes += skb->len;
+        tx_ring->tx_packets++;
+        tx_ring->tx_bytes += skb->len;
 
         pdata->ring_ops->wr_cmd(tx_ring, count);
         return NETDEV_TX_OK;
@@ -483,12 +483,12 @@ static int xgene_enet_rx_frame(struct xgene_enet_desc_ring *rx_ring,
         skb = buf_pool->rx_skb[skb_index];
 
         /* checking for error */
-        status = GET_VAL(LERR, le64_to_cpu(raw_desc->m0));
+        status = (GET_VAL(ELERR, le64_to_cpu(raw_desc->m0)) << LERR_LEN) ||
+                  GET_VAL(LERR, le64_to_cpu(raw_desc->m0));
         if (unlikely(status > 2)) {
                 dev_kfree_skb_any(skb);
                 xgene_enet_parse_error(rx_ring, netdev_priv(rx_ring->ndev),
                                        status);
-                pdata->stats.rx_dropped++;
                 ret = -EIO;
                 goto out;
         }
@@ -506,8 +506,8 @@ static int xgene_enet_rx_frame(struct xgene_enet_desc_ring *rx_ring,
                 xgene_enet_skip_csum(skb);
         }
 
-        pdata->stats.rx_packets++;
-        pdata->stats.rx_bytes += datalen;
+        rx_ring->rx_packets++;
+        rx_ring->rx_bytes += datalen;
         napi_gro_receive(&rx_ring->napi, skb);
 out:
         if (--rx_ring->nbufpool == 0) {
@@ -630,7 +630,7 @@ static int xgene_enet_register_irq(struct net_device *ndev)
                 ring = pdata->rx_ring[i];
                 irq_set_status_flags(ring->irq, IRQ_DISABLE_UNLAZY);
                 ret = devm_request_irq(dev, ring->irq, xgene_enet_rx_irq,
-                                       IRQF_SHARED, ring->irq_name, ring);
+                                       0, ring->irq_name, ring);
                 if (ret) {
                         netdev_err(ndev, "Failed to request irq %s\n",
                                    ring->irq_name);
@@ -641,7 +641,7 @@ static int xgene_enet_register_irq(struct net_device *ndev)
                 ring = pdata->tx_ring[i]->cp_ring;
                 irq_set_status_flags(ring->irq, IRQ_DISABLE_UNLAZY);
                 ret = devm_request_irq(dev, ring->irq, xgene_enet_rx_irq,
-                                       IRQF_SHARED, ring->irq_name, ring);
+                                       0, ring->irq_name, ring);
                 if (ret) {
                         netdev_err(ndev, "Failed to request irq %s\n",
                                    ring->irq_name);
@@ -1114,12 +1114,31 @@ static struct rtnl_link_stats64 *xgene_enet_get_stats64(
 {
         struct xgene_enet_pdata *pdata = netdev_priv(ndev);
         struct rtnl_link_stats64 *stats = &pdata->stats;
+        struct xgene_enet_desc_ring *ring;
+        int i;
 
-        stats->rx_errors += stats->rx_length_errors +
-                            stats->rx_crc_errors +
-                            stats->rx_frame_errors +
-                            stats->rx_fifo_errors;
-        memcpy(storage, &pdata->stats, sizeof(struct rtnl_link_stats64));
+        memset(stats, 0, sizeof(struct rtnl_link_stats64));
+        for (i = 0; i < pdata->txq_cnt; i++) {
+                ring = pdata->tx_ring[i];
+                if (ring) {
+                        stats->tx_packets += ring->tx_packets;
+                        stats->tx_bytes += ring->tx_bytes;
+                }
+        }
+
+        for (i = 0; i < pdata->rxq_cnt; i++) {
+                ring = pdata->rx_ring[i];
+                if (ring) {
+                        stats->rx_packets += ring->rx_packets;
+                        stats->rx_bytes += ring->rx_bytes;
+                        stats->rx_errors += ring->rx_length_errors +
+                                ring->rx_crc_errors +
+                                ring->rx_frame_errors +
+                                ring->rx_fifo_errors;
+                        stats->rx_dropped += ring->rx_dropped;
+                }
+        }
+        memcpy(storage, stats, sizeof(struct rtnl_link_stats64));
 
         return storage;
 }
@@ -1234,6 +1253,13 @@ static int xgene_enet_get_irqs(struct xgene_enet_pdata *pdata)
         for (i = 0; i < max_irqs; i++) {
                 ret = platform_get_irq(pdev, i);
                 if (ret <= 0) {
+                        if (pdata->phy_mode == PHY_INTERFACE_MODE_XGMII) {
+                                max_irqs = i;
+                                pdata->rxq_cnt = max_irqs / 2;
+                                pdata->txq_cnt = max_irqs / 2;
+                                pdata->cq_cnt = max_irqs / 2;
+                                break;
+                        }
                         dev_err(dev, "Unable to get ENET IRQ\n");
                         ret = ret ? : -ENXIO;
                         return ret;
@@ -1437,19 +1463,28 @@ static void xgene_enet_setup_ops(struct xgene_enet_pdata *pdata)
                 pdata->port_ops = &xgene_xgport_ops;
                 pdata->cle_ops = &xgene_cle3in_ops;
                 pdata->rm = RM0;
-                pdata->rxq_cnt = XGENE_NUM_RX_RING;
-                pdata->txq_cnt = XGENE_NUM_TX_RING;
-                pdata->cq_cnt = XGENE_NUM_TXC_RING;
+                if (!pdata->rxq_cnt) {
+                        pdata->rxq_cnt = XGENE_NUM_RX_RING;
+                        pdata->txq_cnt = XGENE_NUM_TX_RING;
+                        pdata->cq_cnt = XGENE_NUM_TXC_RING;
+                }
                 break;
         }
 
         if (pdata->enet_id == XGENE_ENET1) {
                 switch (pdata->port_id) {
                 case 0:
-                        pdata->cpu_bufnum = START_CPU_BUFNUM_0;
-                        pdata->eth_bufnum = START_ETH_BUFNUM_0;
-                        pdata->bp_bufnum = START_BP_BUFNUM_0;
-                        pdata->ring_num = START_RING_NUM_0;
+                        if (pdata->phy_mode == PHY_INTERFACE_MODE_XGMII) {
+                                pdata->cpu_bufnum = X2_START_CPU_BUFNUM_0;
+                                pdata->eth_bufnum = X2_START_ETH_BUFNUM_0;
+                                pdata->bp_bufnum = X2_START_BP_BUFNUM_0;
+                                pdata->ring_num = START_RING_NUM_0;
+                        } else {
+                                pdata->cpu_bufnum = START_CPU_BUFNUM_0;
+                                pdata->eth_bufnum = START_ETH_BUFNUM_0;
+                                pdata->bp_bufnum = START_BP_BUFNUM_0;
+                                pdata->ring_num = START_RING_NUM_0;
+                        }
                         break;
                 case 1:
                         if (pdata->phy_mode == PHY_INTERFACE_MODE_XGMII) {
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.h b/drivers/net/ethernet/apm/xgene/xgene_enet_main.h
index 175d18890c7a..9d9cf445148c 100644
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.h
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.h
@@ -49,10 +49,10 @@
 #define XGENE_ENET_MSS  1448
 #define XGENE_MIN_ENET_FRAME_SIZE       60
 
-#define XGENE_MAX_ENET_IRQ      8
-#define XGENE_NUM_RX_RING       4
-#define XGENE_NUM_TX_RING       4
-#define XGENE_NUM_TXC_RING      4
+#define XGENE_MAX_ENET_IRQ      16
+#define XGENE_NUM_RX_RING       8
+#define XGENE_NUM_TX_RING       8
+#define XGENE_NUM_TXC_RING      8
 
 #define START_CPU_BUFNUM_0      0
 #define START_ETH_BUFNUM_0      2
@@ -121,6 +121,16 @@ struct xgene_enet_desc_ring {
                 struct xgene_enet_raw_desc16 *raw_desc16;
         };
         __le64 *exp_bufs;
+        u64 tx_packets;
+        u64 tx_bytes;
+        u64 rx_packets;
+        u64 rx_bytes;
+        u64 rx_dropped;
+        u64 rx_errors;
+        u64 rx_length_errors;
+        u64 rx_crc_errors;
+        u64 rx_frame_errors;
+        u64 rx_fifo_errors;
 };
 
 struct xgene_mac_ops {
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.h b/drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.h
index 29a71b4dcc44..002df5a6756e 100644
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.h
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.h
@@ -33,7 +33,7 @@
 #define LINK_STATUS                     BIT(2)
 #define LINK_UP                         BIT(15)
 #define MPA_IDLE_WITH_QMI_EMPTY         BIT(12)
-#define SG_RX_DV_GATE_REG_0_ADDR        0x0dfc
+#define SG_RX_DV_GATE_REG_0_ADDR        0x05fc
 
 extern const struct xgene_mac_ops xgene_sgmac_ops;
 extern const struct xgene_port_ops xgene_sgport_ops;
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 9d4e8e113fe1..c39a7f5c6a01 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -813,6 +813,46 @@ static inline struct sk_buff *bnxt_copy_skb(struct bnxt_napi *bnapi, u8 *data,
         return skb;
 }
 
+static int bnxt_discard_rx(struct bnxt *bp, struct bnxt_napi *bnapi,
+                           u32 *raw_cons, void *cmp)
+{
+        struct bnxt_cp_ring_info *cpr = &bnapi->cp_ring;
+        struct rx_cmp *rxcmp = cmp;
+        u32 tmp_raw_cons = *raw_cons;
+        u8 cmp_type, agg_bufs = 0;
+
+        cmp_type = RX_CMP_TYPE(rxcmp);
+
+        if (cmp_type == CMP_TYPE_RX_L2_CMP) {
+                agg_bufs = (le32_to_cpu(rxcmp->rx_cmp_misc_v1) &
+                            RX_CMP_AGG_BUFS) >>
+                           RX_CMP_AGG_BUFS_SHIFT;
+        } else if (cmp_type == CMP_TYPE_RX_L2_TPA_END_CMP) {
+                struct rx_tpa_end_cmp *tpa_end = cmp;
+
+                agg_bufs = (le32_to_cpu(tpa_end->rx_tpa_end_cmp_misc_v1) &
+                            RX_TPA_END_CMP_AGG_BUFS) >>
+                           RX_TPA_END_CMP_AGG_BUFS_SHIFT;
+        }
+
+        if (agg_bufs) {
+                if (!bnxt_agg_bufs_valid(bp, cpr, agg_bufs, &tmp_raw_cons))
+                        return -EBUSY;
+        }
+        *raw_cons = tmp_raw_cons;
+        return 0;
+}
+
+static void bnxt_sched_reset(struct bnxt *bp, struct bnxt_rx_ring_info *rxr)
+{
+        if (!rxr->bnapi->in_reset) {
+                rxr->bnapi->in_reset = true;
+                set_bit(BNXT_RESET_TASK_SP_EVENT, &bp->sp_event);
+                schedule_work(&bp->sp_task);
+        }
+        rxr->rx_next_cons = 0xffff;
+}
+
 static void bnxt_tpa_start(struct bnxt *bp, struct bnxt_rx_ring_info *rxr,
                            struct rx_tpa_start_cmp *tpa_start,
                            struct rx_tpa_start_cmp_ext *tpa_start1)
@@ -830,6 +870,11 @@ static void bnxt_tpa_start(struct bnxt *bp, struct bnxt_rx_ring_info *rxr,
         prod_rx_buf = &rxr->rx_buf_ring[prod];
         tpa_info = &rxr->rx_tpa[agg_id];
 
+        if (unlikely(cons != rxr->rx_next_cons)) {
+                bnxt_sched_reset(bp, rxr);
+                return;
+        }
+
         prod_rx_buf->data = tpa_info->data;
 
         mapping = tpa_info->mapping;
@@ -867,6 +912,7 @@ static void bnxt_tpa_start(struct bnxt *bp, struct bnxt_rx_ring_info *rxr,
 
         rxr->rx_prod = NEXT_RX(prod);
         cons = NEXT_RX(cons);
+        rxr->rx_next_cons = NEXT_RX(cons);
         cons_rx_buf = &rxr->rx_buf_ring[cons];
 
         bnxt_reuse_rx_data(rxr, cons, cons_rx_buf->data);
@@ -980,6 +1026,14 @@ static inline struct sk_buff *bnxt_tpa_end(struct bnxt *bp,
         dma_addr_t mapping;
         struct sk_buff *skb;
 
+        if (unlikely(bnapi->in_reset)) {
+                int rc = bnxt_discard_rx(bp, bnapi, raw_cons, tpa_end);
+
+                if (rc < 0)
+                        return ERR_PTR(-EBUSY);
+                return NULL;
+        }
+
         tpa_info = &rxr->rx_tpa[agg_id];
         data = tpa_info->data;
         prefetch(data);
@@ -1146,6 +1200,12 @@ static int bnxt_rx_pkt(struct bnxt *bp, struct bnxt_napi *bnapi, u32 *raw_cons,
         cons = rxcmp->rx_cmp_opaque;
         rx_buf = &rxr->rx_buf_ring[cons];
         data = rx_buf->data;
+        if (unlikely(cons != rxr->rx_next_cons)) {
+                int rc1 = bnxt_discard_rx(bp, bnapi, raw_cons, rxcmp);
+
+                bnxt_sched_reset(bp, rxr);
+                return rc1;
+        }
         prefetch(data);
 
         agg_bufs = (le32_to_cpu(rxcmp->rx_cmp_misc_v1) & RX_CMP_AGG_BUFS) >>
@@ -1245,6 +1305,7 @@ static int bnxt_rx_pkt(struct bnxt *bp, struct bnxt_napi *bnapi, u32 *raw_cons,
 
 next_rx:
         rxr->rx_prod = NEXT_RX(prod);
+        rxr->rx_next_cons = NEXT_RX(cons);
 
 next_rx_no_prod:
         *raw_cons = tmp_raw_cons;
@@ -2486,6 +2547,7 @@ static void bnxt_clear_ring_indices(struct bnxt *bp)
                         rxr->rx_prod = 0;
                         rxr->rx_agg_prod = 0;
                         rxr->rx_sw_agg_prod = 0;
+                        rxr->rx_next_cons = 0;
                 }
         }
 }
@@ -4462,6 +4524,7 @@ static void bnxt_enable_napi(struct bnxt *bp)
         int i;
 
         for (i = 0; i < bp->cp_nr_rings; i++) {
+                bp->bnapi[i]->in_reset = false;
                 bnxt_enable_poll(bp->bnapi[i]);
                 napi_enable(&bp->bnapi[i]->napi);
         }
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
index 8b823ff558ff..de9d53eee3dd 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.h
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
@@ -584,6 +584,7 @@ struct bnxt_rx_ring_info {
         u16                     rx_prod;
         u16                     rx_agg_prod;
         u16                     rx_sw_agg_prod;
+        u16                     rx_next_cons;
         void __iomem            *rx_doorbell;
         void __iomem            *rx_agg_doorbell;
 
@@ -636,6 +637,7 @@ struct bnxt_napi {
 #ifdef CONFIG_NET_RX_BUSY_POLL
         atomic_t                poll_state;
 #endif
+        bool                    in_reset;
 };
 
 #ifdef CONFIG_NET_RX_BUSY_POLL
diff --git a/drivers/net/ethernet/marvell/Kconfig b/drivers/net/ethernet/marvell/Kconfig
index b5c6d42daa12..2664827ddecd 100644
--- a/drivers/net/ethernet/marvell/Kconfig
+++ b/drivers/net/ethernet/marvell/Kconfig
@@ -68,7 +68,7 @@ config MVNETA
 
 config MVNETA_BM
         tristate
-        default y if MVNETA=y && MVNETA_BM_ENABLE
+        default y if MVNETA=y && MVNETA_BM_ENABLE!=n
         default MVNETA_BM_ENABLE
         select HWBM
         help
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
index cda9e604a95f..0844b7c75767 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
@@ -1417,6 +1417,7 @@ void qlcnic_83xx_get_minidump_template(struct qlcnic_adapter *adapter)
         struct qlcnic_fw_dump *fw_dump = &ahw->fw_dump;
         struct pci_dev *pdev = adapter->pdev;
         bool extended = false;
+        int ret;
 
         prev_version = adapter->fw_version;
         current_version = qlcnic_83xx_get_fw_version(adapter);
@@ -1427,8 +1428,11 @@ void qlcnic_83xx_get_minidump_template(struct qlcnic_adapter *adapter)
                 if (qlcnic_83xx_md_check_extended_dump_capability(adapter))
                         extended = !qlcnic_83xx_extend_md_capab(adapter);
 
-                if (!qlcnic_fw_cmd_get_minidump_temp(adapter))
-                        dev_info(&pdev->dev, "Supports FW dump capability\n");
+                ret = qlcnic_fw_cmd_get_minidump_temp(adapter);
+                if (ret)
+                        return;
+
+                dev_info(&pdev->dev, "Supports FW dump capability\n");
 
                 /* Once we have minidump template with extended iSCSI dump
                  * capability, update the minidump capture mask to 0x1f as
diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c
index b42f26029225..4412a57ec862 100644
--- a/drivers/net/xen-netback/netback.c
+++ b/drivers/net/xen-netback/netback.c
@@ -711,6 +711,7 @@ static void xenvif_tx_err(struct xenvif_queue *queue,
                 if (cons == end)
                         break;
                 RING_COPY_REQUEST(&queue->tx, cons++, txp);
+                extra_count = 0; /* only the first frag can have extras */
         } while (1);
         queue->tx.req_cons = cons;
 }
diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
index d97268e8ff10..2b68418c7198 100644
--- a/net/ipv4/fib_semantics.c
+++ b/net/ipv4/fib_semantics.c
@@ -975,6 +975,8 @@ fib_convert_metrics(struct fib_info *fi, const struct fib_config *cfg)
                         val = 65535 - 40;
                 if (type == RTAX_MTU && val > 65535 - 15)
                         val = 65535 - 15;
+                if (type == RTAX_HOPLIMIT && val > 255)
+                        val = 255;
                 if (type == RTAX_FEATURES && (val & ~RTAX_FEATURE_MASK))
                         return -EINVAL;
                 fi->fib_metrics[type - 1] = val;
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index d916d6ab9ad2..6f32944e0223 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -1750,6 +1750,8 @@ static int ip6_convert_metrics(struct mx6_config *mxc,
                 } else {
                         val = nla_get_u32(nla);
                 }
+                if (type == RTAX_HOPLIMIT && val > 255)
+                        val = 255;
                 if (type == RTAX_FEATURES && (val & ~RTAX_FEATURE_MASK))
                         goto err;
 
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
index 895d11dced3c..e27fd17c6743 100644
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -1778,6 +1778,7 @@ void nf_conntrack_init_end(void)
 
 int nf_conntrack_init_net(struct net *net)
 {
+        static atomic64_t unique_id;
         int ret = -ENOMEM;
         int cpu;
 
@@ -1800,7 +1801,8 @@ int nf_conntrack_init_net(struct net *net)
         if (!net->ct.stat)
                 goto err_pcpu_lists;
 
-        net->ct.slabname = kasprintf(GFP_KERNEL, "nf_conntrack_%p", net);
+        net->ct.slabname = kasprintf(GFP_KERNEL, "nf_conntrack_%llu",
+                                (u64)atomic64_inc_return(&unique_id));
         if (!net->ct.slabname)
                 goto err_slabname;