From d783f9b4055f8f73654223bb43099686fab60790 Mon Sep 17 00:00:00 2001 From: Matt Carlson Date: Thu, 14 Oct 2010 10:37:42 +0000 Subject: [PATCH] --- yaml --- r: 215195 b: refs/heads/master c: f94e290eba2f98e8f759d273d9d04e8487fb4b6b h: refs/heads/master i: 215193: 14a4f8799b1d0d58c14dc87b1f5d3934d020b367 215191: d5f388ceaf509232fb79b95f3a7742e02d28c260 v: v3 --- [refs] | 2 +- trunk/drivers/net/tg3.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 0b5f05da39ab..1e829a6a393e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 52b02d04c801fff51ca49ad033210846d1713253 +refs/heads/master: f94e290eba2f98e8f759d273d9d04e8487fb4b6b diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c index f2d96ddd464e..84530d9f1f4b 100644 --- a/trunk/drivers/net/tg3.c +++ b/trunk/drivers/net/tg3.c @@ -4573,12 +4573,11 @@ static int tg3_alloc_rx_skb(struct tg3 *tp, struct tg3_rx_prodring_set *tpr, u32 opaque_key, u32 dest_idx_unmasked) { struct tg3_rx_buffer_desc *desc; - struct ring_info *map, *src_map; + struct ring_info *map; struct sk_buff *skb; dma_addr_t mapping; int skb_size, dest_idx; - src_map = NULL; switch (opaque_key) { case RXD_OPAQUE_RING_STD: dest_idx = dest_idx_unmasked & tp->rx_std_ring_mask;