aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuciano Coelho <luciano.coelho@intel.com>2014-01-28 10:09:08 -0500
committerJohannes Berg <johannes.berg@intel.com>2014-02-04 15:58:11 -0500
commit9fa37a3d6604fcdd1372bc0d2d724c3371ecb7f9 (patch)
tree9cc5da67fb344d0ee8551aeea5fbc5dbb492f7e3
parentdbd72850dcc9738b42a9762ef8c4a1a66b30d897 (diff)
mac80211: ibss: remove unnecessary call to release channel
The ieee80211_vif_use_channel() function calls ieee80211_vif_release_channel(), so there's no need to call it explicitly in __ieee80211_sta_join_ibss(). Signed-off-by: Luciano Coelho <luciano.coelho@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-rw-r--r--net/mac80211/ibss.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c
index b2da79f019d4..a35f37980e70 100644
--- a/net/mac80211/ibss.c
+++ b/net/mac80211/ibss.c
@@ -294,7 +294,6 @@ static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata,
294 } 294 }
295 295
296 mutex_lock(&local->mtx); 296 mutex_lock(&local->mtx);
297 ieee80211_vif_release_channel(sdata);
298 if (ieee80211_vif_use_channel(sdata, &chandef, 297 if (ieee80211_vif_use_channel(sdata, &chandef,
299 ifibss->fixed_channel ? 298 ifibss->fixed_channel ?
300 IEEE80211_CHANCTX_SHARED : 299 IEEE80211_CHANCTX_SHARED :