diff options
| author | Matt Carlson <mcarlson@broadcom.com> | 2009-11-13 14:03:45 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-16 07:14:49 +0100 |
| commit | 86b21e59c9a65c8e46d35ac6c4220f63639828c6 (patch) | |
| tree | 087a426dfec82cab6efc4c036367e411971d869b | |
| parent | tg3: Add prodring parameter to tg3_alloc_rx_skb() (diff) | |
| download | linux-86b21e59c9a65c8e46d35ac6c4220f63639828c6.tar.xz linux-86b21e59c9a65c8e46d35ac6c4220f63639828c6.zip | |
tg3: tg3_alloc_rx_skb(tnapi => tp)
This patch converts the tnapi argument of tg3_alloc_rx_skb() to tp. The
level of indirection is unnecessary.
Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
Reviewed-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/tg3.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index 9251bb523e9e..00e7e14fd3f7 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c @@ -4408,11 +4408,9 @@ static void tg3_tx(struct tg3_napi *tnapi) * buffers the cpu only reads the last cacheline of the RX descriptor * (to fetch the error flags, vlan tag, checksum, and opaque cookie). */ -static int tg3_alloc_rx_skb(struct tg3_napi *tnapi, - struct tg3_rx_prodring_set *tpr, +static int tg3_alloc_rx_skb(struct tg3 *tp, struct tg3_rx_prodring_set *tpr, u32 opaque_key, u32 dest_idx_unmasked) { - struct tg3 *tp = tnapi->tp; struct tg3_rx_buffer_desc *desc; struct ring_info *map, *src_map; struct sk_buff *skb; @@ -4601,7 +4599,7 @@ static int tg3_rx(struct tg3_napi *tnapi, int budget) ) { int skb_size; - skb_size = tg3_alloc_rx_skb(tnapi, tpr, opaque_key, + skb_size = tg3_alloc_rx_skb(tp, tpr, opaque_key, *post_ptr); if (skb_size < 0) goto drop_it; @@ -5744,7 +5742,6 @@ static int tg3_rx_prodring_alloc(struct tg3 *tp, struct tg3_rx_prodring_set *tpr) { u32 i, rx_pkt_dma_sz; - struct tg3_napi *tnapi = &tp->napi[0]; /* Zero out all descriptors. */ memset(tpr->rx_std, 0, TG3_RX_RING_BYTES); @@ -5771,7 +5768,7 @@ static int tg3_rx_prodring_alloc(struct tg3 *tp, /* Now allocate fresh SKBs for each rx ring. */ for (i = 0; i < tp->rx_pending; i++) { - if (tg3_alloc_rx_skb(tnapi, tpr, RXD_OPAQUE_RING_STD, i) < 0) { + if (tg3_alloc_rx_skb(tp, tpr, RXD_OPAQUE_RING_STD, i) < 0) { printk(KERN_WARNING PFX "%s: Using a smaller RX standard ring, " "only %d out of %d buffers were allocated " @@ -5802,7 +5799,7 @@ static int tg3_rx_prodring_alloc(struct tg3 *tp, } for (i = 0; i < tp->rx_jumbo_pending; i++) { - if (tg3_alloc_rx_skb(tnapi, tpr, RXD_OPAQUE_RING_JUMBO, + if (tg3_alloc_rx_skb(tp, tpr, RXD_OPAQUE_RING_JUMBO, i) < 0) { printk(KERN_WARNING PFX "%s: Using a smaller RX jumbo ring, " |