-@@ -2098,8 +2146,18 @@ enum nl80211_mntr_flags {
- * TUs) during which a mesh STA can send only one Action frame containing a
- * PERR element.
- *
-+ * @NL80211_MESHCONF_FORWARDING: set Mesh STA as forwarding or non-forwarding
-+ * or forwarding entity (default is TRUE - forwarding entity)
-+ *
-+ * @NL80211_MESHCONF_RSSI_THRESHOLD: RSSI threshold in dBm. This specifies the
-+ * threshold for average signal strength of candidate station to establish
-+ * a peer link.
-+ *
- * @NL80211_MESHCONF_ATTR_MAX: highest possible mesh configuration attribute
- *
-+ * @NL80211_MESHCONF_SYNC_OFFSET_MAX_NEIGHBOR: maximum number of neighbors
-+ * to synchronize to for 11s default synchronization method (see 11C.12.2.2)
-+ *
- * @__NL80211_MESHCONF_ATTR_AFTER_LAST: internal use
- */
- enum nl80211_meshconf_params {
-@@ -2122,6 +2180,9 @@ enum nl80211_meshconf_params {
- NL80211_MESHCONF_HWMP_RANN_INTERVAL,
- NL80211_MESHCONF_GATE_ANNOUNCEMENTS,
- NL80211_MESHCONF_HWMP_PERR_MIN_INTERVAL,
-+ NL80211_MESHCONF_FORWARDING,
-+ NL80211_MESHCONF_RSSI_THRESHOLD,
-+ NL80211_MESHCONF_SYNC_OFFSET_MAX_NEIGHBOR,
-
- /* keep last */
- __NL80211_MESHCONF_ATTR_AFTER_LAST,
-@@ -2161,6 +2222,11 @@ enum nl80211_meshconf_params {
- * complete (unsecured) mesh peering without the need of a userspace daemon.
- *
- * @NL80211_MESH_SETUP_ATTR_MAX: highest possible mesh setup attribute number
-+ *
-+ * @NL80211_MESH_SETUP_ENABLE_VENDOR_SYNC: Enable this option to use a
-+ * vendor specific synchronization method or disable it to use the default
-+ * neighbor offset synchronization
-+ *
- * @__NL80211_MESH_SETUP_ATTR_AFTER_LAST: Internal use
- */
- enum nl80211_mesh_setup_params {
-@@ -2170,6 +2236,7 @@ enum nl80211_mesh_setup_params {
- NL80211_MESH_SETUP_IE,
- NL80211_MESH_SETUP_USERSPACE_AUTH,
- NL80211_MESH_SETUP_USERSPACE_AMPE,
-+ NL80211_MESH_SETUP_ENABLE_VENDOR_SYNC,
-
- /* keep last */
- __NL80211_MESH_SETUP_ATTR_AFTER_LAST,
-@@ -2179,7 +2246,7 @@ enum nl80211_mesh_setup_params {
- /**
- * enum nl80211_txq_attr - TX queue parameter attributes
- * @__NL80211_TXQ_ATTR_INVALID: Attribute number 0 is reserved
-- * @NL80211_TXQ_ATTR_QUEUE: TX queue identifier (NL80211_TXQ_Q_*)
-+ * @NL80211_TXQ_ATTR_AC: AC identifier (NL80211_AC_*)
- * @NL80211_TXQ_ATTR_TXOP: Maximum burst time in units of 32 usecs, 0 meaning
- * disabled
- * @NL80211_TXQ_ATTR_CWMIN: Minimum contention window [a value of the form
-@@ -2192,7 +2259,7 @@ enum nl80211_mesh_setup_params {
- */
- enum nl80211_txq_attr {
- __NL80211_TXQ_ATTR_INVALID,
-- NL80211_TXQ_ATTR_QUEUE,
-+ NL80211_TXQ_ATTR_AC,
- NL80211_TXQ_ATTR_TXOP,
- NL80211_TXQ_ATTR_CWMIN,
- NL80211_TXQ_ATTR_CWMAX,
-@@ -2203,13 +2270,21 @@ enum nl80211_txq_attr {
- NL80211_TXQ_ATTR_MAX = __NL80211_TXQ_ATTR_AFTER_LAST - 1
- };
-
--enum nl80211_txq_q {
-- NL80211_TXQ_Q_VO,
-- NL80211_TXQ_Q_VI,
-- NL80211_TXQ_Q_BE,
-- NL80211_TXQ_Q_BK
-+enum nl80211_ac {
-+ NL80211_AC_VO,
-+ NL80211_AC_VI,
-+ NL80211_AC_BE,
-+ NL80211_AC_BK,
-+ NL80211_NUM_ACS
- };
-
-+/* backward compat */
-+#define NL80211_TXQ_ATTR_QUEUE NL80211_TXQ_ATTR_AC
-+#define NL80211_TXQ_Q_VO NL80211_AC_VO
-+#define NL80211_TXQ_Q_VI NL80211_AC_VI
-+#define NL80211_TXQ_Q_BE NL80211_AC_BE
-+#define NL80211_TXQ_Q_BK NL80211_AC_BK
-+
- enum nl80211_channel_type {
- NL80211_CHAN_NO_HT,
- NL80211_CHAN_HT20,
-@@ -2395,12 +2470,15 @@ enum nl80211_key_attributes {
- * in an array of rates as defined in IEEE 802.11 7.3.2.2 (u8 values with
- * 1 = 500 kbps) but without the IE length restriction (at most
- * %NL80211_MAX_SUPP_RATES in a single array).
-+ * @NL80211_TXRATE_MCS: HT (MCS) rates allowed for TX rate selection
-+ * in an array of MCS numbers.
- * @__NL80211_TXRATE_AFTER_LAST: internal
- * @NL80211_TXRATE_MAX: highest TX rate attribute
- */
- enum nl80211_tx_rate_attributes {
- __NL80211_TXRATE_INVALID,
- NL80211_TXRATE_LEGACY,
-+ NL80211_TXRATE_MCS,
-
- /* keep last */
- __NL80211_TXRATE_AFTER_LAST,
-@@ -2786,10 +2864,13 @@ enum nl80211_ap_sme_features {
- * TX status to the socket error queue when requested with the
- * socket option.
- * @NL80211_FEATURE_HT_IBSS: This driver supports IBSS with HT datarates.
-+ * @NL80211_FEATURE_INACTIVITY_TIMER: This driver takes care of freeing up
-+ * the connected inactive stations in AP mode.