Cumulative patch from commit f5728d0a82d5c5fb5347e41ce761fdf4a79772ec
f5728d0 nl80211: Fix segfault when params->freq is NULL for AP mode start
3388e7b mesh: Remove HT IEs if HT is disabled
4ac2ea5 mesh: Make DTIM period configurable
fac72f9 mesh: Stop joining to different frequency network
7035162 mesh: Join an existing MBSS instead of creating a new one
58fe015 gitignore static library files
0f282c7 P2Ps: Clear existing value when peer stops sending adv_service_instance
4d7aab7 Make driver flags available through control interface
77d468e P2P: Cleanup by removing unnecessary os_free() call from p2p_deinit()
e347caf mesh: Report mesh peer AID to kernel
e3227c3 Sync with mac80211-next.git include/uapi/linux/nl80211.h
6c34b9c Assign QCA vendor attribute for setting TX fail count threshold
52fec36 Assign QCA vendor attributes for set retry configuration
1c8fe68 QCA vendor command to configure conditional switch channel for AP
34a5014 MBO: Remove unused assignment
f8608fa SME: Fix SA Query local failure handling
ab6ab07 Clear wpa_s->sme.last_unprot_disconnect.sec on FLUSH command
9636b07 HS 2.0: Add an event message to note failed OSU provider write
460e5cd OpenSSL: Fix OpenSSL 1.1.0 DH operation
dd20eab HS 2.0: Add optional no-scan parameter to FETCH_OSU
f465c32 Interworking: Define control interface message prefixes in wpa_ctrl.h
99a9423 HS 2.0: Make hs20_build_anqp_req() static
75b2a87 HS 2.0: Fix hs20_get_icon() error path
0da9869 Interworking: Remove unused allow_excluded from interworking_connect()
8329ad4 Fix wpa_config_get_all() error path
f7c04e5 Interworking: Combine identical error returns into a single one
a6f5b19 P2P: Allow P2P listen being offloaded to the driver/firmware
35d6655 nl80211: P2P Listen offload vendor command definitions
ef60f64 Do not exceed scan ssid max size advertised by driver
4ac5f2f Add text name for WPA_KEY_MGMT_WPA_NONE key_mgmt value
f0e8405 nl80211: Provide frequency in EVENT_ASSOC when IBSS is joined
653d227 MBO: Improve supported operating class generation
9607a1a nl80211: Keep QCA vendor extensions together
8bd9099 mesh: Add debug prints on my/peer lid mismatches
78ac368 mesh: Add MPM FSM transitions from ESTAB to HOLDING for {OPN,CNF}_RJCT
0202256 mesh: Update MPM FSM events to match the standard
d02e549 mesh: Rename MPM FSM states to match the standard
1f2f3f1 mesh: Indicate OPN_RJCT event if AES-SIV decrypt fails
e8afaad mesh: Write close reason from Mesh Peering Close to debug log
ee0ad45 mesh: Remove GTKdata and IGTKdata from Mesh Peering Confirm/Close
Change-Id: Ia720dc2e4db8539d566cbc826a5c6cfd26f169e1
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
diff --git a/src/drivers/nl80211_copy.h b/src/drivers/nl80211_copy.h
index 53c8278..2206941 100644
--- a/src/drivers/nl80211_copy.h
+++ b/src/drivers/nl80211_copy.h
@@ -1829,6 +1829,44 @@
* %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)
+ *
+ * @NL80211_ATTR_SCAN_START_TIME_TSF: The time at which the scan was actually
+ * started (u64). The time is the TSF of the BSS the interface that
+ * requested the scan is connected to (if available, otherwise this
+ * attribute must not be included).
+ * @NL80211_ATTR_SCAN_START_TIME_TSF_BSSID: The BSS according to which
+ * %NL80211_ATTR_SCAN_START_TIME_TSF is set.
+ * @NL80211_ATTR_MEASUREMENT_DURATION: measurement duration in TUs (u16). If
+ * %NL80211_ATTR_MEASUREMENT_DURATION_MANDATORY is not set, this is the
+ * maximum measurement duration allowed. This attribute is used with
+ * measurement requests. It can also be used with %NL80211_CMD_TRIGGER_SCAN
+ * if the scan is used for beacon report radio measurement.
+ * @NL80211_ATTR_MEASUREMENT_DURATION_MANDATORY: flag attribute that indicates
+ * that the duration specified with %NL80211_ATTR_MEASUREMENT_DURATION is
+ * mandatory. If this flag is not set, the duration is the maximum duration
+ * and the actual measurement duration may be shorter.
+ *
+ * @NL80211_ATTR_MESH_PEER_AID: Association ID for the mesh peer (u16). This is
+ * used to pull the stored data for mesh peer in power save state.
+ *
* @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 +2251,16 @@
NL80211_ATTR_IFTYPE_EXT_CAPA,
+ NL80211_ATTR_MU_MIMO_GROUP_DATA,
+ NL80211_ATTR_MU_MIMO_FOLLOW_MAC_ADDR,
+
+ NL80211_ATTR_SCAN_START_TIME_TSF,
+ NL80211_ATTR_SCAN_START_TIME_TSF_BSSID,
+ NL80211_ATTR_MEASUREMENT_DURATION,
+ NL80211_ATTR_MEASUREMENT_DURATION_MANDATORY,
+
+ NL80211_ATTR_MESH_PEER_AID,
+
/* add attributes here, update the policy in nl80211.c */
__NL80211_ATTR_AFTER_LAST,
@@ -3474,6 +3522,12 @@
* was last updated by a received frame. The value is expected to be
* accurate to about 10ms. (u64, nanoseconds)
* @NL80211_BSS_PAD: attribute used for padding for 64-bit alignment
+ * @NL80211_BSS_PARENT_TSF: the time at the start of reception of the first
+ * octet of the timestamp field of the last beacon/probe received for
+ * this BSS. The time is the TSF of the BSS specified by
+ * @NL80211_BSS_PARENT_BSSID. (u64).
+ * @NL80211_BSS_PARENT_BSSID: the BSS according to which @NL80211_BSS_PARENT_TSF
+ * is set.
* @__NL80211_BSS_AFTER_LAST: internal
* @NL80211_BSS_MAX: highest BSS attribute
*/
@@ -3495,6 +3549,8 @@
NL80211_BSS_PRESP_DATA,
NL80211_BSS_LAST_SEEN_BOOTTIME,
NL80211_BSS_PAD,
+ NL80211_BSS_PARENT_TSF,
+ NL80211_BSS_PARENT_BSSID,
/* keep last */
__NL80211_BSS_AFTER_LAST,
@@ -4479,6 +4535,22 @@
* %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.
+ * @NL80211_EXT_FEATURE_SCAN_START_TIME: This driver includes the actual
+ * time the scan started in scan results event. The time is the TSF of
+ * the BSS that the interface that requested the scan is connected to
+ * (if available).
+ * @NL80211_EXT_FEATURE_BSS_PARENT_TSF: Per BSS, this driver reports the
+ * time the last beacon/probe was received. The time is the TSF of the
+ * BSS that the interface that requested the scan is connected to
+ * (if available).
+ * @NL80211_EXT_FEATURE_SET_SCAN_DWELL: This driver supports configuration of
+ * channel dwell time.
*
* @NUM_NL80211_EXT_FEATURES: number of extended features.
* @MAX_NL80211_EXT_FEATURES: highest extended feature index.
@@ -4486,6 +4558,10 @@
enum nl80211_ext_feature_index {
NL80211_EXT_FEATURE_VHT_IBSS,
NL80211_EXT_FEATURE_RRM,
+ NL80211_EXT_FEATURE_MU_MIMO_AIR_SNIFFER,
+ NL80211_EXT_FEATURE_SCAN_START_TIME,
+ NL80211_EXT_FEATURE_BSS_PARENT_TSF,
+ NL80211_EXT_FEATURE_SET_SCAN_DWELL,
/* add new features before the definition below */
NUM_NL80211_EXT_FEATURES,