diff --git a/[refs] b/[refs] index 8e05d8e14517..851bbef8b125 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6a930b9f163d7e6d9ef692e05616c4ede65038ec +refs/heads/master: 011392224b4f6019c3b737f3dcb7c8f6fba41246 diff --git a/trunk/drivers/net/ethernet/chelsio/cxgb/sge.c b/trunk/drivers/net/ethernet/chelsio/cxgb/sge.c index e9a03fffef15..7cde425f2b84 100644 --- a/trunk/drivers/net/ethernet/chelsio/cxgb/sge.c +++ b/trunk/drivers/net/ethernet/chelsio/cxgb/sge.c @@ -1277,9 +1277,8 @@ static inline void write_tx_descs(struct adapter *adapter, struct sk_buff *skb, ce = q->centries; } - mapping = pci_map_page(adapter->pdev, frag->page, - frag->page_offset, frag->size, - PCI_DMA_TODEVICE); + mapping = skb_frag_dma_map(&adapter->pdev->dev, frag, 0, + frag->size, PCI_DMA_TODEVICE); desc_mapping = mapping; desc_len = frag->size;