bnxt_en: Add bnxt_set_max_func_irqs().

Orabug: 24567991

By refactoring existing code into this new function.  The new function
will be used in subsequent patches.

v2: Fixed compile warning when CONFIG_BNXT_SRIOV is not set.

Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit 33c2657eb688a063ab9cbe11fd4d18c93c7945e1)
Signed-off-by: Brian Maly <brian.maly@oracle.com>
Signed-off-by: Dhaval Giani <dhaval.giani@oracle.com>

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 3a2ecd6a6925baf114438d2fc62ef39ac6ce12c4..a6065174be3321904843ef9e319c2964f7b0e280 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -4761,6 +4761,16 @@ static int bnxt_trim_rings(struct bnxt *bp, int *rx, int *tx, int max,
        return 0;
 }
 
+void bnxt_set_max_func_irqs(struct bnxt *bp, unsigned int max_irqs)
+{
+#if defined(CONFIG_BNXT_SRIOV)
+       if (BNXT_VF(bp))
+               bp->vf.max_irqs = max_irqs;
+       else
+#endif
+               bp->pf.max_irqs = max_irqs;
+}
+
 static int bnxt_setup_msix(struct bnxt *bp)
 {
        struct msix_entry *msix_ent;
@@ -7004,12 +7014,7 @@ static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 
        bnxt_set_tpa_flags(bp);
        bnxt_set_ring_params(bp);
-       if (BNXT_PF(bp))
-               bp->pf.max_irqs = max_irqs;
-#if defined(CONFIG_BNXT_SRIOV)
-       else
-               bp->vf.max_irqs = max_irqs;
-#endif
+       bnxt_set_max_func_irqs(bp, max_irqs);
        bnxt_set_dflt_rings(bp);
 
        /* Default RSS hash cfg. */

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
index b4abc1b505f7d305119045b7a4e26e8e3689e80f..8327d0d249df2c0e7277f5f23d4cc299a4bb983e 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.h
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
@@ -1235,6 +1235,7 @@ int hwrm_send_message(struct bnxt *, void *, u32, int);
 int hwrm_send_message_silent(struct bnxt *, void *, u32, int);
 int bnxt_hwrm_set_coal(struct bnxt *);
 int bnxt_hwrm_func_qcaps(struct bnxt *);
+void bnxt_set_max_func_irqs(struct bnxt *bp, unsigned int max);
 void bnxt_tx_disable(struct bnxt *bp);
 void bnxt_tx_enable(struct bnxt *bp);
 int bnxt_hwrm_set_pause(struct bnxt *);