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

Commit bdfbec2d authored by Ilan Peer's avatar Ilan Peer Committed by Johannes Berg
Browse files

cfg80211: Add a function to get the number of supported channels 



Add a utility function to get the number of channels supported by
the device, and update the places in the code that need this data.

Signed-off-by: default avatarIlan Peer <ilan.peer@intel.com>
[replace another occurrence in libertas, fix kernel-doc, fix bugs]
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 685328b2

drivers/net/wireless/libertas/cfg.c

+1 −6
Original line number Diff line number Diff line
@@ -1268,14 +1268,9 @@ static struct cfg80211_scan_request * 
_new_connect_scan_req(struct wiphy *wiphy, struct cfg80211_connect_params *sme)

{

	struct cfg80211_scan_request *creq = NULL;

	int i, n_channels = 0;

	int i, n_channels = ieee80211_get_num_supported_channels(wiphy);

	enum ieee80211_band band;



	for (band = 0; band < IEEE80211_NUM_BANDS; band++) {

		if (wiphy->bands[band])

			n_channels += wiphy->bands[band]->n_channels;

	}



	creq = kzalloc(sizeof(*creq) + sizeof(struct cfg80211_ssid) +

		       n_channels * sizeof(void *),

		       GFP_ATOMIC);

include/net/cfg80211.h

+8 −0
Original line number Diff line number Diff line
@@ -4640,6 +4640,14 @@ void cfg80211_report_wowlan_wakeup(struct wireless_dev *wdev, 
 */

void cfg80211_crit_proto_stopped(struct wireless_dev *wdev, gfp_t gfp);



/**

 * ieee80211_get_num_supported_channels - get number of channels device has

 * @wiphy: the wiphy

 *

 * Return: the number of channels supported by the device.

 */

unsigned int ieee80211_get_num_supported_channels(struct wiphy *wiphy);



/* Logging, debugging and troubleshooting/diagnostic helpers. */



/* wiphy_printk helpers, similar to dev_printk */

net/wireless/nl80211.c

+2 −11
Original line number Diff line number Diff line
@@ -5285,12 +5285,7 @@ static int nl80211_trigger_scan(struct sk_buff *skb, struct genl_info *info) 
			goto unlock;

		}

	} else {

		enum ieee80211_band band;

		n_channels = 0;



		for (band = 0; band < IEEE80211_NUM_BANDS; band++)

			if (wiphy->bands[band])

				n_channels += wiphy->bands[band]->n_channels;

		n_channels = ieee80211_get_num_supported_channels(wiphy);

	}



	if (info->attrs[NL80211_ATTR_SCAN_SSIDS])
@@ -5498,11 +5493,7 @@ static int nl80211_start_sched_scan(struct sk_buff *skb, 
		if (!n_channels)

			return -EINVAL;

	} else {

		n_channels = 0;



		for (band = 0; band < IEEE80211_NUM_BANDS; band++)

			if (wiphy->bands[band])

				n_channels += wiphy->bands[band]->n_channels;

		n_channels = ieee80211_get_num_supported_channels(wiphy);

	}



	if (info->attrs[NL80211_ATTR_SCAN_SSIDS])

net/wireless/scan.c

+2 −5
Original line number Diff line number Diff line
@@ -1089,11 +1089,8 @@ int cfg80211_wext_siwscan(struct net_device *dev, 
	/* Determine number of channels, needed to allocate creq */

	if (wreq && wreq->num_channels)

		n_channels = wreq->num_channels;

	else {

		for (band = 0; band < IEEE80211_NUM_BANDS; band++)

			if (wiphy->bands[band])

				n_channels += wiphy->bands[band]->n_channels;

	}

	else

		n_channels = ieee80211_get_num_supported_channels(wiphy);



	creq = kzalloc(sizeof(*creq) + sizeof(struct cfg80211_ssid) +

		       n_channels * sizeof(void *),

net/wireless/sme.c

+3 −10
Original line number Diff line number Diff line
@@ -70,18 +70,11 @@ static int cfg80211_conn_scan(struct wireless_dev *wdev) 
	if (rdev->scan_req)

		return -EBUSY;



	if (wdev->conn->params.channel) {

	if (wdev->conn->params.channel)

		n_channels = 1;

	} else {

		enum ieee80211_band band;

		n_channels = 0;

	else

		n_channels = ieee80211_get_num_supported_channels(wdev->wiphy);



		for (band = 0; band < IEEE80211_NUM_BANDS; band++) {

			if (!wdev->wiphy->bands[band])

				continue;

			n_channels += wdev->wiphy->bands[band]->n_channels;

		}

	}

	request = kzalloc(sizeof(*request) + sizeof(request->ssids[0]) +

			  sizeof(request->channels[0]) * n_channels,

			  GFP_KERNEL);