Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 265554
b: refs/heads/master
c: f55c957
h: refs/heads/master
v: v3
  • Loading branch information
Ian Campbell authored and David S. Miller committed Aug 26, 2011
1 parent bb27dd1 commit 46b788f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b7b6a688d217936459ff5cf1087b2361db952509
refs/heads/master: f55c95724789fccb412abef13c3f503e55148790
5 changes: 2 additions & 3 deletions trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
Original file line number Diff line number Diff line change
Expand Up @@ -2800,9 +2800,8 @@ netdev_tx_t bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev)
for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
skb_frag_t *frag = &skb_shinfo(skb)->frags[i];

mapping = dma_map_page(&bp->pdev->dev, frag->page,
frag->page_offset, frag->size,
DMA_TO_DEVICE);
mapping = skb_frag_dma_map(&bp->pdev->dev, frag, 0, frag->size,
DMA_TO_DEVICE);
if (unlikely(dma_mapping_error(&bp->pdev->dev, mapping))) {

DP(NETIF_MSG_TX_QUEUED, "Unable to map page - "
Expand Down

0 comments on commit 46b788f

Please sign in to comment.