1 files changed, 6 insertions, 3 deletions

diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index 3d1a5da98622..b10be27f340a 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -6202,7 +6202,7 @@ bnx2_enable_msix(struct bnx2 *bp, int msix_vecs)
         }
 }
 
-static void
+static int
 bnx2_setup_int_mode(struct bnx2 *bp, int dis_msi)
 {
         int cpus = num_online_cpus();
@@ -6231,9 +6231,10 @@ bnx2_setup_int_mode(struct bnx2 *bp, int dis_msi)
         }
 
         bp->num_tx_rings = rounddown_pow_of_two(bp->irq_nvecs);
-        bp->dev->real_num_tx_queues = bp->num_tx_rings;
+        netif_set_real_num_tx_queues(bp->dev, bp->num_tx_rings);
 
         bp->num_rx_rings = bp->irq_nvecs;
+        return netif_set_real_num_rx_queues(bp->dev, bp->num_rx_rings);
 }
 
 /* Called with rtnl_lock */
@@ -6248,7 +6249,9 @@ bnx2_open(struct net_device *dev)
         bnx2_set_power_state(bp, PCI_D0);
         bnx2_disable_int(bp);
 
-        bnx2_setup_int_mode(bp, disable_msi);
+        rc = bnx2_setup_int_mode(bp, disable_msi);
+        if (rc)
+                goto open_err;
         bnx2_init_napi(bp);
         bnx2_napi_enable(bp);
         rc = bnx2_alloc_mem(bp);