diff options
| author | Johannes Berg <johannes@sipsolutions.net> | 2008-03-05 20:39:31 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2008-03-07 16:02:59 -0500 |
| commit | e5f98f2df903af627a9b9ac55b9352fd54fc431a (patch) | |
| tree | a63eeaf5c0312b870b359005b61207b0e147ed03 | |
| parent | bb0c9dc27e8fa360e108e6e96860da620a7c5d04 (diff) | |
| download | kernel_samsung_smdk4412-e5f98f2df903af627a9b9ac55b9352fd54fc431a.tar.gz kernel_samsung_smdk4412-e5f98f2df903af627a9b9ac55b9352fd54fc431a.tar.bz2 kernel_samsung_smdk4412-e5f98f2df903af627a9b9ac55b9352fd54fc431a.zip | |
mac80211: don't call conf_tx under RCU lock
Reinette pointed out that with the sta_info RCU-ification
the behaviour here changed and the conf_tx callback is
now invoked under RCU read lock. That is not necessary so
this patch restores the original behaviour
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Tested-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | net/mac80211/ieee80211_sta.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/mac80211/ieee80211_sta.c b/net/mac80211/ieee80211_sta.c index bece28b3eba..8b991ebcbb4 100644 --- a/net/mac80211/ieee80211_sta.c +++ b/net/mac80211/ieee80211_sta.c @@ -1930,16 +1930,16 @@ static void ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata, if (elems.wmm_param && (ifsta->flags & IEEE80211_STA_WMM_ENABLED)) { sta->flags |= WLAN_STA_WME; + rcu_read_unlock(); ieee80211_sta_wmm_params(dev, ifsta, elems.wmm_param, elems.wmm_param_len); - } + } else + rcu_read_unlock(); /* set AID, ieee80211_set_associated() will tell the driver */ bss_conf->aid = aid; ieee80211_set_associated(dev, ifsta, 1); - rcu_read_unlock(); - ieee80211_associated(dev, ifsta); } |