From: Mohammed Shafi Shajakhan Date: Sat, 7 Jan 2012 15:36:21 +0000 (+0530) Subject: mac80211: minor cleanup X-Git-Tag: v3.4-rc1~177^2~376^2^2~79 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=39d02a7d90602d4557ee05db2a157a4e0;p=karo-tx-linux.git mac80211: minor cleanup 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 Signed-off-by: John W. Linville --- diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c index b3d76b756cd5..b4c30318e22b 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)