aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@osdl.org>2006-03-21 13:57:04 -0500
committerJeff Garzik <jeff@garzik.org>2006-03-21 16:00:51 -0500
commitc68ce71a340ffb5c589db5d9f9af1ce4ef81baa9 (patch)
tree4fc443b263453df988de5133a9ab07561f40fbc4 /drivers/net
parentff7907aede7962629c2eb50e08b870316c80518f (diff)
[PATCH] skge: use mmiowb
Add mmio barriers at the appropriate places, don't have a platform that needs them, but this is where the documentation of the patch says to add them. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/skge.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/skge.c b/drivers/net/skge.c
index 5ece10034df9..8c674cdecd7b 100644
--- a/drivers/net/skge.c
+++ b/drivers/net/skge.c
@@ -2394,9 +2394,11 @@ static int skge_xmit_frame(struct sk_buff *skb, struct net_device *dev)
2394 netif_stop_queue(dev); 2394 netif_stop_queue(dev);
2395 } 2395 }
2396 2396
2397 dev->trans_start = jiffies; 2397 mmiowb();
2398 spin_unlock(&skge->tx_lock); 2398 spin_unlock(&skge->tx_lock);
2399 2399
2400 dev->trans_start = jiffies;
2401
2400 return NETDEV_TX_OK; 2402 return NETDEV_TX_OK;
2401} 2403}
2402 2404
@@ -2730,6 +2732,8 @@ static int skge_poll(struct net_device *dev, int *budget)
2730 return 1; /* not done */ 2732 return 1; /* not done */
2731 2733
2732 netif_rx_complete(dev); 2734 netif_rx_complete(dev);
2735 mmiowb();
2736
2733 hw->intr_mask |= skge->port == 0 ? (IS_R1_F|IS_XA1_F) : (IS_R2_F|IS_XA2_F); 2737 hw->intr_mask |= skge->port == 0 ? (IS_R1_F|IS_XA1_F) : (IS_R2_F|IS_XA2_F);
2734 skge_write32(hw, B0_IMSK, hw->intr_mask); 2738 skge_write32(hw, B0_IMSK, hw->intr_mask);
2735 2739