Merge branch 'master' of git://git.infradead.org/users/linville/wireless-next into...

[pandora-kernel.git] / net / mac80211 / iface.c

diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index f435026..30d7355 100644 (file)
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -299,8 +299,8 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up)
                        goto err_del_interface;
                }
 
-               /* no locking required since STA is not live yet */
-               sta->flags |= WLAN_STA_AUTHORIZED;
+               /* no atomic bitop required since STA is not live yet */
+               set_sta_flag(sta, WLAN_STA_AUTHORIZED);
 
                res = sta_info_insert(sta);
                if (res) {