diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-06-06 14:40:06 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-06-06 14:40:06 -0400 |
| commit | 7c9c46c16d2d1d232f3296924162de293477f017 (patch) | |
| tree | 4dba9e4da9ad99a73251b4b0563f910f727894fb /net/mac80211/sta_info.c | |
| parent | fdbfff73408f99799724f583cbc2a0ce3263c6a7 (diff) | |
| parent | 2d4524ac18a3965051f6279aff5e9b1d72ac9d7f (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts:
drivers/net/wireless/iwlwifi/iwl-drv.c
Diffstat (limited to 'net/mac80211/sta_info.c')
| -rw-r--r-- | net/mac80211/sta_info.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c index 0a70f797dcf1..77dcf2f89d42 100644 --- a/net/mac80211/sta_info.c +++ b/net/mac80211/sta_info.c | |||
| @@ -377,7 +377,7 @@ static int sta_info_insert_finish(struct sta_info *sta) __acquires(RCU) | |||
| 377 | /* make the station visible */ | 377 | /* make the station visible */ |
| 378 | sta_info_hash_add(local, sta); | 378 | sta_info_hash_add(local, sta); |
| 379 | 379 | ||
| 380 | list_add(&sta->list, &local->sta_list); | 380 | list_add_rcu(&sta->list, &local->sta_list); |
| 381 | 381 | ||
| 382 | set_sta_flag(sta, WLAN_STA_INSERTED); | 382 | set_sta_flag(sta, WLAN_STA_INSERTED); |
| 383 | 383 | ||
| @@ -686,7 +686,7 @@ int __must_check __sta_info_destroy(struct sta_info *sta) | |||
| 686 | if (ret) | 686 | if (ret) |
| 687 | return ret; | 687 | return ret; |
| 688 | 688 | ||
| 689 | list_del(&sta->list); | 689 | list_del_rcu(&sta->list); |
| 690 | 690 | ||
| 691 | mutex_lock(&local->key_mtx); | 691 | mutex_lock(&local->key_mtx); |
| 692 | for (i = 0; i < NUM_DEFAULT_KEYS; i++) | 692 | for (i = 0; i < NUM_DEFAULT_KEYS; i++) |