summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Blanchard <anton@samba.org>2003-07-29 08:24:10 -0700
committerAnton Blanchard <anton@samba.org>2003-07-29 08:24:10 -0700
commit9dcdb6ef5ffb7156e90a248d4738c7caf9e9c4fa (patch)
tree9843570d3b2eabf001480bd8755a375e3c79c296
parent395ab5d666da3eff3b34572d658412ce28f6ad7f (diff)
[NET]: Add missing memory barriors for __LINK_STATE_RX_SCHED handling.
-rw-r--r--drivers/net/tg3.c1
-rw-r--r--include/linux/netdevice.h1
-rw-r--r--net/core/dev.c1
3 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index beed7b3adebe..4f6d7b868d4f 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -258,6 +258,7 @@ static inline void __netif_rx_complete(struct net_device *dev)
{
if (!test_bit(__LINK_STATE_RX_SCHED, &dev->state)) BUG();
list_del(&dev->poll_list);
+ smp_mb__before_clear_bit();
clear_bit(__LINK_STATE_RX_SCHED, &dev->state);
}
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index c28c63ea442d..ba588acb49bd 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -820,6 +820,7 @@ static inline void netif_rx_complete(struct net_device *dev)
local_irq_save(flags);
if (!test_bit(__LINK_STATE_RX_SCHED, &dev->state)) BUG();
list_del(&dev->poll_list);
+ smp_mb__before_clear_bit();
clear_bit(__LINK_STATE_RX_SCHED, &dev->state);
local_irq_restore(flags);
}
diff --git a/net/core/dev.c b/net/core/dev.c
index 1c5942c9b63b..dd47399e5f1c 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1657,6 +1657,7 @@ job_done:
*budget -= work;
list_del(&backlog_dev->poll_list);
+ smp_mb__before_clear_bit();
clear_bit(__LINK_STATE_RX_SCHED, &backlog_dev->state);
if (queue->throttle) {