Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 580d9d08 authored by Yuval Mintz's avatar Yuval Mintz Committed by David S. Miller
Browse files

bnx2x: correct memory release scheme 



Fix an incorrect SR-IOV memory release which was committed in 1ab4434c.

Signed-off-by: default avatarYuval Mintz <yuvalmin@broadcom.com>
Signed-off-by: default avatarAriel Elior <ariele@broadcom.com>
Signed-off-by: default avatarEilon Greenstein <eilong@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 86564c3f

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

+2 −4
Original line number Diff line number Diff line
@@ -7738,10 +7738,6 @@ void bnx2x_free_mem(struct bnx2x *bp) 
{

	int i;



	/* fastpath */

	bnx2x_free_fp_mem(bp);

	/* end of fastpath */



	BNX2X_PCI_FREE(bp->def_status_blk, bp->def_status_blk_mapping,

		       sizeof(struct host_sp_status_block));
@@ -7762,6 +7758,8 @@ void bnx2x_free_mem(struct bnx2x *bp) 


	BNX2X_PCI_FREE(bp->eq_ring, bp->eq_mapping,

		       BCM_PAGE_SIZE * NUM_EQ_PAGES);



	bnx2x_iov_free_mem(bp);

}

drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h

+1 −0
Original line number Diff line number Diff line
@@ -773,6 +773,7 @@ static inline void bnx2x_vf_mbx(struct bnx2x *bp, 
static inline int bnx2x_iov_init_ilt(struct bnx2x *bp, u16 line) {return line; }

static inline void bnx2x_iov_init_dq(struct bnx2x *bp) {}

static inline int bnx2x_iov_alloc_mem(struct bnx2x *bp) {return 0; }

static inline void bnx2x_iov_free_mem(struct bnx2x *bp) {}

static inline int bnx2x_iov_chip_cleanup(struct bnx2x *bp) {return 0; }

static inline void bnx2x_iov_init_dmae(struct bnx2x *bp) {}

static inline int bnx2x_iov_init_one(struct bnx2x *bp, int int_mode_param,