From 48ff07643959b478069bb780f503c017184db9f3 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Tue, 17 Jan 2006 13:43:14 -0800 Subject: [PATCH] --- yaml --- r: 18831 b: refs/heads/master c: 762c2de2e61ef5f3c866d00861e6b1509cd8eacf h: refs/heads/master i: 18829: 122b5c784abf3775d64d4d68ecb2e5495a12171a 18827: 7ad4c02e74619a2996ac3287203a27755b0819d4 18823: cf01eef08c3fd393b0ec163050516d8eedbf0083 18815: 72f654716401f89bd20d9572c4fa647804848385 v: v3 --- [refs] | 2 +- trunk/drivers/net/sky2.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index dd302522f6ca..d2725114c580 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1c28f6ba600d05be2dc7ab0592e4d845f668a485 +refs/heads/master: 762c2de2e61ef5f3c866d00861e6b1509cd8eacf diff --git a/trunk/drivers/net/sky2.c b/trunk/drivers/net/sky2.c index 178249a96e1c..1407ff2da41e 100644 --- a/trunk/drivers/net/sky2.c +++ b/trunk/drivers/net/sky2.c @@ -707,6 +707,7 @@ static inline struct sky2_tx_le *get_tx_le(struct sky2_port *sky2) static inline void sky2_put_idx(struct sky2_hw *hw, unsigned q, u16 idx, u16 *last, u16 size) { + wmb(); if (is_ec_a1(hw) && idx < *last) { u16 hwget = sky2_read16(hw, Y2_QADDR(q, PREF_UNIT_GET_IDX)); @@ -730,6 +731,7 @@ static inline void sky2_put_idx(struct sky2_hw *hw, unsigned q, sky2_write16(hw, Y2_QADDR(q, PREF_UNIT_PUT_IDX), idx); } *last = idx; + mmiowb(); } @@ -1253,7 +1255,6 @@ static int sky2_xmit_frame(struct sk_buff *skb, struct net_device *dev) netif_stop_queue(dev); out_unlock: - mmiowb(); spin_unlock(&sky2->tx_lock); dev->trans_start = jiffies; @@ -1896,7 +1897,6 @@ static int sky2_poll(struct net_device *dev0, int *budget) exit_loop: sky2_write32(hw, STAT_CTRL, SC_STAT_CLR_IRQ); - mmiowb(); sky2_tx_check(hw, 0, tx_done[0]); sky2_tx_check(hw, 1, tx_done[1]); @@ -1911,7 +1911,6 @@ static int sky2_poll(struct net_device *dev0, int *budget) netif_rx_complete(dev0); hw->intr_mask |= Y2_IS_STAT_BMU; sky2_write32(hw, B0_IMSK, hw->intr_mask); - mmiowb(); return 0; } else { *budget -= work_done;