From bb27dd196c3fad4897822419b13469653aeb5577 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Wed, 24 Aug 2011 22:28:12 +0000 Subject: [PATCH] --- yaml --- r: 265553 b: refs/heads/master c: b7b6a688d217936459ff5cf1087b2361db952509 h: refs/heads/master i: 265551: e9e90bacf859723456818426b799f2c5224aee6b v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/broadcom/bnx2.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 9c58d746a5d7..38a4bbc4ea26 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dc234d0b24e9639476969ece81d56dd7588e944a +refs/heads/master: b7b6a688d217936459ff5cf1087b2361db952509 diff --git a/trunk/drivers/net/ethernet/broadcom/bnx2.c b/trunk/drivers/net/ethernet/broadcom/bnx2.c index 4a9a8c8184d8..9afb6534cabe 100644 --- a/trunk/drivers/net/ethernet/broadcom/bnx2.c +++ b/trunk/drivers/net/ethernet/broadcom/bnx2.c @@ -2930,8 +2930,8 @@ bnx2_reuse_rx_skb_pages(struct bnx2 *bp, struct bnx2_rx_ring_info *rxr, shinfo = skb_shinfo(skb); shinfo->nr_frags--; - page = shinfo->frags[shinfo->nr_frags].page; - shinfo->frags[shinfo->nr_frags].page = NULL; + page = skb_frag_page(&shinfo->frags[shinfo->nr_frags]); + __skb_frag_set_page(&shinfo->frags[shinfo->nr_frags], NULL); cons_rx_pg->page = page; dev_kfree_skb(skb); @@ -6511,8 +6511,8 @@ bnx2_start_xmit(struct sk_buff *skb, struct net_device *dev) txbd = &txr->tx_desc_ring[ring_prod]; len = frag->size; - mapping = dma_map_page(&bp->pdev->dev, frag->page, frag->page_offset, - len, PCI_DMA_TODEVICE); + mapping = skb_frag_dma_map(&bp->pdev->dev, frag, 0, len, + PCI_DMA_TODEVICE); if (dma_mapping_error(&bp->pdev->dev, mapping)) goto dma_error; dma_unmap_addr_set(&txr->tx_buf_ring[ring_prod], mapping,