From b4a3a506034033d32d35d3a5611974db8b23b769 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@osdl.org>
Date: Tue, 21 Mar 2006 10:57:04 -0800
Subject: [PATCH] --- yaml --- r: 22349 b: refs/heads/master c:
 c68ce71a340ffb5c589db5d9f9af1ce4ef81baa9 h: refs/heads/master i:   22347:
 1dc0e8d54a919f91f3b502fbbc9c80729edc6d23 v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/net/skge.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index feaa5f72a937..7c87fa8229b9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ff7907aede7962629c2eb50e08b870316c80518f
+refs/heads/master: c68ce71a340ffb5c589db5d9f9af1ce4ef81baa9
diff --git a/trunk/drivers/net/skge.c b/trunk/drivers/net/skge.c
index 5ece10034df9..8c674cdecd7b 100644
--- a/trunk/drivers/net/skge.c
+++ b/trunk/drivers/net/skge.c
@@ -2394,9 +2394,11 @@ static int skge_xmit_frame(struct sk_buff *skb, struct net_device *dev)
 		netif_stop_queue(dev);
 	}
 
-	dev->trans_start = jiffies;
+	mmiowb();
 	spin_unlock(&skge->tx_lock);
 
+	dev->trans_start = jiffies;
+
 	return NETDEV_TX_OK;
 }
 
@@ -2730,6 +2732,8 @@ static int skge_poll(struct net_device *dev, int *budget)
 		return 1; /* not done */
 
 	netif_rx_complete(dev);
+	mmiowb();
+
   	hw->intr_mask |= skge->port == 0 ? (IS_R1_F|IS_XA1_F) : (IS_R2_F|IS_XA2_F);
   	skge_write32(hw, B0_IMSK, hw->intr_mask);