bnx2x: Fix VF memory leak unload (b4cddbd6) · Commits · 戴 / test

Due to incorrect VF/PF conditions, when unloading a VF it will not release part of the memory it has previously allocated. Signed-off-by:

drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -2962,8 +2962,9 @@ int bnx2x_nic_unload(struct bnx2x *bp, int unload_mode, bool keep_link)
		if (IS_PF(bp)) {
		if (CNIC_LOADED(bp))
		bnx2x_free_mem_cnic(bp);
		bnx2x_free_mem(bp);
		}
		bnx2x_free_mem(bp);

		bp->state = BNX2X_STATE_CLOSED;
		bp->cnic_loaded = false;

+6 −3

Original line number	Diff line number	Diff line
		@@ -7855,12 +7855,15 @@ void bnx2x_free_mem(struct bnx2x *bp)
		{
		int i;

		BNX2X_PCI_FREE(bp->def_status_blk, bp->def_status_blk_mapping,
		sizeof(struct host_sp_status_block));

		BNX2X_PCI_FREE(bp->fw_stats, bp->fw_stats_mapping,
		bp->fw_stats_data_sz + bp->fw_stats_req_sz);

		if (IS_VF(bp))
		return;

		BNX2X_PCI_FREE(bp->def_status_blk, bp->def_status_blk_mapping,
		sizeof(struct host_sp_status_block));

		BNX2X_PCI_FREE(bp->slowpath, bp->slowpath_mapping,
		sizeof(struct bnx2x_slowpath));