Commit 6ff9efcf authored by Mordechay Goodstein's avatar Mordechay Goodstein Committed by Johannes Berg
Browse files

wifi: wireless: cleanup unused function parameters 



In the past ftype was used for deciding about 6G DUP beacon, but the
logic was removed and ftype is not needed anymore.

Signed-off-by: default avatarMordechay Goodstein <mordechay.goodstein@intel.com>
Signed-off-by: default avatarGregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20230301115906.98d4761b809b.I255f5ecd77cb24fcf2f1641bb5833ea2d121296e@changeid


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent fb4b441c

include/net/cfg80211.h

+1 −3
Original line number Diff line number Diff line
@@ -6814,13 +6814,11 @@ enum cfg80211_bss_frame_type { 
 * @ie: IEs

 * @ielen: length of IEs

 * @band: enum nl80211_band of the channel

 * @ftype: frame type

 *

 * Returns the channel number, or -1 if none could be determined.

 */

int cfg80211_get_ies_channel_number(const u8 *ie, size_t ielen,

				    enum nl80211_band band,

				    enum cfg80211_bss_frame_type ftype);

				    enum nl80211_band band);



/**

 * cfg80211_inform_bss_data - inform cfg80211 of a new BSS

net/wireless/scan.c

+5 −16
Original line number Diff line number Diff line
@@ -1810,8 +1810,7 @@ cfg80211_bss_update(struct cfg80211_registered_device *rdev, 
}



int cfg80211_get_ies_channel_number(const u8 *ie, size_t ielen,

				    enum nl80211_band band,

				    enum cfg80211_bss_frame_type ftype)

				    enum nl80211_band band)

{

	const struct element *tmp;
@@ -1868,15 +1867,14 @@ EXPORT_SYMBOL(cfg80211_get_ies_channel_number); 
static struct ieee80211_channel *

cfg80211_get_bss_channel(struct wiphy *wiphy, const u8 *ie, size_t ielen,

			 struct ieee80211_channel *channel,

			 enum nl80211_bss_scan_width scan_width,

			 enum cfg80211_bss_frame_type ftype)

			 enum nl80211_bss_scan_width scan_width)

{

	u32 freq;

	int channel_number;

	struct ieee80211_channel *alt_channel;



	channel_number = cfg80211_get_ies_channel_number(ie, ielen,

							 channel->band, ftype);

							 channel->band);



	if (channel_number < 0) {

		/* No channel information in frame payload */
@@ -1954,7 +1952,7 @@ cfg80211_inform_single_bss_data(struct wiphy *wiphy, 
		return NULL;



	channel = cfg80211_get_bss_channel(wiphy, ie, ielen, data->chan,

					   data->scan_width, ftype);

					   data->scan_width);

	if (!channel)

		return NULL;
@@ -2388,7 +2386,6 @@ cfg80211_inform_single_bss_frame_data(struct wiphy *wiphy, 
	size_t ielen, min_hdr_len = offsetof(struct ieee80211_mgmt,

					     u.probe_resp.variable);

	int bss_type;

	enum cfg80211_bss_frame_type ftype;



	BUILD_BUG_ON(offsetof(struct ieee80211_mgmt, u.probe_resp.variable) !=

			offsetof(struct ieee80211_mgmt, u.beacon.variable));
@@ -2425,16 +2422,8 @@ cfg80211_inform_single_bss_frame_data(struct wiphy *wiphy, 
			variable = ext->u.s1g_beacon.variable;

	}



	if (ieee80211_is_beacon(mgmt->frame_control))

		ftype = CFG80211_BSS_FTYPE_BEACON;

	else if (ieee80211_is_probe_resp(mgmt->frame_control))

		ftype = CFG80211_BSS_FTYPE_PRESP;

	else

		ftype = CFG80211_BSS_FTYPE_UNKNOWN;



	channel = cfg80211_get_bss_channel(wiphy, variable,

					   ielen, data->chan, data->scan_width,

					   ftype);

					   ielen, data->chan, data->scan_width);

	if (!channel)

		return NULL;