1 files changed, 86 insertions, 2 deletions

diff --git a/include/linux/nl80211.h b/include/linux/nl80211.h
index f33aa08dd9b3..cbe8ce3bf486 100644
--- a/include/linux/nl80211.h
+++ b/include/linux/nl80211.h
@@ -142,6 +142,12 @@
  *      %NL80211_ATTR_IE. If the command succeeds, the requested data will be
  *      added to all specified management frames generated by
  *      kernel/firmware/driver.
+ *      Note: This command has been removed and it is only reserved at this
+ *      point to avoid re-using existing command number. The functionality this
+ *      command was planned for has been provided with cleaner design with the
+ *      option to specify additional IEs in NL80211_CMD_TRIGGER_SCAN,
+ *      NL80211_CMD_AUTHENTICATE, NL80211_CMD_ASSOCIATE,
+ *      NL80211_CMD_DEAUTHENTICATE, and NL80211_CMD_DISASSOCIATE.
  *
  * @NL80211_CMD_GET_SCAN: get scan results
  * @NL80211_CMD_TRIGGER_SCAN: trigger a new scan with the given parameters
@@ -161,6 +167,38 @@
  *      %NL80211_REG_TYPE_COUNTRY the alpha2 to which we have moved on
  *      to (%NL80211_ATTR_REG_ALPHA2).
  *
