From 4f38a83453f474f5416b9f8b97154748306fc4bc Mon Sep 17 00:00:00 2001 From: Shiraz Hashim Date: Sun, 17 Jul 2011 20:54:08 +0000 Subject: [PATCH] --- yaml --- r: 256498 b: refs/heads/master c: eb0dc4bb2e22c04964d6e9545e86f629f117108b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/stmmac/stmmac_main.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index d75e586d60b8..4eb8139102d6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bab632d69ee48a106e779b60cc01adfe80a72807 +refs/heads/master: eb0dc4bb2e22c04964d6e9545e86f629f117108b diff --git a/trunk/drivers/net/stmmac/stmmac_main.c b/trunk/drivers/net/stmmac/stmmac_main.c index d4adc806f6f8..c8c9e5bc6608 100644 --- a/trunk/drivers/net/stmmac/stmmac_main.c +++ b/trunk/drivers/net/stmmac/stmmac_main.c @@ -1045,6 +1045,7 @@ static netdev_tx_t stmmac_xmit(struct sk_buff *skb, struct net_device *dev) len, DMA_TO_DEVICE); priv->tx_skbuff[entry] = NULL; priv->hw->desc->prepare_tx_desc(desc, 0, len, csum_insertion); + wmb(); priv->hw->desc->set_tx_owner(desc); } @@ -1056,6 +1057,9 @@ static netdev_tx_t stmmac_xmit(struct sk_buff *skb, struct net_device *dev) if (likely(priv->tm->enable)) priv->hw->desc->clear_tx_ic(desc); #endif + + wmb(); + /* To avoid raise condition */ priv->hw->desc->set_tx_owner(first); @@ -1118,6 +1122,7 @@ static inline void stmmac_rx_refill(struct stmmac_priv *priv) } RX_DBG(KERN_INFO "\trefill entry #%d\n", entry); } + wmb(); priv->hw->desc->set_rx_owner(p + entry); } }