From c6f0cad96bf099b68f193d89767c5907beab5cc9 Mon Sep 17 00:00:00 2001 From: Arik Nemtsov Date: Sun, 3 Jun 2012 23:32:32 +0300 Subject: [PATCH] --- yaml --- r: 310734 b: refs/heads/master c: 794454ce72a298de6f4536ade597bdcc7dcde7c7 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/mac80211/sta_info.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 35d645882e36..1396649ecb4e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 69aaedd3cfd23b2c732e3cf1227370a35f5c89d4 +refs/heads/master: 794454ce72a298de6f4536ade597bdcc7dcde7c7 diff --git a/trunk/net/mac80211/sta_info.c b/trunk/net/mac80211/sta_info.c index f5b1638fbf80..de455f8bbb91 100644 --- a/trunk/net/mac80211/sta_info.c +++ b/trunk/net/mac80211/sta_info.c @@ -378,7 +378,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); @@ -688,7 +688,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++)