Merge "nl80211: Use different attrs for BSSID and random MAC addr in scan req" (dfdaa5be) · Commits · e / devices / android_kernel_xiaomi_markw

include/net/cfg80211.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -72,6 +72,7 @@ struct wiphy;
		#define CFG80211_CONNECT_TIMEOUT 1
		#define CFG80211_INFORM_BSS_FRAME_DATA 1
		#define CFG80211_SCAN_RANDOM_MAC_ADDR 1
		#define CFG80211_UPDATE_CONNECT_PARAMS 1

		/*
		* wireless hardware capability structures

+6 −1

Original line number	Diff line number	Diff line
		@@ -290,7 +290,7 @@
		* @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. %NL80211_ATTR_MAC can be used to
		* probe requests at CCK rate or not. %NL80211_ATTR_BSSID 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
		@@ -1888,6 +1888,9 @@ enum nl80211_commands {
		* @NL80211_ATTR_MULTICAST_TO_UNICAST_ENABLED: Indicates whether or not multicast
		* packets should be send out as unicast to all stations (flag attribute).
		*
		* @NL80211_ATTR_BSSID: The BSSID of the AP. Note that %NL80211_ATTR_MAC is also
		* used in various commands/events for specifying the BSSID.
		*
		* @NL80211_ATTR_MAX: highest attribute number currently defined
		* @__NL80211_ATTR_AFTER_LAST: internal use
		*/
		@@ -2291,6 +2294,8 @@ enum nl80211_attrs {

		NL80211_ATTR_MULTICAST_TO_UNICAST_ENABLED,

		NL80211_ATTR_BSSID,

		/* add attributes here, update the policy in nl80211.c */

		__NL80211_ATTR_AFTER_LAST,

+15 −1

Original line number	Diff line number	Diff line
		@@ -397,6 +397,7 @@ static const struct nla_policy nl80211_policy[NL80211_ATTR_MAX+1] = {
		[NL80211_ATTR_SMPS_MODE] = { .type = NLA_U8 },
		[NL80211_ATTR_MAC_MASK] = { .len = ETH_ALEN },
		[NL80211_ATTR_PBSS] = { .type = NLA_FLAG },
		[NL80211_ATTR_BSSID] = { .len = ETH_ALEN },
		};

		/* policy for the key attributes */
		@@ -5982,7 +5983,20 @@ 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])
		/* Initial implementation used NL80211_ATTR_MAC to set the specific
		* BSSID to scan for. This was problematic because that same attribute
		* was already used for another purpose (local random MAC address). The
		* NL80211_ATTR_BSSID attribute was added to fix this. For backwards
		* compatibility with older userspace components, also use the
		* NL80211_ATTR_MAC value here if it can be determined to be used for
		* the specific BSSID use case instead of the random MAC address
		* (NL80211_ATTR_SCAN_FLAGS is used to enable random MAC address use).
		*/
		if (info->attrs[NL80211_ATTR_BSSID])
		memcpy(request->bssid,
		nla_data(info->attrs[NL80211_ATTR_BSSID]), ETH_ALEN);
		else if (!(request->flags & NL80211_SCAN_FLAG_RANDOM_ADDR) &&
		info->attrs[NL80211_ATTR_MAC])
		memcpy(request->bssid, nla_data(info->attrs[NL80211_ATTR_MAC]),
		ETH_ALEN);
		else