1 files changed, 47 insertions, 0 deletions

diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h
index ec10d1b2838f..98fd3ec8598d 100644
--- a/include/uapi/linux/nl80211.h
+++ b/include/uapi/linux/nl80211.h
@@ -838,6 +838,16 @@
  *      not running. The driver indicates the status of the scan through
  *      cfg80211_scan_done().
  *
+ * @NL80211_CMD_START_NAN: Start NAN operation, identified by its
+ *      %NL80211_ATTR_WDEV interface. This interface must have been previously
+ *      created with %NL80211_CMD_NEW_INTERFACE. After it has been started, the
+ *      NAN interface will create or join a cluster. This command must have a
+ *      valid %NL80211_ATTR_NAN_MASTER_PREF attribute and optional
+ *      %NL80211_ATTR_NAN_DUAL attributes.
+ *      After this command NAN functions can be added.
+ * @NL80211_CMD_STOP_NAN: Stop the NAN operation, identified by
+ *      its %NL80211_ATTR_WDEV interface.
+ *
  * @NL80211_CMD_MAX: highest used command number
  * @__NL80211_CMD_AFTER_LAST: internal use
  */
@@ -1026,6 +1036,9 @@ enum nl80211_commands {
 
         NL80211_CMD_ABORT_SCAN,
 
+        NL80211_CMD_START_NAN,
+        NL80211_CMD_STOP_NAN,
+
         /* add new commands above here */
 
         /* used to define NL80211_CMD_MAX below */
@@ -1739,6 +1752,12 @@ enum nl80211_commands {
  *      regulatory indoor configuration would be owned by the netlink socket
  *      that configured the indoor setting, and the indoor operation would be
  *      cleared when the socket is closed.
+ *      If set during NAN interface creation, the interface will be destroyed
+ *      if the socket is closed just like any other interface. Moreover, only
+ *      the netlink socket that created the interface will be allowed to add
+ *      and remove functions. NAN notifications will be sent in unicast to that
+ *      socket. Without this attribute, any socket can add functions and the
+ *      notifications will be sent to the %NL80211_MCGRP_NAN multicast group.
  *
  * @NL80211_ATTR_TDLS_INITIATOR: flag attribute indicating the current end is
  *      the TDLS link initiator.
@@ -1873,6 +1892,14 @@ enum nl80211_commands {
  * @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.
  *
+ * @NL80211_ATTR_NAN_MASTER_PREF: the master preference to be used by
+ *      %NL80211_CMD_START_NAN. Its type is u8 and it can't be 0.
+ *      Also, values 1 and 255 are reserved for certification purposes and
+ *      should not be used during a normal device operation.
+ * @NL80211_ATTR_NAN_DUAL: NAN dual band operation config (see
+ *      &enum nl80211_nan_dual_band_conf). This attribute is used with
+ *      %NL80211_CMD_START_NAN.
+ *
  * @NUM_NL80211_ATTR: total number of nl80211_attrs available
  * @NL80211_ATTR_MAX: highest attribute number currently defined
  * @__NL80211_ATTR_AFTER_LAST: internal use
@@ -2267,6 +2294,9 @@ enum nl80211_attrs {
 
         NL80211_ATTR_MESH_PEER_AID,
 
+        NL80211_ATTR_NAN_MASTER_PREF,
+        NL80211_ATTR_NAN_DUAL,
+
         /* add attributes here, update the policy in nl80211.c */
 
         __NL80211_ATTR_AFTER_LAST,
@@ -2345,6 +2375,7 @@ enum nl80211_attrs {
  *      commands to create and destroy one
  * @NL80211_IF_TYPE_OCB: Outside Context of a BSS
  *      This mode corresponds to the MIB variable dot11OCBActivated=true
+ * @NL80211_IFTYPE_NAN: NAN device interface type (not a netdev)
  * @NL80211_IFTYPE_MAX: highest interface type number currently defined
  * @NUM_NL80211_IFTYPES: number of defined interface types
  *
@@ -2365,6 +2396,7 @@ enum nl80211_iftype {
         NL80211_IFTYPE_P2P_GO,
         NL80211_IFTYPE_P2P_DEVICE,
         NL80211_IFTYPE_OCB,
+        NL80211_IFTYPE_NAN,
 
         /* keep last */
         NUM_NL80211_IFTYPES,
@@ -4870,4 +4902,19 @@ enum nl80211_bss_select_attr {
         NL80211_BSS_SELECT_ATTR_MAX = __NL80211_BSS_SELECT_ATTR_AFTER_LAST - 1
 };
 
+/**
+ * enum nl80211_nan_dual_band_conf - NAN dual band configuration
+ *
+ * Defines the NAN dual band mode of operation
+ *
+ * @NL80211_NAN_BAND_DEFAULT: device default mode
+ * @NL80211_NAN_BAND_2GHZ: 2.4GHz mode
+ * @NL80211_NAN_BAND_5GHZ: 5GHz mode
+  */
+enum nl80211_nan_dual_band_conf {
+        NL80211_NAN_BAND_DEFAULT        = 1 << 0,
+        NL80211_NAN_BAND_2GHZ           = 1 << 1,
+        NL80211_NAN_BAND_5GHZ           = 1 << 2,
+};
+
 #endif /* __LINUX_NL80211_H */