Merge "cfg80211: Add support for randomizing TA of Public Action frames" (8f947810) · Commits · e / devices / android_kernel_xiaomi_markw

include/uapi/linux/nl80211.h

+6 −0

Original line number	Diff line number	Diff line
		@@ -4442,6 +4442,10 @@ enum nl80211_feature_flags {
		* configuration (AP/mesh) with VHT rates.
		* @NL80211_EXT_FEATURE_FILS_STA: This driver supports Fast Initial Link Setup
		* with user space SME (NL80211_CMD_AUTHENTICATE) in station mode.
		* @NL80211_EXT_FEATURE_MGMT_TX_RANDOM_TA: This driver supports randomized TA
		* in @NL80211_CMD_FRAME while not associated.
		* @NL80211_EXT_FEATURE_MGMT_TX_RANDOM_TA_CONNECTED: This driver supports
		* randomized TA in @NL80211_CMD_FRAME while associated.
		*
		* @NUM_NL80211_EXT_FEATURES: number of extended features.
		* @MAX_NL80211_EXT_FEATURES: highest extended feature index.
		@@ -4457,6 +4461,8 @@ enum nl80211_ext_feature_index {
		NL80211_EXT_FEATURE_BEACON_RATE_HT,
		NL80211_EXT_FEATURE_BEACON_RATE_VHT,
		NL80211_EXT_FEATURE_FILS_STA,
		NL80211_EXT_FEATURE_MGMT_TX_RANDOM_TA,
		NL80211_EXT_FEATURE_MGMT_TX_RANDOM_TA_CONNECTED,

		/* add new features before the definition below */
		NUM_NL80211_EXT_FEATURES,

+19 −2

Original line number	Diff line number	Diff line
		@@ -599,8 +599,25 @@ int cfg80211_mlme_mgmt_tx(struct cfg80211_registered_device *rdev,
		return err;
		}

		if (!ether_addr_equal(mgmt->sa, wdev_address(wdev)))
		if (!ether_addr_equal(mgmt->sa, wdev_address(wdev))) {
		/* Allow random TA to be used with Public Action frames if the
		* driver has indicated support for this. Otherwise, only allow
		* the local address to be used.
		*/
		if (!ieee80211_is_action(mgmt->frame_control) \|\|
		mgmt->u.action.category != WLAN_CATEGORY_PUBLIC)
		return -EINVAL;
		if (!wdev->current_bss &&
		!wiphy_ext_feature_isset(
		&rdev->wiphy,
		NL80211_EXT_FEATURE_MGMT_TX_RANDOM_TA))
		return -EINVAL;
		if (wdev->current_bss &&
		!wiphy_ext_feature_isset(
		&rdev->wiphy,
		NL80211_EXT_FEATURE_MGMT_TX_RANDOM_TA_CONNECTED))
		return -EINVAL;
		}

		/* Transmit the Action frame as requested by user space */
		return rdev_mgmt_tx(rdev, wdev, params, cookie);