From 091903c23be10cbbaa438ba5f6ea8cf652719825 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Wed, 5 Oct 2011 00:28:51 +0000 Subject: [PATCH] --- yaml --- r: 266437 b: refs/heads/master c: 6a930b9f163d7e6d9ef692e05616c4ede65038ec h: refs/heads/master i: 266435: 837979baf8157b1a872c6d9151071a24b03ccec7 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/chelsio/cxgb3/sge.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 1ea94990fc8a..8e05d8e14517 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5dc3e196ea21e833128d51eb5b788a070fea1f28 +refs/heads/master: 6a930b9f163d7e6d9ef692e05616c4ede65038ec diff --git a/trunk/drivers/net/ethernet/chelsio/cxgb3/sge.c b/trunk/drivers/net/ethernet/chelsio/cxgb3/sge.c index d6fa1777a343..a0baaa09f025 100644 --- a/trunk/drivers/net/ethernet/chelsio/cxgb3/sge.c +++ b/trunk/drivers/net/ethernet/chelsio/cxgb3/sge.c @@ -979,8 +979,8 @@ static inline unsigned int make_sgl(const struct sk_buff *skb, for (i = 0; i < nfrags; i++) { skb_frag_t *frag = &skb_shinfo(skb)->frags[i]; - mapping = pci_map_page(pdev, frag->page, frag->page_offset, - frag->size, PCI_DMA_TODEVICE); + mapping = skb_frag_dma_map(&pdev->dev, frag, 0, frag->size, + PCI_DMA_TODEVICE); sgp->len[j] = cpu_to_be32(frag->size); sgp->addr[j] = cpu_to_be64(mapping); j ^= 1; @@ -2116,7 +2116,7 @@ static void lro_add_page(struct adapter *adap, struct sge_qset *qs, len -= offset; rx_frag += nr_frags; - rx_frag->page = sd->pg_chunk.page; + __skb_frag_set_page(rx_frag, sd->pg_chunk.page); rx_frag->page_offset = sd->pg_chunk.offset + offset; rx_frag->size = len;