diff options
| author | David S. Miller <davem@davemloft.net> | 2011-09-16 02:58:54 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-09-16 02:58:54 -0400 |
| commit | 986eaa904129fc888c6c3882f6405a0055110e51 (patch) | |
| tree | a3da29918fd82982703eab1e7ae07957a9e5c12c /drivers/net/ethernet/3com | |
| parent | 4bc71cb983fd2844e603bf633df2bb53385182d2 (diff) | |
| parent | ab7e11d9d0293ef1802d6ae8aab39ce58472b167 (diff) | |
Merge branch 'master' of ../netdev-next/
Diffstat (limited to 'drivers/net/ethernet/3com')
| -rw-r--r-- | drivers/net/ethernet/3com/3c59x.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/ethernet/3com/3c59x.c b/drivers/net/ethernet/3com/3c59x.c index 6e1f5959a654..9ca45dcba755 100644 --- a/drivers/net/ethernet/3com/3c59x.c +++ b/drivers/net/ethernet/3com/3c59x.c | |||
| @@ -2179,9 +2179,10 @@ boomerang_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
| 2179 | skb_frag_t *frag = &skb_shinfo(skb)->frags[i]; | 2179 | skb_frag_t *frag = &skb_shinfo(skb)->frags[i]; |
| 2180 | 2180 | ||
| 2181 | vp->tx_ring[entry].frag[i+1].addr = | 2181 | vp->tx_ring[entry].frag[i+1].addr = |
| 2182 | cpu_to_le32(pci_map_single(VORTEX_PCI(vp), | 2182 | cpu_to_le32(pci_map_single( |
| 2183 | (void*)page_address(frag->page) + frag->page_offset, | 2183 | VORTEX_PCI(vp), |
| 2184 | frag->size, PCI_DMA_TODEVICE)); | 2184 | (void *)skb_frag_address(frag), |
| 2185 | frag->size, PCI_DMA_TODEVICE)); | ||
| 2185 | 2186 | ||
| 2186 | if (i == skb_shinfo(skb)->nr_frags-1) | 2187 | if (i == skb_shinfo(skb)->nr_frags-1) |
| 2187 | vp->tx_ring[entry].frag[i+1].length = cpu_to_le32(frag->size|LAST_FRAG); | 2188 | vp->tx_ring[entry].frag[i+1].length = cpu_to_le32(frag->size|LAST_FRAG); |