Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 33301
b: refs/heads/master
c: d14cc9a
h: refs/heads/master
i:
  33299: fbe0340
v: v3
  • Loading branch information
Christoph Hellwig authored and David S. Miller committed Aug 7, 2006
1 parent 3b15cae commit 3c73e3c
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7b2e497a06c0e93719fda88820e057b635e8fae2
refs/heads/master: d14cc9a342a8004b0ecfe66f1f12120962b61d8c
2 changes: 0 additions & 2 deletions trunk/drivers/net/tg3.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 3c73e3c

Please sign in to comment.