lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Conflicts:
	Documentation/feature-removal-schedule.txt
This commit is contained in:
John W. Linville
2011-10-11 15:35:42 -04:00
parent 3ed6f6958c 5f68a2b0a8
commit 094daf7db7
128 changed files with 6655 additions and 2722 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
net/mac80211/iface.c
View File

@ -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) {