Merge branch 'misc.namei' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-2.6-microblaze.git] / drivers / net / ethernet / renesas / sh_eth.c

diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
index 6c8ba91..1374faa 100644 (file)
--- a/drivers/net/ethernet/renesas/sh_eth.c
+++ b/drivers/net/ethernet/renesas/sh_eth.c
@@ -2533,6 +2533,7 @@ static netdev_tx_t sh_eth_start_xmit(struct sk_buff *skb,
        else
                txdesc->status |= cpu_to_le32(TD_TACT);
 
+       wmb(); /* cur_tx must be incremented after TACT bit was set */
        mdp->cur_tx++;
 
        if (!(sh_eth_read(ndev, EDTRR) & mdp->cd->edtrr_trns))