bnxt_en: Allocate rx_cpu_rmap only if Accelerated RFS is enabled.
authorMichael Chan <mchan@broadcom.com>
Sun, 27 Dec 2015 23:19:22 +0000 (18:19 -0500)
committerDavid S. Miller <davem@davemloft.net>
Mon, 28 Dec 2015 05:57:28 +0000 (00:57 -0500)
Also, no need to check for bp->rx_nr_rings as it is always >= 1.  If the
allocation fails, it is not a fatal error and we can still proceed.

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

index 3ce3bd337bb34783c2e6f56b1e29bd7df987258b..06ce100f3c549789bc95db288d39d18765c392b2 100644 (file)
@@ -4009,10 +4009,8 @@ static int bnxt_set_real_num_queues(struct bnxt *bp)
                return rc;
 
 #ifdef CONFIG_RFS_ACCEL
-       if (bp->rx_nr_rings)
+       if (bp->flags & BNXT_FLAG_RFS)
                dev->rx_cpu_rmap = alloc_irq_cpu_rmap(bp->rx_nr_rings);
-       if (!dev->rx_cpu_rmap)
-               rc = -ENOMEM;
 #endif
 
        return rc;