From: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>
To: David Miller <davem@davemloft.net>
Cc: netdev <netdev@vger.kernel.org>,
Ron Mercer <ron.mercer@qlogic.com>,
Dept_NX_Linux_NIC_Driver <Dept_NX_Linux_NIC_Driver@qlogic.com>,
Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>
Subject: [net-next PATCH 4/5] qlge: Fix memory leak in the process of refill
Date: Fri, 3 Feb 2012 16:06:51 -0800 [thread overview]
Message-ID: <1328314013-20458-4-git-send-email-jitendra.kalsaria@qlogic.com> (raw)
In-Reply-To: <1328314013-20458-1-git-send-email-jitendra.kalsaria@qlogic.com>
Driver was leaking memory when page allocation failures occurs.
Signed-off-by: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>
---
drivers/net/ethernet/qlogic/qlge/qlge_main.c | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/qlogic/qlge/qlge_main.c b/drivers/net/ethernet/qlogic/qlge/qlge_main.c
index af12e80..49343ec 100644
--- a/drivers/net/ethernet/qlogic/qlge/qlge_main.c
+++ b/drivers/net/ethernet/qlogic/qlge/qlge_main.c
@@ -1143,14 +1143,16 @@ static void ql_update_lbq(struct ql_adapter *qdev, struct rx_ring *rx_ring)
int i;
while (rx_ring->lbq_free_cnt > 32) {
- for (i = 0; i < 16; i++) {
+ for (i = (rx_ring->lbq_clean_idx % 16); i < 16; i++) {
netif_printk(qdev, rx_status, KERN_DEBUG, qdev->ndev,
"lbq: try cleaning clean_idx = %d.\n",
clean_idx);
lbq_desc = &rx_ring->lbq[clean_idx];
if (ql_get_next_chunk(qdev, rx_ring, lbq_desc)) {
+ rx_ring->lbq_clean_idx = clean_idx;
netif_err(qdev, ifup, qdev->ndev,
- "Could not get a page chunk.\n");
+ "Could not get a page chunk, i=%d, clean_idx =%d .\n",
+ i, clean_idx);
return;
}
@@ -1195,7 +1197,7 @@ static void ql_update_sbq(struct ql_adapter *qdev, struct rx_ring *rx_ring)
int i;
while (rx_ring->sbq_free_cnt > 16) {
- for (i = 0; i < 16; i++) {
+ for (i = (rx_ring->sbq_clean_idx % 16); i < 16; i++) {
sbq_desc = &rx_ring->sbq[clean_idx];
netif_printk(qdev, rx_status, KERN_DEBUG, qdev->ndev,
"sbq: try cleaning clean_idx = %d.\n",
--
1.7.6.rc1.1.g2c162b
next prev parent reply other threads:[~2012-02-04 0:22 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-04 0:06 [net-next PATCH 1/5] qlge: Updating Schultz LICENSE.qlge file Jitendra Kalsaria
2012-02-04 0:06 ` [net-next PATCH 2/5] qlge: Fixed invalid reference to ip header Jitendra Kalsaria
2012-02-04 0:06 ` [net-next PATCH 3/5] qlge: Removing needless print's which are not Jitendra Kalsaria
2012-02-04 1:28 ` Jitendra Kalsaria
2012-02-04 0:06 ` Jitendra Kalsaria [this message]
2012-02-04 0:06 ` [net-next PATCH 5/5] qlge: Bumped driver version to 1.00.00.30 Jitendra Kalsaria
2012-02-04 0:06 ` [net-next PATCH 0/5] qlge: Fixes Jitendra Kalsaria
2012-02-04 21:04 ` 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=1328314013-20458-4-git-send-email-jitendra.kalsaria@qlogic.com \
--to=jitendra.kalsaria@qlogic.com \
--cc=Dept_NX_Linux_NIC_Driver@qlogic.com \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=ron.mercer@qlogic.com \
/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).