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

Commit c6e6a0c8 authored by Aviya Erenfeld's avatar Aviya Erenfeld Committed by Johannes Berg
Browse files

nl80211: Add API to support VHT MU-MIMO air sniffer 



add API to support VHT MU-MIMO air sniffer.
in MU-MIMO there are parallel frames on the air while the HW
has only one RX.
add the capability to sniff one of the MU-MIMO parallel frames by
giving the sniffer additional information so it'll know which
of the parallel frames it shall follow.

Add attribute - NL80211_ATTR_MU_MIMO_GROUP_DATA - for getting
a MU-MIMO groupID in order to monitor packets from that group
using VHT MU-MIMO.
And add attribute -NL80211_ATTR_MU_MIMO_FOLLOW_ADDR - for passing
MAC address to monitor mode.
that option will be used by VHT MU-MIMO air sniffer to follow a
station according to it's MAC address using VHT MU-MIMO.

Signed-off-by: default avatarAviya Erenfeld <aviya.erenfeld@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent f89e07d4

include/net/cfg80211.h

+8 −2
Original line number Diff line number Diff line
@@ -330,6 +330,9 @@ struct ieee80211_supported_band { 
 * in a separate chapter.

 */



#define VHT_MUMIMO_GROUPS_DATA_LEN (WLAN_MEMBERSHIP_LEN +\

				    WLAN_USER_POSITION_LEN)



/**

 * struct vif_params - describes virtual interface parameters

 * @use_4addr: use 4-address frames
@@ -339,10 +342,13 @@ struct ieee80211_supported_band { 
 *	This feature is only fully supported by drivers that enable the

 *	%NL80211_FEATURE_MAC_ON_CREATE flag.  Others may support creating

 **	only p2p devices with specified MAC.

 * @vht_mumimo_groups: MU-MIMO groupID. used for monitoring only

 *	 packets belonging to that MU-MIMO groupID.

 */

struct vif_params {

	int use_4addr;

	u8 macaddr[ETH_ALEN];

	u8 vht_mumimo_groups[VHT_MUMIMO_GROUPS_DATA_LEN];

};



/**

include/uapi/linux/nl80211.h

+29 −0
Original line number Diff line number Diff line
@@ -1829,6 +1829,25 @@ enum nl80211_commands { 
 *	%NL80211_ATTR_EXT_CAPA_MASK, to specify the extended capabilities per

 *	interface type.

 *

 * @NL80211_ATTR_MU_MIMO_GROUP_DATA: array of 24 bytes that defines a MU-MIMO

 *	groupID for monitor mode.

 *	The first 8 bytes are a mask that defines the membership in each

 *	group (there are 64 groups, group 0 and 63 are reserved),

 *	each bit represents a group and set to 1 for being a member in

 *	that group and 0 for not being a member.

 *	The remaining 16 bytes define the position in each group: 2 bits for

 *	each group.

 *	(smaller group numbers represented on most significant bits and bigger

 *	group numbers on least significant bits.)

 *	This attribute is used only if all interfaces are in monitor mode.

 *	Set this attribute in order to monitor packets using the given MU-MIMO

 *	groupID data.

 *	to turn off that feature set all the bits of the groupID to zero.

 * @NL80211_ATTR_MU_MIMO_FOLLOW_MAC_ADDR: mac address for the sniffer to follow

 *	when using MU-MIMO air sniffer.

 *	to turn that feature off set an invalid mac address

 *	(e.g. FF:FF:FF:FF:FF:FF)

 *

 * @NUM_NL80211_ATTR: total number of nl80211_attrs available

 * @NL80211_ATTR_MAX: highest attribute number currently defined

 * @__NL80211_ATTR_AFTER_LAST: internal use
@@ -2213,6 +2232,9 @@ enum nl80211_attrs { 


	NL80211_ATTR_IFTYPE_EXT_CAPA,



	NL80211_ATTR_MU_MIMO_GROUP_DATA,

	NL80211_ATTR_MU_MIMO_FOLLOW_MAC_ADDR,



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



	__NL80211_ATTR_AFTER_LAST,
@@ -4479,6 +4501,12 @@ enum nl80211_feature_flags { 
 *	%NL80211_CMD_ASSOCIATE and %NL80211_CMD_CONNECT requests, which will set

 *	the ASSOC_REQ_USE_RRM flag in the association request even if

 *	NL80211_FEATURE_QUIET is not advertized.

 * @NL80211_EXT_FEATURE_MU_MIMO_AIR_SNIFFER: This device supports MU-MIMO air

 *	sniffer which means that it can be configured to hear packets from

 *	certain groups which can be configured by the

 *	%NL80211_ATTR_MU_MIMO_GROUP_DATA attribute,

 *	or can be configured to follow a station by configuring the

 *	%NL80211_ATTR_MU_MIMO_FOLLOW_MAC_ADDR attribute.

 *

 * @NUM_NL80211_EXT_FEATURES: number of extended features.

 * @MAX_NL80211_EXT_FEATURES: highest extended feature index.
@@ -4486,6 +4514,7 @@ enum nl80211_feature_flags { 
enum nl80211_ext_feature_index {

	NL80211_EXT_FEATURE_VHT_IBSS,

	NL80211_EXT_FEATURE_RRM,

	NL80211_EXT_FEATURE_MU_MIMO_AIR_SNIFFER,



	/* add new features before the definition below */

	NUM_NL80211_EXT_FEATURES,

