diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2006-12-07 03:11:33 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2006-12-07 03:11:33 -0500 |
commit | e16aa207ccb61c5111525c462eeeba1f3f5fd370 (patch) | |
tree | 8a0a344fe7a3a10567075c9d63438ff6d79a1ca6 /net/core | |
parent | 26db167702756d0022f8ea5f1f30cad3018cfe31 (diff) |
[NET]: Memory barrier cleanups
I believe all the below memory barriers only matter on SMP so
therefore the smp_* variant of the barrier should be used.
I'm wondering if the barrier in net/ipv4/inet_timewait_sock.c should be
dropped entirely. schedule_work's implementation currently implies a
memory barrier and I think sane semantics of schedule_work() should imply
a memory barrier, as needed so the caller shouldn't have to worry.
It's not quite obvious why the barrier in net/packet/af_packet.c is
needed; maybe it should be implied through flush_dcache_page?
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
-rw-r--r-- | net/core/wireless.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/wireless.c b/net/core/wireless.c index cb1b8728d7ee..f69ab7b4408e 100644 --- a/net/core/wireless.c +++ b/net/core/wireless.c | |||
@@ -2130,7 +2130,7 @@ int iw_handler_set_spy(struct net_device * dev, | |||
2130 | * The rtnl_lock() make sure we don't race with the other iw_handlers. | 2130 | * The rtnl_lock() make sure we don't race with the other iw_handlers. |
2131 | * This make sure wireless_spy_update() "see" that the spy list | 2131 | * This make sure wireless_spy_update() "see" that the spy list |
2132 | * is temporarily disabled. */ | 2132 | * is temporarily disabled. */ |
2133 | wmb(); | 2133 | smp_wmb(); |
2134 | 2134 | ||
2135 | /* Are there are addresses to copy? */ | 2135 | /* Are there are addresses to copy? */ |
2136 | if(wrqu->data.length > 0) { | 2136 | if(wrqu->data.length > 0) { |
@@ -2159,7 +2159,7 @@ int iw_handler_set_spy(struct net_device * dev, | |||
2159 | } | 2159 | } |
2160 | 2160 | ||
2161 | /* Make sure above is updated before re-enabling */ | 2161 | /* Make sure above is updated before re-enabling */ |
2162 | wmb(); | 2162 | smp_wmb(); |
2163 | 2163 | ||
2164 | /* Enable addresses */ | 2164 | /* Enable addresses */ |
2165 | spydata->spy_number = wrqu->data.length; | 2165 | spydata->spy_number = wrqu->data.length; |