diff options
| author | Stephen Hemminger <shemminger@osdl.org> | 2006-03-21 19:57:04 +0100 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-21 22:00:51 +0100 |
| commit | c68ce71a340ffb5c589db5d9f9af1ce4ef81baa9 (patch) | |
| tree | 4fc443b263453df988de5133a9ab07561f40fbc4 | |
| parent | [PATCH] skge: use kcalloc (diff) | |
| download | linux-c68ce71a340ffb5c589db5d9f9af1ce4ef81baa9.tar.xz linux-c68ce71a340ffb5c589db5d9f9af1ce4ef81baa9.zip | |
[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>
| -rw-r--r-- | drivers/net/skge.c | 6 |
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) 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); |