diff options
| author | Ian Campbell <Ian.Campbell@citrix.com> | 2011-08-30 20:47:05 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-09-15 15:35:00 -0400 |
| commit | da7ebfd76076b087ef7b47facfc0f2c137caa954 (patch) | |
| tree | 48936bfa29350985a5b55478c27d915d66fecc74 /drivers | |
| parent | e0ee9b98d5ff10acd7477ea5f0dcaffeb4a999bc (diff) | |
qlge: convert to SKB paged frag API.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Cc: Anirban Chakraborty <anirban.chakraborty@qlogic.com>
Cc: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>
Cc: Ron Mercer <ron.mercer@qlogic.com>
Cc: linux-driver@qlogic.com
Cc: netdev@vger.kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/ethernet/qlogic/qlge/qlge_main.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/drivers/net/ethernet/qlogic/qlge/qlge_main.c b/drivers/net/ethernet/qlogic/qlge/qlge_main.c index 39360c485867..ce6c6fee3089 100644 --- a/drivers/net/ethernet/qlogic/qlge/qlge_main.c +++ b/drivers/net/ethernet/qlogic/qlge/qlge_main.c | |||
| @@ -1431,10 +1431,8 @@ static int ql_map_send(struct ql_adapter *qdev, | |||
| 1431 | map_idx++; | 1431 | map_idx++; |
| 1432 | } | 1432 | } |
| 1433 | 1433 | ||
| 1434 | map = | 1434 | map = skb_frag_dma_map(&qdev->pdev->dev, frag, 0, frag->size, |
| 1435 | pci_map_page(qdev->pdev, frag->page, | 1435 | PCI_DMA_TODEVICE); |
| 1436 | frag->page_offset, frag->size, | ||
| 1437 | PCI_DMA_TODEVICE); | ||
| 1438 | 1436 | ||
| 1439 | err = pci_dma_mapping_error(qdev->pdev, map); | 1437 | err = pci_dma_mapping_error(qdev->pdev, map); |
| 1440 | if (err) { | 1438 | if (err) { |
| @@ -1477,8 +1475,6 @@ static void ql_process_mac_rx_gro_page(struct ql_adapter *qdev, | |||
| 1477 | { | 1475 | { |
| 1478 | struct sk_buff *skb; | 1476 | struct sk_buff *skb; |
| 1479 | struct bq_desc *lbq_desc = ql_get_curr_lchunk(qdev, rx_ring); | 1477 | struct bq_desc *lbq_desc = ql_get_curr_lchunk(qdev, rx_ring); |
| 1480 | struct skb_frag_struct *rx_frag; | ||
| 1481 | int nr_frags; | ||
| 1482 | struct napi_struct *napi = &rx_ring->napi; | 1478 | struct napi_struct *napi = &rx_ring->napi; |
| 1483 | 1479 | ||
| 1484 | napi->dev = qdev->ndev; | 1480 | napi->dev = qdev->ndev; |
| @@ -1492,12 +1488,10 @@ static void ql_process_mac_rx_gro_page(struct ql_adapter *qdev, | |||
| 1492 | return; | 1488 | return; |
| 1493 | } | 1489 | } |
| 1494 | prefetch(lbq_desc->p.pg_chunk.va); | 1490 | prefetch(lbq_desc->p.pg_chunk.va); |
| 1495 | rx_frag = skb_shinfo(skb)->frags; | 1491 | __skb_fill_page_desc(skb, skb_shinfo(skb)->nr_frags, |
| 1496 | nr_frags = skb_shinfo(skb)->nr_frags; | 1492 | lbq_desc->p.pg_chunk.page, |
| 1497 | rx_frag += nr_frags; | 1493 | lbq_desc->p.pg_chunk.offset, |
| 1498 | rx_frag->page = lbq_desc->p.pg_chunk.page; | 1494 | length); |
| 1499 | rx_frag->page_offset = lbq_desc->p.pg_chunk.offset; | ||
| 1500 | rx_frag->size = length; | ||
| 1501 | 1495 | ||
| 1502 | skb->len += length; | 1496 | skb->len += length; |
| 1503 | skb->data_len += length; | 1497 | skb->data_len += length; |