diff options
| author | Yuval Mintz | 2013-01-23 04:21:51 +0100 |
|---|---|---|
| committer | David S. Miller | 2013-01-23 19:58:29 +0100 |
| commit | 580d9d081341aad5341884f9e6b070c01512e94c (patch) | |
| tree | ff67ff54a13103258774ba3d927ecf9bb2fe1f4e /drivers/net/ethernet/broadcom/bnx2x | |
| parent | bnx2x: Remove many sparse warnings (diff) | |
| download | kernel-qcow2-linux-580d9d081341aad5341884f9e6b070c01512e94c.tar.gz kernel-qcow2-linux-580d9d081341aad5341884f9e6b070c01512e94c.tar.xz kernel-qcow2-linux-580d9d081341aad5341884f9e6b070c01512e94c.zip | |
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>
Diffstat (limited to 'drivers/net/ethernet/broadcom/bnx2x')
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 6 | ||||
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c index f511c3cb4872..ac00ddcd32fa 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c @@ -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); } diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h index d51189bec881..b4050173add9 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h @@ -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, |