diff options
| author | David S. Miller <davem@davemloft.net> | 2008-12-23 20:56:23 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-12-23 20:56:23 -0500 |
| commit | 6332178d91ca1a9dbd99bd97cabbcf965d178e9f (patch) | |
| tree | d98af2cbc7ff0e9e4d00b6cc8c79b05ca7815a5f /drivers/net/bnx2.c | |
| parent | 908a7a16b852ffd618a9127be8d62432182d81b4 (diff) | |
| parent | 739840d529eb7505d3cbfe9d468bf1440c9a8e27 (diff) | |
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) | |||
| 547 | for (j = 0; j < bp->rx_max_pg_ring; j++) { | 547 | for (j = 0; j < bp->rx_max_pg_ring; j++) { |
| 548 | if (rxr->rx_pg_desc_ring[j]) | 548 | if (rxr->rx_pg_desc_ring[j]) |
| 549 | pci_free_consistent(bp->pdev, RXBD_RING_SIZE, | 549 | pci_free_consistent(bp->pdev, RXBD_RING_SIZE, |
| 550 | rxr->rx_pg_desc_ring[i], | 550 | rxr->rx_pg_desc_ring[j], |
| 551 | rxr->rx_pg_desc_mapping[i]); | 551 | rxr->rx_pg_desc_mapping[j]); |
| 552 | rxr->rx_pg_desc_ring[i] = NULL; | 552 | rxr->rx_pg_desc_ring[j] = NULL; |
| 553 | } | 553 | } |
| 554 | if (rxr->rx_pg_ring) | 554 | if (rxr->rx_pg_ring) |
| 555 | vfree(rxr->rx_pg_ring); | 555 | vfree(rxr->rx_pg_ring); |