diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-10-11 15:35:42 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-10-11 15:35:42 -0400 |
| commit | 094daf7db7c47861009899ce23f9177d761e20b0 (patch) | |
| tree | a107065393720b80664157a035b206576e834793 /net/mac80211/iface.c | |
| parent | 3ed6f6958c0ac21958285d8648f14d34da4bbcb3 (diff) | |
| parent | 5f68a2b0a890d086e40fc7b55f4a0c32c28bc0d2 (diff) | |
Merge branch 'master' of git://git.infradead.org/users/linville/wireless-next into for-davem
Conflicts:
Documentation/feature-removal-schedule.txt
Diffstat (limited to 'net/mac80211/iface.c')
| -rw-r--r-- | net/mac80211/iface.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index f4350262663..30d73552e9a 100644 --- 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) { |