diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-06-06 20:40:06 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-06-06 20:40:06 +0200 |
| commit | 7c9c46c16d2d1d232f3296924162de293477f017 (patch) | |
| tree | 4dba9e4da9ad99a73251b4b0563f910f727894fb /net/mac80211/sta_info.c | |
| parent | net/wireless: ipw2200: introduce ipw_read_eeprom function (diff) | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/blueto... (diff) | |
| download | linux-7c9c46c16d2d1d232f3296924162de293477f017.tar.xz linux-7c9c46c16d2d1d232f3296924162de293477f017.zip | |
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) /* 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++) |