diff options
| author | Jitendra Kalsaria <jitendra.kalsaria@qlogic.com> | 2012-02-03 14:06:51 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-02-04 15:59:31 -0500 |
| commit | 81f25d96f1c9fa116f9c6f06ae490c2f8fa5ebaf (patch) | |
| tree | 98a317aea5d188373e1b290fa22b045d534dcd54 /drivers/net/ethernet | |
| parent | 19257f5a1a20ceacb49a474ce39108f75ea51886 (diff) | |
| download | blackbird-op-linux-81f25d96f1c9fa116f9c6f06ae490c2f8fa5ebaf.tar.gz blackbird-op-linux-81f25d96f1c9fa116f9c6f06ae490c2f8fa5ebaf.zip | |
qlge: Fix memory leak in the process of refill
Driver was leaking memory when page allocation failures occurs.
Signed-off-by: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet')
| -rw-r--r-- | 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 af12e80975d1..49343ec21c82 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", |
