diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-07-31 17:05:27 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-07-31 17:05:27 +0200 |
| commit | 1f815faec46e83bc96039797151846b60875bb06 (patch) | |
| tree | 41a874f8090e3f69c8a9f13e3c85dd7a371e569b /drivers/net/ethernet/stmicro/stmmac/ring_mode.c | |
| parent | b44d50dcacea0d485ca2ff9140f8cc28ee22f28d (diff) | |
| parent | e2b34e311be3a57c9abcb927e37a57e38913714c (diff) | |
Merge branch 'linus' into timers/urgent
Merge in Linus's branch which already has timers/core merged.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/stmicro/stmmac/ring_mode.c')
| -rw-r--r-- | drivers/net/ethernet/stmicro/stmmac/ring_mode.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/ring_mode.c b/drivers/net/ethernet/stmicro/stmmac/ring_mode.c index fb8377da168..4b785e10f2e 100644 --- a/drivers/net/ethernet/stmicro/stmmac/ring_mode.c +++ b/drivers/net/ethernet/stmicro/stmmac/ring_mode.c @@ -51,7 +51,7 @@ static unsigned int stmmac_jumbo_frm(void *p, struct sk_buff *skb, int csum) desc->des3 = desc->des2 + BUF_SIZE_4KiB; priv->hw->desc->prepare_tx_desc(desc, 1, bmax, csum); - + wmb(); entry = (++priv->cur_tx) % txsize; desc = priv->dma_tx + entry; @@ -59,6 +59,7 @@ static unsigned int stmmac_jumbo_frm(void *p, struct sk_buff *skb, int csum) len, DMA_TO_DEVICE); desc->des3 = desc->des2 + BUF_SIZE_4KiB; priv->hw->desc->prepare_tx_desc(desc, 0, len, csum); + wmb(); priv->hw->desc->set_tx_owner(desc); priv->tx_skbuff[entry] = NULL; } else { |