Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 39d02a7d authored by Mohammed Shafi Shajakhan's avatar Mohammed Shafi Shajakhan Committed by John W. Linville
Browse files

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: default avatarMohammed Shafi Shajakhan <mohammed@qca.qualcomm.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent fb4961db

net/mac80211/ibss.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -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);

	       "IBSS networks with same SSID (merge)\n", sdata->name);





	ieee80211_request_internal_scan(sdata,

	ieee80211_request_internal_scan(sdata,

			ifibss->ssid, ifibss->ssid_len,

			ifibss->ssid, ifibss->ssid_len, NULL);

			ifibss->fixed_channel ? ifibss->channel : NULL);

}

}





static void ieee80211_sta_create_ibss(struct ieee80211_sub_if_data *sdata)

static void ieee80211_sta_create_ibss(struct ieee80211_sub_if_data *sdata)