mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 05:48:40 +00:00
bnx2x: correct memory release scheme
Fix an incorrect SR-IOV memory release which was committed in 1ab4434
.
Signed-off-by: Yuval Mintz <yuvalmin@broadcom.com>
Signed-off-by: Ariel Elior <ariele@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
86564c3f0f
commit
580d9d0813
2 changed files with 3 additions and 4 deletions
|
@ -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);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -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,
|
||||
|
|
Loading…
Reference in a new issue