[PATCH] mac80211: minor cleanup
From: Mohammed Shafi Shajakhan <hidden>
Date: 2012-01-07 15:36:31
Subsystem:
mac80211, the rest · Maintainers:
Johannes Berg, Linus Torvalds
From: Mohammed Shafi Shajakhan <redacted> we would have bailed out if 'ifibss->fixed_channel' is valid i.e. we had used 'fixed-freq' parameter in iw ibss join command. this is with the state 'IEEE80211_IBSS_MLME_JOINED' so no need to check for it Signed-off-by: Mohammed Shafi Shajakhan <redacted> --- net/mac80211/ibss.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c
index f8a32bf..8875673 100644
--- a/net/mac80211/ibss.c
+++ b/net/mac80211/ibss.c@@ -642,8 +642,7 @@ static void ieee80211_sta_merge_ibss(struct ieee80211_sub_if_data *sdata) "IBSS networks with same SSID (merge)\n", sdata->name); ieee80211_request_internal_scan(sdata, - ifibss->ssid, ifibss->ssid_len, - ifibss->fixed_channel ? ifibss->channel : NULL); + ifibss->ssid, ifibss->ssid_len, NULL); } static void ieee80211_sta_create_ibss(struct ieee80211_sub_if_data *sdata)
--
1.7.0.4