net/wireless/nl80211.c

+36 −0
Original line number Diff line number Diff line
@@ -405,6 +405,10 @@ static const struct nla_policy nl80211_policy[NUM_NL80211_ATTR] = { 
	[NL80211_ATTR_PBSS] = { .type = NLA_FLAG },

	[NL80211_ATTR_BSS_SELECT] = { .type = NLA_NESTED },

	[NL80211_ATTR_STA_SUPPORT_P2P_PS] = { .type = NLA_U8 },

	[NL80211_ATTR_MU_MIMO_GROUP_DATA] = {

		.len = VHT_MUMIMO_GROUPS_DATA_LEN

	},

	[NL80211_ATTR_MU_MIMO_FOLLOW_MAC_ADDR] = { .len = ETH_ALEN },

};



/* policy for the key attributes */
@@ -2695,6 +2699,38 @@ static int nl80211_set_interface(struct sk_buff *skb, struct genl_info *info) 
		change = true;

	}



	if (info->attrs[NL80211_ATTR_MU_MIMO_GROUP_DATA]) {

		const u8 *mumimo_groups;

		u32 cap_flag = NL80211_EXT_FEATURE_MU_MIMO_AIR_SNIFFER;



		if (!wiphy_ext_feature_isset(&rdev->wiphy, cap_flag))

			return -EOPNOTSUPP;



		mumimo_groups =

			nla_data(info->attrs[NL80211_ATTR_MU_MIMO_GROUP_DATA]);



		/* bits 0 and 63 are reserved and must be zero */

		if ((mumimo_groups[0] & BIT(7)) ||

		    (mumimo_groups[VHT_MUMIMO_GROUPS_DATA_LEN - 1] & BIT(0)))

			return -EINVAL;



		memcpy(params.vht_mumimo_groups, mumimo_groups,

		       VHT_MUMIMO_GROUPS_DATA_LEN);

		change = true;

	}



	if (info->attrs[NL80211_ATTR_MU_MIMO_FOLLOW_MAC_ADDR]) {

		u32 cap_flag = NL80211_EXT_FEATURE_MU_MIMO_AIR_SNIFFER;



		if (!wiphy_ext_feature_isset(&rdev->wiphy, cap_flag))

			return -EOPNOTSUPP;



		nla_memcpy(params.macaddr,

			   info->attrs[NL80211_ATTR_MU_MIMO_FOLLOW_MAC_ADDR],

			   ETH_ALEN);

		change = true;

	}



	if (flags && (*flags & MONITOR_FLAG_ACTIVE) &&

	    !(rdev->wiphy.features & NL80211_FEATURE_ACTIVE_MONITOR))

		return -EOPNOTSUPP;