From f5533d62a18dedb37f07e672adfe0933564c8b18 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Wed, 24 Aug 2011 22:28:08 +0000 Subject: [PATCH] --- yaml --- r: 265549 b: refs/heads/master c: 70b1052ad284d97d0a4d7f56ad63d1757f1da08f h: refs/heads/master i: 265547: 242c2b717f5105c60b62dde9acb4a010018697b2 v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/hw/amso1100/c2.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index cfac8505f3db..6e67c16923b2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c517202f3cf1cd189259c50d55622d8c7ab16eb2 +refs/heads/master: 70b1052ad284d97d0a4d7f56ad63d1757f1da08f diff --git a/trunk/drivers/infiniband/hw/amso1100/c2.c b/trunk/drivers/infiniband/hw/amso1100/c2.c index 444470a28de2..6a8f36e9d9ed 100644 --- a/trunk/drivers/infiniband/hw/amso1100/c2.c +++ b/trunk/drivers/infiniband/hw/amso1100/c2.c @@ -802,11 +802,9 @@ static int c2_xmit_frame(struct sk_buff *skb, struct net_device *netdev) for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) { skb_frag_t *frag = &skb_shinfo(skb)->frags[i]; maplen = frag->size; - mapaddr = - pci_map_page(c2dev->pcidev, frag->page, - frag->page_offset, maplen, - PCI_DMA_TODEVICE); - + mapaddr = skb_frag_dma_map(&c2dev->pcidev->dev, frag, + 0, maplen, + PCI_DMA_TODEVICE); elem = elem->next; elem->skb = NULL; elem->mapaddr = mapaddr;