diff options
| author | David S. Miller <davem@davemloft.net> | 2014-10-08 16:22:22 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-10-08 16:22:22 -0400 |
| commit | 64b1f00a0830e1c53874067273a096b228d83d36 (patch) | |
| tree | dd547b0f1d431d0995b8eaa711cedb92399f31fe /drivers/net/ethernet/3com | |
| parent | 16b99a4f6644d58c94acb4b4253e84049de588c5 (diff) | |
| parent | 5301e3e117d88ef0967ce278912e54757f1a31a2 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/net/ethernet/3com')
| -rw-r--r-- | drivers/net/ethernet/3com/3c59x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/3com/3c59x.c b/drivers/net/ethernet/3com/3c59x.c index 86e621142d5b..41095ebad97f 100644 --- a/drivers/net/ethernet/3com/3c59x.c +++ b/drivers/net/ethernet/3com/3c59x.c | |||
| @@ -2213,7 +2213,7 @@ boomerang_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
| 2213 | } | 2213 | } |
| 2214 | } | 2214 | } |
| 2215 | #else | 2215 | #else |
| 2216 | dma_addr = cpu_to_le32(pci_map_single(VORTEX_PCI(vp), skb->data, skb->len, PCI_DMA_TODEVICE)); | 2216 | dma_addr = pci_map_single(VORTEX_PCI(vp), skb->data, skb->len, PCI_DMA_TODEVICE); |
| 2217 | if (dma_mapping_error(&VORTEX_PCI(vp)->dev, dma_addr)) | 2217 | if (dma_mapping_error(&VORTEX_PCI(vp)->dev, dma_addr)) |
| 2218 | goto out_dma_err; | 2218 | goto out_dma_err; |
| 2219 | vp->tx_ring[entry].addr = cpu_to_le32(dma_addr); | 2219 | vp->tx_ring[entry].addr = cpu_to_le32(dma_addr); |