diff options
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnx2.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2.c b/drivers/net/ethernet/broadcom/bnx2.c index 4a9a8c8184d8..9afb6534cabe 100644 --- a/drivers/net/ethernet/broadcom/bnx2.c +++ b/drivers/net/ethernet/broadcom/bnx2.c | |||
| @@ -2930,8 +2930,8 @@ bnx2_reuse_rx_skb_pages(struct bnx2 *bp, struct bnx2_rx_ring_info *rxr, | |||
| 2930 | 2930 | ||
| 2931 | shinfo = skb_shinfo(skb); | 2931 | shinfo = skb_shinfo(skb); |
| 2932 | shinfo->nr_frags--; | 2932 | shinfo->nr_frags--; |
| 2933 | page = shinfo->frags[shinfo->nr_frags].page; | 2933 | page = skb_frag_page(&shinfo->frags[shinfo->nr_frags]); |
| 2934 | shinfo->frags[shinfo->nr_frags].page = NULL; | 2934 | __skb_frag_set_page(&shinfo->frags[shinfo->nr_frags], NULL); |
| 2935 | 2935 | ||
| 2936 | cons_rx_pg->page = page; | 2936 | cons_rx_pg->page = page; |
| 2937 | dev_kfree_skb(skb); | 2937 | dev_kfree_skb(skb); |
| @@ -6511,8 +6511,8 @@ bnx2_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
| 6511 | txbd = &txr->tx_desc_ring[ring_prod]; | 6511 | txbd = &txr->tx_desc_ring[ring_prod]; |
| 6512 | 6512 | ||
| 6513 | len = frag->size; | 6513 | len = frag->size; |
| 6514 | mapping = dma_map_page(&bp->pdev->dev, frag->page, frag->page_offset, | 6514 | mapping = skb_frag_dma_map(&bp->pdev->dev, frag, 0, len, |
| 6515 | len, PCI_DMA_TODEVICE); | 6515 | PCI_DMA_TODEVICE); |
| 6516 | if (dma_mapping_error(&bp->pdev->dev, mapping)) | 6516 | if (dma_mapping_error(&bp->pdev->dev, mapping)) |
| 6517 | goto dma_error; | 6517 | goto dma_error; |
| 6518 | dma_unmap_addr_set(&txr->tx_buf_ring[ring_prod], mapping, | 6518 | dma_unmap_addr_set(&txr->tx_buf_ring[ring_prod], mapping, |