From 3c73e3c03d6a2bfa30566d902438a1a64d21a4f6 Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Mon, 7 Aug 2006 16:11:48 -0700 Subject: [PATCH] --- yaml --- r: 33301 b: refs/heads/master c: d14cc9a342a8004b0ecfe66f1f12120962b61d8c h: refs/heads/master i: 33299: fbe03404badb97cb84d729a5a68c5bb487b18edf v: v3 --- [refs] | 2 +- trunk/drivers/net/tg3.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b91b9ab6783d..072d0ecb3703 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7b2e497a06c0e93719fda88820e057b635e8fae2 +refs/heads/master: d14cc9a342a8004b0ecfe66f1f12120962b61d8c diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c index 6f97962dd06b..0afbed6753fa 100644 --- a/trunk/drivers/net/tg3.c +++ b/trunk/drivers/net/tg3.c @@ -3101,7 +3101,6 @@ static int tg3_alloc_rx_skb(struct tg3 *tp, u32 opaque_key, if (skb == NULL) return -ENOMEM; - skb->dev = tp->dev; skb_reserve(skb, tp->rx_offset); mapping = pci_map_single(tp->pdev, skb->data, @@ -3274,7 +3273,6 @@ static int tg3_rx(struct tg3 *tp, int budget) if (copy_skb == NULL) goto drop_it_no_recycle; - copy_skb->dev = tp->dev; skb_reserve(copy_skb, 2); skb_put(copy_skb, len); pci_dma_sync_single_for_cpu(tp->pdev, dma_addr, len, PCI_DMA_FROMDEVICE);