Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-drv.c
This commit is contained in:
John W. Linville
2012-06-06 14:40:06 -04:00
21 changed files with 153 additions and 47 deletions

View File

@@ -377,7 +377,7 @@ static int sta_info_insert_finish(struct sta_info *sta) __acquires(RCU)
/* make the station visible */
sta_info_hash_add(local, sta);
list_add(&sta->list, &local->sta_list);
list_add_rcu(&sta->list, &local->sta_list);
set_sta_flag(sta, WLAN_STA_INSERTED);
@@ -686,7 +686,7 @@ int __must_check __sta_info_destroy(struct sta_info *sta)
if (ret)
return ret;
list_del(&sta->list);
list_del_rcu(&sta->list);
mutex_lock(&local->key_mtx);
for (i = 0; i < NUM_DEFAULT_KEYS; i++)