diff --git a/[refs] b/[refs] index d6e6a9119f5f..b372f3a8240a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4bc683472bda1e224e652104686231057647d2da +refs/heads/master: e4811086b733cd9988fb17ad471357bdd5a37a01 diff --git a/trunk/drivers/net/ethernet/tehuti/tehuti.c b/trunk/drivers/net/ethernet/tehuti/tehuti.c index bc65aa8de4d0..371ab7abd377 100644 --- a/trunk/drivers/net/ethernet/tehuti/tehuti.c +++ b/trunk/drivers/net/ethernet/tehuti/tehuti.c @@ -1497,9 +1497,9 @@ bdx_tx_map_skb(struct bdx_priv *priv, struct sk_buff *skb, frag = &skb_shinfo(skb)->frags[i]; db->wptr->len = frag->size; - db->wptr->addr.dma = - pci_map_page(priv->pdev, frag->page, frag->page_offset, - frag->size, PCI_DMA_TODEVICE); + db->wptr->addr.dma = skb_frag_dma_map(&priv->pdev->dev, frag, + 0, frag->size, + PCI_DMA_TODEVICE); pbl++; pbl->len = CPU_CHIP_SWAP32(db->wptr->len);