diff options
author | Benjamin Li <benli@broadcom.com> | 2008-05-17 01:19:35 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-05-17 01:19:35 -0400 |
commit | 601d3d18b2c1e4c197aa3cd902fb77bd99c41f10 (patch) | |
tree | 5151028aa528f0d8bcbe166bacfb0ea235339043 /drivers/net/bnx2.c | |
parent | d89cb6af41559a601e9cfe081d34de07945b0d8b (diff) |
bnx2: Rename RX_COPY_THRESH to BNX2_RX_COPY_THRESH.
To make the bnx2 code more consistent, all instances of
RX_COPY_THRESH have been changed to BNX2_RX_COPY_THRESH.
Signed-off-by: Benjamin Li <benli@broadcom.com>
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bnx2.c')
-rw-r--r-- | drivers/net/bnx2.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c index 2180922550eb..1534eed4c35a 100644 --- a/drivers/net/bnx2.c +++ b/drivers/net/bnx2.c | |||
@@ -2624,7 +2624,7 @@ bnx2_reuse_rx_skb(struct bnx2 *bp, struct bnx2_napi *bnapi, struct sk_buff *skb, | |||
2624 | 2624 | ||
2625 | pci_dma_sync_single_for_device(bp->pdev, | 2625 | pci_dma_sync_single_for_device(bp->pdev, |
2626 | pci_unmap_addr(cons_rx_buf, mapping), | 2626 | pci_unmap_addr(cons_rx_buf, mapping), |
2627 | BNX2_RX_OFFSET + RX_COPY_THRESH, PCI_DMA_FROMDEVICE); | 2627 | BNX2_RX_OFFSET + BNX2_RX_COPY_THRESH, PCI_DMA_FROMDEVICE); |
2628 | 2628 | ||
2629 | bnapi->rx_prod_bseq += bp->rx_buf_use_size; | 2629 | bnapi->rx_prod_bseq += bp->rx_buf_use_size; |
2630 | 2630 | ||
@@ -2777,7 +2777,8 @@ bnx2_rx_int(struct bnx2 *bp, struct bnx2_napi *bnapi, int budget) | |||
2777 | dma_addr = pci_unmap_addr(rx_buf, mapping); | 2777 | dma_addr = pci_unmap_addr(rx_buf, mapping); |
2778 | 2778 | ||
2779 | pci_dma_sync_single_for_cpu(bp->pdev, dma_addr, | 2779 | pci_dma_sync_single_for_cpu(bp->pdev, dma_addr, |
2780 | BNX2_RX_OFFSET + RX_COPY_THRESH, PCI_DMA_FROMDEVICE); | 2780 | BNX2_RX_OFFSET + BNX2_RX_COPY_THRESH, |
2781 | PCI_DMA_FROMDEVICE); | ||
2781 | 2782 | ||
2782 | rx_hdr = (struct l2_fhdr *) skb->data; | 2783 | rx_hdr = (struct l2_fhdr *) skb->data; |
2783 | len = rx_hdr->l2_fhdr_pkt_len; | 2784 | len = rx_hdr->l2_fhdr_pkt_len; |
@@ -4760,7 +4761,7 @@ bnx2_set_rx_ring_size(struct bnx2 *bp, u32 size) | |||
4760 | rx_space = SKB_DATA_ALIGN(rx_size + BNX2_RX_ALIGN) + NET_SKB_PAD + | 4761 | rx_space = SKB_DATA_ALIGN(rx_size + BNX2_RX_ALIGN) + NET_SKB_PAD + |
4761 | sizeof(struct skb_shared_info); | 4762 | sizeof(struct skb_shared_info); |
4762 | 4763 | ||
4763 | bp->rx_copy_thresh = RX_COPY_THRESH; | 4764 | bp->rx_copy_thresh = BNX2_RX_COPY_THRESH; |
4764 | bp->rx_pg_ring_size = 0; | 4765 | bp->rx_pg_ring_size = 0; |
4765 | bp->rx_max_pg_ring = 0; | 4766 | bp->rx_max_pg_ring = 0; |
4766 | bp->rx_max_pg_ring_idx = 0; | 4767 | bp->rx_max_pg_ring_idx = 0; |
@@ -4775,7 +4776,7 @@ bnx2_set_rx_ring_size(struct bnx2 *bp, u32 size) | |||
4775 | bp->rx_max_pg_ring = bnx2_find_max_ring(jumbo_size, | 4776 | bp->rx_max_pg_ring = bnx2_find_max_ring(jumbo_size, |
4776 | MAX_RX_PG_RINGS); | 4777 | MAX_RX_PG_RINGS); |
4777 | bp->rx_max_pg_ring_idx = (bp->rx_max_pg_ring * RX_DESC_CNT) - 1; | 4778 | bp->rx_max_pg_ring_idx = (bp->rx_max_pg_ring * RX_DESC_CNT) - 1; |
4778 | rx_size = RX_COPY_THRESH + BNX2_RX_OFFSET; | 4779 | rx_size = BNX2_RX_COPY_THRESH + BNX2_RX_OFFSET; |
4779 | bp->rx_copy_thresh = 0; | 4780 | bp->rx_copy_thresh = 0; |
4780 | } | 4781 | } |
4781 | 4782 | ||