+@@ -156,21 +156,23 @@
+ * @NL80211_CMD_DEL_KEY: delete a key identified by %NL80211_ATTR_KEY_IDX
+ * or %NL80211_ATTR_MAC.
+ *
+- * @NL80211_CMD_GET_BEACON: retrieve beacon information (returned in a
+- * %NL80222_CMD_NEW_BEACON message)
+- * @NL80211_CMD_SET_BEACON: set the beacon on an access point interface
+- * using the %NL80211_ATTR_BEACON_INTERVAL, %NL80211_ATTR_DTIM_PERIOD,
+- * %NL80211_ATTR_BEACON_HEAD and %NL80211_ATTR_BEACON_TAIL attributes.
+- * Following attributes are provided for drivers that generate full Beacon
+- * and Probe Response frames internally: %NL80211_ATTR_SSID,
++ * @NL80211_CMD_GET_BEACON: (not used)
++ * @NL80211_CMD_SET_BEACON: change the beacon on an access point interface
++ * using the %NL80211_ATTR_BEACON_HEAD and %NL80211_ATTR_BEACON_TAIL
++ * attributes. For drivers that generate the beacon and probe responses
++ * internally, the following attributes must be provided: %NL80211_ATTR_IE,
++ * %NL80211_ATTR_IE_PROBE_RESP and %NL80211_ATTR_IE_ASSOC_RESP.
++ * @NL80211_CMD_START_AP: Start AP operation on an AP interface, parameters
++ * are like for %NL80211_CMD_SET_BEACON, and additionally parameters that
++ * do not change are used, these include %NL80211_ATTR_BEACON_INTERVAL,
++ * %NL80211_ATTR_DTIM_PERIOD, %NL80211_ATTR_SSID,
+ * %NL80211_ATTR_HIDDEN_SSID, %NL80211_ATTR_CIPHERS_PAIRWISE,
+ * %NL80211_ATTR_CIPHER_GROUP, %NL80211_ATTR_WPA_VERSIONS,
+ * %NL80211_ATTR_AKM_SUITES, %NL80211_ATTR_PRIVACY,
+- * %NL80211_ATTR_AUTH_TYPE, %NL80211_ATTR_IE, %NL80211_ATTR_IE_PROBE_RESP,
+- * %NL80211_ATTR_IE_ASSOC_RESP.
+- * @NL80211_CMD_NEW_BEACON: add a new beacon to an access point interface,
+- * parameters are like for %NL80211_CMD_SET_BEACON.
+- * @NL80211_CMD_DEL_BEACON: remove the beacon, stop sending it
++ * %NL80211_ATTR_AUTH_TYPE and %NL80211_ATTR_INACTIVITY_TIMEOUT.
++ * @NL80211_CMD_NEW_BEACON: old alias for %NL80211_CMD_START_AP
++ * @NL80211_CMD_STOP_AP: Stop AP operation on the given interface
++ * @NL80211_CMD_DEL_BEACON: old alias for %NL80211_CMD_STOP_AP
+ *
+ * @NL80211_CMD_GET_STATION: Get station attributes for station identified by
+ * %NL80211_ATTR_MAC on the interface identified by %NL80211_ATTR_IFINDEX.
+@@ -367,6 +369,11 @@
+ * %NL80211_ATTR_WIPHY_FREQ, %NL80211_ATTR_CONTROL_PORT,
+ * %NL80211_ATTR_CONTROL_PORT_ETHERTYPE and
+ * %NL80211_ATTR_CONTROL_PORT_NO_ENCRYPT.
++ * Background scan period can optionally be
++ * specified in %NL80211_ATTR_BG_SCAN_PERIOD,
++ * if not specified default background scan configuration
++ * in driver is used and if period value is 0, bg scan will be disabled.
++ * This attribute is ignored if driver does not support roam scan.
+ * It is also sent as an event, with the BSSID and response IEs when the
+ * connection is established or failed to be established. This can be
+ * determined by the STATUS_CODE attribute.
+@@ -541,6 +548,11 @@
+ * @NL80211_CMD_SET_NOACK_MAP: sets a bitmap for the individual TIDs whether
+ * No Acknowledgement Policy should be applied.
+ *
++ * @NL80211_CMD_CH_SWITCH_NOTIFY: An AP or GO may decide to switch channels
++ * independently of the userspace SME, send this event indicating
++ * %NL80211_ATTR_IFINDEX is now on %NL80211_ATTR_WIPHY_FREQ with
++ * %NL80211_ATTR_WIPHY_CHANNEL_TYPE.
++ *
+ * @NL80211_CMD_MAX: highest used command number
+ * @__NL80211_CMD_AFTER_LAST: internal use
+ */
+@@ -565,8 +577,10 @@ enum nl80211_commands {
+
+ NL80211_CMD_GET_BEACON,
+ NL80211_CMD_SET_BEACON,
+- NL80211_CMD_NEW_BEACON,
+- NL80211_CMD_DEL_BEACON,
++ NL80211_CMD_START_AP,
++ NL80211_CMD_NEW_BEACON = NL80211_CMD_START_AP,
++ NL80211_CMD_STOP_AP,
++ NL80211_CMD_DEL_BEACON = NL80211_CMD_STOP_AP,
+
+ NL80211_CMD_GET_STATION,
+ NL80211_CMD_SET_STATION,
+@@ -680,6 +694,8 @@ enum nl80211_commands {
+
+ NL80211_CMD_SET_NOACK_MAP,
+
++ NL80211_CMD_CH_SWITCH_NOTIFY,
++
+ /* add new commands above here */
+
+ /* used to define NL80211_CMD_MAX below */
+@@ -1193,6 +1209,19 @@ enum nl80211_commands {
+ * @NL80211_ATTR_NOACK_MAP: This u16 bitmap contains the No Ack Policy of
+ * up to 16 TIDs.
+ *
++ * @NL80211_ATTR_INACTIVITY_TIMEOUT: timeout value in seconds, this can be
++ * used by the drivers which has MLME in firmware and does not have support
++ * to report per station tx/rx activity to free up the staion entry from
++ * the list. This needs to be used when the driver advertises the
++ * capability to timeout the stations.
++ *
++ * @NL80211_ATTR_RX_SIGNAL_DBM: signal strength in dBm (as a 32-bit int);
++ * this attribute is (depending on the driver capabilities) added to
++ * received frames indicated with %NL80211_CMD_FRAME.
++ *
++ * @NL80211_ATTR_BG_SCAN_PERIOD: Background scan period in seconds
++ * or 0 to disable background scan.
++ *
+ * @NL80211_ATTR_MAX: highest attribute number currently defined
+ * @__NL80211_ATTR_AFTER_LAST: internal use
+ */
+@@ -1438,6 +1467,12 @@ enum nl80211_attrs {
+
+ NL80211_ATTR_NOACK_MAP,
+
++ NL80211_ATTR_INACTIVITY_TIMEOUT,
++
++ NL80211_ATTR_RX_SIGNAL_DBM,
++
++ NL80211_ATTR_BG_SCAN_PERIOD,
++
+ /* add attributes here, update the policy in nl80211.c */
+
+ __NL80211_ATTR_AFTER_LAST,
+@@ -1475,6 +1510,7 @@ enum nl80211_attrs {