bnxt_en: Check for NULL rx or tx ring.

Each bnxt_napi structure may no longer be having both an rx ring and
a tx ring.  Check for a valid ring before using it.

Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 8635e0323dbd90eb7b5d8b99824abe283c3287f2..11478c912b1dcc6d917c490ea2b2799048a18f11 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -1867,6 +1867,9 @@ static void bnxt_init_ring_struct(struct bnxt *bp)
                ring->vmem_size = 0;
 
                rxr = bnapi->rx_ring;
+               if (!rxr)
+                       goto skip_rx;
+
                ring = &rxr->rx_ring_struct;
                ring->nr_pages = bp->rx_nr_pages;
                ring->page_size = HW_RXBD_RING_SIZE;
@@ -1883,7 +1886,11 @@ static void bnxt_init_ring_struct(struct bnxt *bp)
                ring->vmem_size = SW_RXBD_AGG_RING_SIZE * bp->rx_agg_nr_pages;
                ring->vmem = (void **)&rxr->rx_agg_ring;
 
+skip_rx:
                txr = bnapi->tx_ring;
+               if (!txr)
+                       continue;
+
                ring = &txr->tx_ring_struct;
                ring->nr_pages = bp->tx_nr_pages;
                ring->page_size = HW_RXBD_RING_SIZE;
@@ -2400,13 +2407,17 @@ static void bnxt_clear_ring_indices(struct bnxt *bp)
                cpr->cp_raw_cons = 0;
 
                txr = bnapi->tx_ring;
-               txr->tx_prod = 0;
-               txr->tx_cons = 0;
+               if (txr) {
+                       txr->tx_prod = 0;
+                       txr->tx_cons = 0;
+               }
 
                rxr = bnapi->rx_ring;
-               rxr->rx_prod = 0;
-               rxr->rx_agg_prod = 0;
-               rxr->rx_sw_agg_prod = 0;
+               if (rxr) {
+                       rxr->rx_prod = 0;
+                       rxr->rx_agg_prod = 0;
+                       rxr->rx_sw_agg_prod = 0;
+               }
        }
 }
 
@@ -4999,6 +5010,9 @@ static void bnxt_dump_tx_sw_state(struct bnxt_napi *bnapi)
        struct bnxt_tx_ring_info *txr = bnapi->tx_ring;
        int i = bnapi->index;
 
+       if (!txr)
+               return;
+
        netdev_info(bnapi->bp->dev, "[%d]: tx{fw_ring: %d prod: %x cons: %x}\n",
                    i, txr->tx_ring_struct.fw_ring_id, txr->tx_prod,
                    txr->tx_cons);
@@ -5009,6 +5023,9 @@ static void bnxt_dump_rx_sw_state(struct bnxt_napi *bnapi)
        struct bnxt_rx_ring_info *rxr = bnapi->rx_ring;
        int i = bnapi->index;
 
+       if (!rxr)
+               return;
+
        netdev_info(bnapi->bp->dev, "[%d]: rx{fw_ring: %d prod: %x} rx_agg{fw_ring: %d agg_prod: %x sw_agg_prod: %x}\n",
                    i, rxr->rx_ring_struct.fw_ring_id, rxr->rx_prod,
                    rxr->rx_agg_ring_struct.fw_ring_id, rxr->rx_agg_prod,