summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
diff options
context:
space:
mode:
authorYuval Mintz2013-01-23 04:21:51 +0100
committerDavid S. Miller2013-01-23 19:58:29 +0100
commit580d9d081341aad5341884f9e6b070c01512e94c (patch)
treeff67ff54a13103258774ba3d927ecf9bb2fe1f4e /drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
parentbnx2x: Remove many sparse warnings (diff)
downloadkernel-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/bnx2x_main.c')
-rw-r--r--drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c6
1 files changed, 2 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);
}