diff options
| author | David S. Miller | 2008-12-24 02:56:23 +0100 |
|---|---|---|
| committer | David S. Miller | 2008-12-24 02:56:23 +0100 |
| commit | 6332178d91ca1a9dbd99bd97cabbcf965d178e9f (patch) | |
| tree | d98af2cbc7ff0e9e4d00b6cc8c79b05ca7815a5f /drivers/net/bnx2.c | |
| parent | net: Remove unused netdev arg from some NAPI interfaces. (diff) | |
| parent | ppp: fix segfaults introduced by netdev_priv changes (diff) | |
| download | kernel-qcow2-linux-6332178d91ca1a9dbd99bd97cabbcf965d178e9f.tar.gz kernel-qcow2-linux-6332178d91ca1a9dbd99bd97cabbcf965d178e9f.tar.xz kernel-qcow2-linux-6332178d91ca1a9dbd99bd97cabbcf965d178e9f.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/ppp_generic.c
Diffstat (limited to 'drivers/net/bnx2.c')
| -rw-r--r-- | drivers/net/bnx2.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c index 33d69ddc90a3..d4a3dac21dcf 100644 --- a/drivers/net/bnx2.c +++ b/drivers/net/bnx2.c @@ -547,9 +547,9 @@ bnx2_free_rx_mem(struct bnx2 *bp) for (j = 0; j < bp->rx_max_pg_ring; j++) { if (rxr->rx_pg_desc_ring[j]) pci_free_consistent(bp->pdev, RXBD_RING_SIZE, - rxr->rx_pg_desc_ring[i], - rxr->rx_pg_desc_mapping[i]); - rxr->rx_pg_desc_ring[i] = NULL; + rxr->rx_pg_desc_ring[j], + rxr->rx_pg_desc_mapping[j]); + rxr->rx_pg_desc_ring[j] = NULL; } if (rxr->rx_pg_ring) vfree(rxr->rx_pg_ring); |