+ * @NL80211_CMD_AUTHENTICATE: authentication request and notification.
+ *      This command is used both as a command (request to authenticate) and
+ *      as an event on the "mlme" multicast group indicating completion of the
+ *      authentication process.
+ *      When used as a command, %NL80211_ATTR_IFINDEX is used to identify the
+ *      interface. %NL80211_ATTR_MAC is used to specify PeerSTAAddress (and
+ *      BSSID in case of station mode). %NL80211_ATTR_SSID is used to specify
+ *      the SSID (mainly for association, but is included in authentication
+ *      request, too, to help BSS selection. %NL80211_ATTR_WIPHY_FREQ is used
+ *      to specify the frequence of the channel in MHz. %NL80211_ATTR_AUTH_TYPE
+ *      is used to specify the authentication type. %NL80211_ATTR_IE is used to
+ *      define IEs (VendorSpecificInfo, but also including RSN IE and FT IEs)
+ *      to be added to the frame.
+ *      When used as an event, this reports reception of an Authentication
+ *      frame in station and IBSS modes when the local MLME processed the
+ *      frame, i.e., it was for the local STA and was received in correct
+ *      state. This is similar to MLME-AUTHENTICATE.confirm primitive in the
+ *      MLME SAP interface (kernel providing MLME, userspace SME). The
+ *      included NL80211_ATTR_FRAME attribute contains the management frame
+ *      (including both the header and frame body, but not FCS).
+ * @NL80211_CMD_ASSOCIATE: association request and notification; like
+ *      NL80211_CMD_AUTHENTICATE but for Association and Reassociation
+ *      (similar to MLME-ASSOCIATE.request, MLME-REASSOCIATE.request,
+ *      MLME-ASSOCIATE.confirm or MLME-REASSOCIATE.confirm primitives).
+ * @NL80211_CMD_DEAUTHENTICATE: deauthentication request and notification; like
+ *      NL80211_CMD_AUTHENTICATE but for Deauthentication frames (similar to
+ *      MLME-DEAUTHENTICATION.request and MLME-DEAUTHENTICATE.indication
+ *      primitives).
+ * @NL80211_CMD_DISASSOCIATE: disassociation request and notification; like
+ *      NL80211_CMD_AUTHENTICATE but for Disassociation frames (similar to
+ *      MLME-DISASSOCIATE.request and MLME-DISASSOCIATE.indication primitives).
+ *
  * @NL80211_CMD_MAX: highest used command number
  * @__NL80211_CMD_AFTER_LAST: internal use
  */
@@ -206,7 +244,7 @@ enum nl80211_commands {
         NL80211_CMD_GET_MESH_PARAMS,
         NL80211_CMD_SET_MESH_PARAMS,
 
-        NL80211_CMD_SET_MGMT_EXTRA_IE,
+        NL80211_CMD_SET_MGMT_EXTRA_IE /* reserved; not used */,
 
         NL80211_CMD_GET_REG,
 
@@ -217,6 +255,11 @@ enum nl80211_commands {
 
         NL80211_CMD_REG_CHANGE,
 
+        NL80211_CMD_AUTHENTICATE,
+        NL80211_CMD_ASSOCIATE,
+        NL80211_CMD_DEAUTHENTICATE,
+        NL80211_CMD_DISASSOCIATE,
+
         /* add new commands above here */
 
         /* used to define NL80211_CMD_MAX below */
@@ -230,8 +273,11 @@ enum nl80211_commands {
  */
 #define NL80211_CMD_SET_BSS NL80211_CMD_SET_BSS
 #define NL80211_CMD_SET_MGMT_EXTRA_IE NL80211_CMD_SET_MGMT_EXTRA_IE
-
 #define NL80211_CMD_REG_CHANGE NL80211_CMD_REG_CHANGE
+#define NL80211_CMD_AUTHENTICATE NL80211_CMD_AUTHENTICATE
+#define NL80211_CMD_ASSOCIATE NL80211_CMD_ASSOCIATE
+#define NL80211_CMD_DEAUTHENTICATE NL80211_CMD_DEAUTHENTICATE
+#define NL80211_CMD_DISASSOCIATE NL80211_CMD_DISASSOCIATE
 
 /**
  * enum nl80211_attrs - nl80211 netlink attributes
@@ -349,6 +395,19 @@ enum nl80211_commands {
  * @NL80211_ATTR_REG_TYPE: indicates the type of the regulatory domain currently
  *      set. This can be one of the nl80211_reg_type (%NL80211_REGDOM_TYPE_*)
  *
+ * @NL80211_ATTR_SUPPORTED_COMMANDS: wiphy attribute that specifies
+ *      an array of command numbers (i.e. a mapping index to command number)
+ *      that the driver for the given wiphy supports.
+ *
+ * @NL80211_ATTR_FRAME: frame data (binary attribute), including frame header
+ *      and body, but not FCS; used, e.g., with NL80211_CMD_AUTHENTICATE and
+ *      NL80211_CMD_ASSOCIATE events
+ * @NL80211_ATTR_SSID: SSID (binary attribute, 0..32 octets)
+ * @NL80211_ATTR_AUTH_TYPE: AuthenticationType, see &enum nl80211_auth_type,
+ *      represented as a u32
+ * @NL80211_ATTR_REASON_CODE: ReasonCode for %NL80211_CMD_DEAUTHENTICATE and
+ *      %NL80211_CMD_DISASSOCIATE, u16
+ *
  * @NL80211_ATTR_MAX: highest attribute number currently defined
  * @__NL80211_ATTR_AFTER_LAST: internal use
  */
@@ -426,6 +485,13 @@ enum nl80211_attrs {
         NL80211_ATTR_REG_INITIATOR,
         NL80211_ATTR_REG_TYPE,
 
+        NL80211_ATTR_SUPPORTED_COMMANDS,
+
+        NL80211_ATTR_FRAME,
+        NL80211_ATTR_SSID,
+        NL80211_ATTR_AUTH_TYPE,
+        NL80211_ATTR_REASON_CODE,
+
         /* add attributes here, update the policy in nl80211.c */
 
         __NL80211_ATTR_AFTER_LAST,
@@ -445,6 +511,10 @@ enum nl80211_attrs {
 #define NL80211_ATTR_IE NL80211_ATTR_IE
 #define NL80211_ATTR_REG_INITIATOR NL80211_ATTR_REG_INITIATOR
 #define NL80211_ATTR_REG_TYPE NL80211_ATTR_REG_TYPE
+#define NL80211_ATTR_FRAME NL80211_ATTR_FRAME
+#define NL80211_ATTR_SSID NL80211_ATTR_SSID
+#define NL80211_ATTR_AUTH_TYPE NL80211_ATTR_AUTH_TYPE
+#define NL80211_ATTR_REASON_CODE NL80211_ATTR_REASON_CODE
 
 #define NL80211_MAX_SUPP_RATES                  32
 #define NL80211_MAX_SUPP_REG_RULES              32
@@ -978,4 +1048,18 @@ enum nl80211_bss {
         NL80211_BSS_MAX = __NL80211_BSS_AFTER_LAST - 1
 };
 
+/**
+ * enum nl80211_auth_type - AuthenticationType
+ *
+ * @NL80211_AUTHTYPE_OPEN_SYSTEM: Open System authentication
+ * @NL80211_AUTHTYPE_SHARED_KEY: Shared Key authentication (WEP only)
+ * @NL80211_AUTHTYPE_FT: Fast BSS Transition (IEEE 802.11r)
+ * @NL80211_AUTHTYPE_NETWORK_EAP: Network EAP (some Cisco APs and mainly LEAP)
+ */
+enum nl80211_auth_type {
+        NL80211_AUTHTYPE_OPEN_SYSTEM,
+        NL80211_AUTHTYPE_SHARED_KEY,
+        NL80211_AUTHTYPE_FT,
+        NL80211_AUTHTYPE_NETWORK_EAP,
+};
 #endif /* __LINUX_NL80211_H */