public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: "Sylvain 'ythier' Hitier" <sylvain.hitier@gmail.com>
To: Neil Horman <nhorman@tuxdriver.com>
Cc: "David S. Miller" <davem@davemloft.net>,
	Linux Kernel list <linux-kernel@vger.kernel.org>,
	Meelis Roos <mroos@linux.ee>
Subject: [PATCH] 3c59x: fix bad split of cpu_to_le32(pci_map_single())
Date: Wed, 24 Sep 2014 09:30:21 +0000	[thread overview]
Message-ID: <20140924093021.GA7929@erable> (raw)

Author: Sylvain "ythier" Hitier <sylvain.hitier@gmail.com>
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 <sylvain.hitier@gmail.com>

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

-- 
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!

             reply	other threads:[~2014-09-24  9:30 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-09-24  9:30 Sylvain 'ythier' Hitier [this message]
2014-09-24 10:13 ` [PATCH] 3c59x: fix bad split of cpu_to_le32(pci_map_single()) Neil Horman
2014-09-24 10:16 ` Neil Horman
2014-09-25 15:15   ` [PATCH v2] " Sylvain 'ythier' Hitier
2014-09-25 16:02     ` Neil Horman
2014-09-29 19:37     ` David Miller
2014-09-29 19:45       ` Sylvain 'ythier' Hitier
2014-09-29 20:08         ` David Miller
2014-09-29 21:26           ` Sylvain 'ythier' Hitier

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20140924093021.GA7929@erable \
    --to=sylvain.hitier@gmail.com \
    --cc=davem@davemloft.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mroos@linux.ee \
    --cc=nhorman@tuxdriver.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox