diff options
author | Ian Campbell <Ian.Campbell@citrix.com> | 2011-10-04 20:28:51 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-10-05 17:36:01 -0400 |
commit | 6a930b9f163d7e6d9ef692e05616c4ede65038ec (patch) | |
tree | 79b0e64f0b2d46a61d1eb17933b8178bf3bb9bca /drivers/net | |
parent | 5dc3e196ea21e833128d51eb5b788a070fea1f28 (diff) |
cxgb3: convert to SKB paged frag API.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Cc: Divy Le Ray <divy@chelsio.com>
Cc: netdev@vger.kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/ethernet/chelsio/cxgb3/sge.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/chelsio/cxgb3/sge.c b/drivers/net/ethernet/chelsio/cxgb3/sge.c index d6fa1777a343..a0baaa09f025 100644 --- a/drivers/net/ethernet/chelsio/cxgb3/sge.c +++ b/drivers/net/ethernet/chelsio/cxgb3/sge.c | |||
@@ -979,8 +979,8 @@ static inline unsigned int make_sgl(const struct sk_buff *skb, | |||
979 | for (i = 0; i < nfrags; i++) { | 979 | for (i = 0; i < nfrags; i++) { |
980 | skb_frag_t *frag = &skb_shinfo(skb)->frags[i]; | 980 | skb_frag_t *frag = &skb_shinfo(skb)->frags[i]; |
981 | 981 | ||
982 | mapping = pci_map_page(pdev, frag->page, frag->page_offset, | 982 | mapping = skb_frag_dma_map(&pdev->dev, frag, 0, frag->size, |
983 | frag->size, PCI_DMA_TODEVICE); | 983 | PCI_DMA_TODEVICE); |
984 | sgp->len[j] = cpu_to_be32(frag->size); | 984 | sgp->len[j] = cpu_to_be32(frag->size); |
985 | sgp->addr[j] = cpu_to_be64(mapping); | 985 | sgp->addr[j] = cpu_to_be64(mapping); |
986 | j ^= 1; | 986 | j ^= 1; |
@@ -2116,7 +2116,7 @@ static void lro_add_page(struct adapter *adap, struct sge_qset *qs, | |||
2116 | len -= offset; | 2116 | len -= offset; |
2117 | 2117 | ||
2118 | rx_frag += nr_frags; | 2118 | rx_frag += nr_frags; |
2119 | rx_frag->page = sd->pg_chunk.page; | 2119 | __skb_frag_set_page(rx_frag, sd->pg_chunk.page); |
2120 | rx_frag->page_offset = sd->pg_chunk.offset + offset; | 2120 | rx_frag->page_offset = sd->pg_chunk.offset + offset; |
2121 | rx_frag->size = len; | 2121 | rx_frag->size = len; |
2122 | 2122 | ||