Commit 90f4fd02 authored by Michael Chan's avatar Michael Chan Committed by David S. Miller
Browse files

bnxt_en: Refactor __bnxt_vf_reps_destroy(). 



Add a new helper function __bnxt_free_one_vf_rep() to free one VF rep.
We also reintialize the VF rep fields to proper initial values so that
the function can be used without freeing the VF rep data structure.  This
will be used in subsequent patches to free and recreate VF reps after
error recovery.

Reviewed-by: default avatarEdwin Peer <edwin.peer@broadcom.com>
Reviewed-by: default avatarSriharsha Basavapatna <sriharsha.basavapatna@broadcom.com>
Signed-off-by: default avatarMichael Chan <michael.chan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ea2d37b2

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

+16 −5
Original line number Diff line number Diff line
@@ -288,6 +288,21 @@ void bnxt_vf_reps_open(struct bnxt *bp) 
		bnxt_vf_rep_open(bp->vf_reps[i]->dev);

}



static void __bnxt_free_one_vf_rep(struct bnxt *bp, struct bnxt_vf_rep *vf_rep)

{

	if (!vf_rep)

		return;



	if (vf_rep->dst) {

		dst_release((struct dst_entry *)vf_rep->dst);

		vf_rep->dst = NULL;

	}

	if (vf_rep->tx_cfa_action != CFA_HANDLE_INVALID) {

		hwrm_cfa_vfr_free(bp, vf_rep->vf_idx);

		vf_rep->tx_cfa_action = CFA_HANDLE_INVALID;

	}

}



static void __bnxt_vf_reps_destroy(struct bnxt *bp)

{

	u16 num_vfs = pci_num_vf(bp->pdev);
@@ -297,11 +312,7 @@ static void __bnxt_vf_reps_destroy(struct bnxt *bp) 
	for (i = 0; i < num_vfs; i++) {

		vf_rep = bp->vf_reps[i];

		if (vf_rep) {

			dst_release((struct dst_entry *)vf_rep->dst);



			if (vf_rep->tx_cfa_action != CFA_HANDLE_INVALID)

				hwrm_cfa_vfr_free(bp, vf_rep->vf_idx);



			__bnxt_free_one_vf_rep(bp, vf_rep);

			if (vf_rep->dev) {

				/* if register_netdev failed, then netdev_ops

				 * would have been set to NULL