Commit 818965d3 authored by Jouni Malinen's avatar Jouni Malinen Committed by Johannes Berg
Browse files

cfg80211: Allow a scan request for a specific BSSID 



This allows scans for a specific BSSID to be optimized by the user space
application by requesting the driver to set the Probe Request frame
BSSID field (Address 3) to the specified BSSID instead of the wildcard
BSSID. This prevents other APs from replying which reduces airtime need
and latency in getting the response from the target AP through.

This is an optimization and as such, it is acceptable for some of the
drivers not to support the mechanism. If not supported, the wildcard
BSSID will be used and more responses may be received.

Signed-off-by: default avatarJouni Malinen <jouni@qca.qualcomm.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 5c05803a

include/net/cfg80211.h

+2 −0
Original line number Diff line number Diff line
@@ -1455,6 +1455,7 @@ struct cfg80211_ssid { 
 * @mac_addr_mask: MAC address mask used with randomisation, bits that

 *	are 0 in the mask should be randomised, bits that are 1 should

 *	be taken from the @mac_addr

 * @bssid: BSSID to scan for (most commonly, the wildcard BSSID)

 */

struct cfg80211_scan_request {

	struct cfg80211_ssid *ssids;
@@ -1471,6 +1472,7 @@ struct cfg80211_scan_request { 


	u8 mac_addr[ETH_ALEN] __aligned(2);

	u8 mac_addr_mask[ETH_ALEN] __aligned(2);

	u8 bssid[ETH_ALEN] __aligned(2);



	/* internal */

	struct wiphy *wiphy;

include/uapi/linux/nl80211.h

+3 −1
Original line number Diff line number Diff line
@@ -322,7 +322,9 @@ 
 * @NL80211_CMD_GET_SCAN: get scan results

 * @NL80211_CMD_TRIGGER_SCAN: trigger a new scan with the given parameters

 *	%NL80211_ATTR_TX_NO_CCK_RATE is used to decide whether to send the

 *	probe requests at CCK rate or not.

 *	probe requests at CCK rate or not. %NL80211_ATTR_MAC can be used to

 *	specify a BSSID to scan for; if not included, the wildcard BSSID will

 *	be used.

 * @NL80211_CMD_NEW_SCAN_RESULTS: scan notification (as a reply to

 *	NL80211_CMD_GET_SCAN and on the "scan" multicast group)

 * @NL80211_CMD_SCAN_ABORTED: scan was aborted, for unspecified reasons,

net/wireless/nl80211.c

+6 −0
Original line number Diff line number Diff line
@@ -5996,6 +5996,12 @@ static int nl80211_trigger_scan(struct sk_buff *skb, struct genl_info *info) 
	request->no_cck =

		nla_get_flag(info->attrs[NL80211_ATTR_TX_NO_CCK_RATE]);



	if (info->attrs[NL80211_ATTR_MAC])

		memcpy(request->bssid, nla_data(info->attrs[NL80211_ATTR_MAC]),

		       ETH_ALEN);

	else

		eth_broadcast_addr(request->bssid);



	request->wdev = wdev;

	request->wiphy = &rdev->wiphy;

	request->scan_start = jiffies;

net/wireless/scan.c

+2 −0
Original line number Diff line number Diff line
@@ -1293,6 +1293,8 @@ int cfg80211_wext_siwscan(struct net_device *dev, 
		if (wiphy->bands[i])

			creq->rates[i] = (1 << wiphy->bands[i]->n_bitrates) - 1;



	eth_broadcast_addr(creq->bssid);



	rdev->scan_req = creq;

	err = rdev_scan(rdev, creq);

	if (err) {

net/wireless/sme.c

+2 −0
Original line number Diff line number Diff line
@@ -119,6 +119,8 @@ static int cfg80211_conn_scan(struct wireless_dev *wdev) 
		wdev->conn->params.ssid_len);

	request->ssids[0].ssid_len = wdev->conn->params.ssid_len;



	eth_broadcast_addr(request->bssid);



	request->wdev = wdev;

	request->wiphy = &rdev->wiphy;

	request->scan_start = jiffies;

CRA Git | Maintained and supported by SUSTech CRA and CCSE