Commit c68ce71a authored by Stephen Hemminger's avatar Stephen Hemminger Committed by Jeff Garzik

[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: default avatarStephen Hemminger <shemminger@osdl.org>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent ff7907ae
...@@ -2394,9 +2394,11 @@ static int skge_xmit_frame(struct sk_buff *skb, struct net_device *dev) ...@@ -2394,9 +2394,11 @@ static int skge_xmit_frame(struct sk_buff *skb, struct net_device *dev)
netif_stop_queue(dev); netif_stop_queue(dev);
} }
dev->trans_start = jiffies; mmiowb();
spin_unlock(&skge->tx_lock); spin_unlock(&skge->tx_lock);
dev->trans_start = jiffies;
return NETDEV_TX_OK; return NETDEV_TX_OK;
} }
...@@ -2730,6 +2732,8 @@ static int skge_poll(struct net_device *dev, int *budget) ...@@ -2730,6 +2732,8 @@ static int skge_poll(struct net_device *dev, int *budget)
return 1; /* not done */ return 1; /* not done */
netif_rx_complete(dev); netif_rx_complete(dev);
mmiowb();
hw->intr_mask |= skge->port == 0 ? (IS_R1_F|IS_XA1_F) : (IS_R2_F|IS_XA2_F); 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); skge_write32(hw, B0_IMSK, hw->intr_mask);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment