Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6

[mv-sheeva.git] / net / core / wireless.c

diff --git a/net/core/wireless.c b/net/core/wireless.c
index cb1b8728d7eec0c55c6151da9fba7d00f42747e9..f69ab7b4408ecca979e5e6f43aefd2a051577c06 100644 (file)
--- a/net/core/wireless.c
+++ b/net/core/wireless.c
@@ -2130,7 +2130,7 @@ int iw_handler_set_spy(struct net_device *        dev,
         * The rtnl_lock() make sure we don't race with the other iw_handlers.
         * This make sure wireless_spy_update() "see" that the spy list
         * is temporarily disabled. */
-       wmb();
+       smp_wmb();
 
        /* Are there are addresses to copy? */
        if(wrqu->data.length > 0) {
@@ -2159,7 +2159,7 @@ int iw_handler_set_spy(struct net_device *        dev,
        }
 
        /* Make sure above is updated before re-enabling */
-       wmb();
+       smp_wmb();
 
        /* Enable addresses */
        spydata->spy_number = wrqu->data.length;