iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qlge: convert to SKB paged frag API.

Browse Source 
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>
This commit is contained in:
Ian Campbell 2011-08-31 00:47:05 +00:00 committed by David S. Miller
parent e0ee9b98d5
commit da7ebfd760
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/net/ethernet/qlogic/qlge/qlge_main.c
View File

@ -1431,10 +1431,8 @@ static int ql_map_send(struct ql_adapter *qdev,
map_idx++; map_idx++;
} }
map = map = skb_frag_dma_map(&qdev->pdev->dev, frag, 0, frag->size,
pci_map_page(qdev->pdev, frag->page, PCI_DMA_TODEVICE);
frag->page_offset, frag->size,
PCI_DMA_TODEVICE);
err = pci_dma_mapping_error(qdev->pdev, map); err = pci_dma_mapping_error(qdev->pdev, map);
if (err) { if (err) {
@ -1477,8 +1475,6 @@ static void ql_process_mac_rx_gro_page(struct ql_adapter *qdev,
{ {
struct sk_buff *skb; struct sk_buff *skb;
struct bq_desc *lbq_desc = ql_get_curr_lchunk(qdev, rx_ring); struct bq_desc *lbq_desc = ql_get_curr_lchunk(qdev, rx_ring);
struct skb_frag_struct *rx_frag;
int nr_frags;
struct napi_struct *napi = &rx_ring->napi; struct napi_struct *napi = &rx_ring->napi;
napi->dev = qdev->ndev; napi->dev = qdev->ndev;
@ -1492,12 +1488,10 @@ static void ql_process_mac_rx_gro_page(struct ql_adapter *qdev,
return; return;
} }
prefetch(lbq_desc->p.pg_chunk.va); prefetch(lbq_desc->p.pg_chunk.va);
rx_frag = skb_shinfo(skb)->frags; __skb_fill_page_desc(skb, skb_shinfo(skb)->nr_frags,
nr_frags = skb_shinfo(skb)->nr_frags; lbq_desc->p.pg_chunk.page,
rx_frag += nr_frags; lbq_desc->p.pg_chunk.offset,
rx_frag->page = lbq_desc->p.pg_chunk.page; length);
rx_frag->page_offset = lbq_desc->p.pg_chunk.offset;
rx_frag->size = length;
skb->len += length; skb->len += length;
skb->data_len += length; skb->data_len += length;