From: "Yuval Mintz" <yuvalmin@broadcom.com>
To: davem@davemloft.net, netdev@vger.kernel.org
Cc: eilong@broadcom.com, ariele@broadcom.com,
"Yuval Mintz" <yuvalmin@broadcom.com>
Subject: [PATCH net-next 09/12] bnx2x: correct memory release scheme
Date: Wed, 23 Jan 2013 15:21:51 +0200 [thread overview]
Message-ID: <1358947314-3851-10-git-send-email-yuvalmin@broadcom.com> (raw)
In-Reply-To: <1358947314-3851-1-git-send-email-yuvalmin@broadcom.com>
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>
---
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 6 ++----
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 f511c3c..ac00ddc 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 d51189b..b405017 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,
--
1.8.1.227.g44fe835
next prev parent reply other threads:[~2013-01-23 14:23 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-23 13:21 [PATCH net-next 0/12] bnx2x: patch series Yuval Mintz
2013-01-23 13:21 ` [PATCH net-next 01/12] bnx2x: Semantic renovation Yuval Mintz
2013-01-23 13:21 ` [PATCH net-next 02/12] bnx2x: reorganization and beautification Yuval Mintz
2013-01-23 13:21 ` [PATCH net-next 03/12] bnx2x: correct usleep_range usage Yuval Mintz
2013-01-23 13:21 ` [PATCH net-next 04/12] bnx2x: Add additional debug information Yuval Mintz
2013-01-23 13:21 ` [PATCH net-next 05/12] bnx2x: Add missing VFs reference in macros Yuval Mintz
2013-01-23 13:21 ` [PATCH net-next 06/12] bnx2x: Correct memory preparation and release Yuval Mintz
2013-01-23 13:21 ` [PATCH net-next 07/12] bnx2x: Modify unload conditions Yuval Mintz
2013-01-23 13:21 ` [PATCH net-next 08/12] bnx2x: Remove many sparse warnings Yuval Mintz
2013-01-23 13:21 ` Yuval Mintz [this message]
2013-01-23 13:21 ` [PATCH net-next 10/12] cnic, bnx2x: Add CNIC_DRV_STATE_HANDLES_IRQ to ethdev->drv_state Yuval Mintz
2013-01-23 13:21 ` [PATCH net-next 11/12] bnx2x: Fix compilation with stop-on-error Yuval Mintz
2013-01-23 13:21 ` [PATCH net-next 12/12] bnx2x: SR-IOV version compatibility bugfix Yuval Mintz
2013-01-23 18:58 ` [PATCH net-next 0/12] bnx2x: patch series David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1358947314-3851-10-git-send-email-yuvalmin@broadcom.com \
--to=yuvalmin@broadcom.com \
--cc=ariele@broadcom.com \
--cc=davem@davemloft.net \
--cc=eilong@broadcom.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).