From cff44dfbca1bb866bef82649360d2d7f44d87b2a Mon Sep 17 00:00:00 2001 From: Yuval Mintz Date: Wed, 23 Jan 2013 03:21:51 +0000 Subject: [PATCH] --- yaml --- r: 351593 b: refs/heads/master c: 580d9d081341aad5341884f9e6b070c01512e94c h: refs/heads/master i: 351591: a3c61c0ab2233293d1ebdf254ce29f65e3364fe4 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 6 ++---- trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h | 1 + 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 33d3bd0e2940..1e87f927f1be 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 86564c3f0fe7ff3ffe452fcc54a774eeadc1cf45 +refs/heads/master: 580d9d081341aad5341884f9e6b070c01512e94c diff --git a/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c index f511c3cb4872..ac00ddcd32fa 100644 --- a/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +++ b/trunk/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/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h b/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h index d51189bec881..b4050173add9 100644 --- a/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h +++ b/trunk/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,