On Wed, Sep 24, 2014 at 09:30:21AM +0000, Sylvain 'ythier' Hitier wrote: > Author: Sylvain "ythier" Hitier <[email protected]> > Date: Wed Sep 24 09:22:16 2014 +0000 > > 3c59x: fix bad split of cpu_to_le32(pci_map_single()) > > Change the #else branch like the #if DO_ZEROCOPY branch was changed. > > Fixes: 6f2b6a3005b2c34c39f207a87667564f64f2f91a > # 3c59x: Add dma error checking and recovery > > Signed-off-by: Sylvain "ythier" Hitier <[email protected]> > > diff --git a/drivers/net/ethernet/3com/3c59x.c > b/drivers/net/ethernet/3com/3c59x.c > index 8ca49f04..0a3108b3 100644 > --- a/drivers/net/ethernet/3com/3c59x.c > +++ b/drivers/net/ethernet/3com/3c59x.c > @@ -2214,7 +2214,7 @@ boomerang_start_xmit(struct sk_buff *skb, struct > net_device *dev) > } > } > #else > - dma_addr = cpu_to_le32(pci_map_single(VORTEX_PCI(vp), skb->data, > skb->len, PCI_DMA_TODEVICE)); > + dma_addr = pci_map_single(VORTEX_PCI(vp), skb->data, skb->len, > PCI_DMA_TODEVICE); > if (dma_mapping_error(&VORTEX_PCI(vp)->dev, dma_addr)) > goto out_dma_err; > vp->tx_ring[entry].addr = cpu_to_le32(dma_addr); > > > > Regards, > Sylvain "ythier" Hitier > NAK, this isn't how the other side of that was changed. I added an assignmnt of the dma_addr to check mapping errors, but still used cpu_to_le32 when assigning dma_addr to tx_ring[entry].addr. No change is needed here as far as I see. Neil
> -- > Business is about being busy, not being rich... > Lived 777 days in a Debian package => > http://en.wikipedia.org/wiki/Apt,_Vaucluse > There's THE room for ideals in this mechanical place! > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
