Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 265767
b: refs/heads/master
c: c4c8d57
h: refs/heads/master
i:
  265765: eb784e5
  265763: cd245d1
  265759: 7be87c9
v: v3
  • Loading branch information
Ian Campbell authored and David S. Miller committed Aug 30, 2011
1 parent cabe1b1 commit 87d2419
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 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: deb8a069e39b272c0a37bfa7a5f52d49600963a4
refs/heads/master: c4c8d5796ce54e96885e227931986996b343a1d0
6 changes: 3 additions & 3 deletions trunk/drivers/net/ethernet/alteon/acenic.c
Original file line number Diff line number Diff line change
Expand Up @@ -2485,9 +2485,9 @@ static netdev_tx_t ace_start_xmit(struct sk_buff *skb,
info = ap->skb->tx_skbuff + idx;
desc = ap->tx_ring + idx;

mapping = pci_map_page(ap->pdev, frag->page,
frag->page_offset, frag->size,
PCI_DMA_TODEVICE);
mapping = skb_frag_dma_map(&ap->pdev->dev, frag, 0,
frag->size,
PCI_DMA_TODEVICE);

flagsize = (frag->size << 16);
if (skb->ip_summed == CHECKSUM_PARTIAL)
Expand Down

0 comments on commit 87d2419

Please sign in to comment.