Commit 9f536391 authored by Michael Chan's avatar Michael Chan Committed by Jakub Kicinski
Browse files

bnxt_en: Fix compile error regression when CONFIG_BNXT_SRIOV is not set 



bp->sriov_cfg is not defined when CONFIG_BNXT_SRIOV is not set.  Fix
it by adding a helper function bnxt_sriov_cfg() to handle the logic
with or without the config option.

Fixes: 46d08f55 ("bnxt_en: extend RTNL to VF check in devlink driver_reinit")
Reported-by: default avatarkernel test robot <lkp@intel.com>
Reviewed-by: default avatarEdwin Peer <edwin.peer@broadcom.com>
Reviewed-by: default avatarAndy Gospodarek <gospo@broadcom.com>
Signed-off-by: default avatarMichael Chan <michael.chan@broadcom.com>
Link: https://lore.kernel.org/r/1637090770-22835-1-git-send-email-michael.chan@broadcom.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 2460386b

drivers/net/ethernet/broadcom/bnxt/bnxt.h

+10 −0
Original line number Diff line number Diff line
@@ -2258,6 +2258,16 @@ static inline void bnxt_db_write(struct bnxt *bp, struct bnxt_db_info *db, 
	}

}



/* Must hold rtnl_lock */

static inline bool bnxt_sriov_cfg(struct bnxt *bp)

{

#if defined(CONFIG_BNXT_SRIOV)

	return BNXT_PF(bp) && (bp->pf.active_vfs || bp->sriov_cfg);

#else

	return false;

#endif

}



extern const u16 bnxt_lhint_arr[];



int bnxt_alloc_rx_data(struct bnxt *bp, struct bnxt_rx_ring_info *rxr,

drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c

+1 −1
Original line number Diff line number Diff line
@@ -442,7 +442,7 @@ static int bnxt_dl_reload_down(struct devlink *dl, bool netns_change, 
	switch (action) {

	case DEVLINK_RELOAD_ACTION_DRIVER_REINIT: {

		rtnl_lock();

		if (BNXT_PF(bp) && (bp->pf.active_vfs || bp->sriov_cfg)) {

		if (bnxt_sriov_cfg(bp)) {

			NL_SET_ERR_MSG_MOD(extack,

					   "reload is unsupported while VFs are allocated or being configured");

			rtnl_unlock();