1 files changed, 31 insertions, 0 deletions

diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h
index 9c9c0c352873..995bf802d604 100644
--- a/include/uapi/linux/nl80211.h
+++ b/include/uapi/linux/nl80211.h
@@ -48,6 +48,7 @@
 #define NL80211_MULTICAST_GROUP_REG             "regulatory"
 #define NL80211_MULTICAST_GROUP_MLME            "mlme"
 #define NL80211_MULTICAST_GROUP_VENDOR          "vendor"
+#define NL80211_MULTICAST_GROUP_NAN             "nan"
 #define NL80211_MULTICAST_GROUP_TESTMODE        "testmode"
 
 /**
@@ -866,6 +867,9 @@
  *      must be operational (%NL80211_CMD_START_NAN was executed).
  *      It must contain at least one of the following attributes:
  *      %NL80211_ATTR_NAN_MASTER_PREF, %NL80211_ATTR_NAN_DUAL.
+ * @NL80211_CMD_NAN_FUNC_MATCH: Notification sent when a match is reported.
+ *      This will contain a %NL80211_ATTR_NAN_MATCH nested attribute and
+ *      %NL80211_ATTR_COOKIE.
  *
  * @NL80211_CMD_MAX: highest used command number
  * @__NL80211_CMD_AFTER_LAST: internal use
@@ -1060,6 +1064,7 @@ enum nl80211_commands {
         NL80211_CMD_ADD_NAN_FUNCTION,
         NL80211_CMD_DEL_NAN_FUNCTION,
         NL80211_CMD_CHANGE_NAN_CONFIG,
+        NL80211_CMD_NAN_MATCH,
 
         /* add new commands above here */
 
@@ -1926,6 +1931,8 @@ enum nl80211_commands {
  * @NL80211_ATTR_NAN_FUNC: a function that can be added to NAN. See
  *      &enum nl80211_nan_func_attributes for description of this nested
  *      attribute.
+ * @NL80211_ATTR_NAN_MATCH: used to report a match. This is a nested attribute.
+ *      See &enum nl80211_nan_match_attributes.
  *
  * @NUM_NL80211_ATTR: total number of nl80211_attrs available
  * @NL80211_ATTR_MAX: highest attribute number currently defined
@@ -2324,6 +2331,7 @@ enum nl80211_attrs {
         NL80211_ATTR_NAN_MASTER_PREF,
         NL80211_ATTR_NAN_DUAL,
         NL80211_ATTR_NAN_FUNC,
+        NL80211_ATTR_NAN_MATCH,
 
         /* add attributes here, update the policy in nl80211.c */
 
@@ -5074,4 +5082,27 @@ enum nl80211_nan_srf_attributes {
         NL80211_NAN_SRF_ATTR_MAX = NUM_NL80211_NAN_SRF_ATTR - 1,
 };
 
+/**
+ * enum nl80211_nan_match_attributes - NAN match attributes
+ * @__NL80211_NAN_MATCH_INVALID: invalid
+ * @NL80211_NAN_MATCH_FUNC_LOCAL: the local function that had the
+ *      match. This is a nested attribute.
+ *      See &enum nl80211_nan_func_attributes.
+ * @NL80211_NAN_MATCH_FUNC_PEER: the peer function
+ *      that caused the match. This is a nested attribute.
+ *      See &enum nl80211_nan_func_attributes.
+ *
+ * @NUM_NL80211_NAN_MATCH_ATTR: internal
+ * @NL80211_NAN_MATCH_ATTR_MAX: highest NAN match attribute
+ */
+enum nl80211_nan_match_attributes {
+        __NL80211_NAN_MATCH_INVALID,
+        NL80211_NAN_MATCH_FUNC_LOCAL,
+        NL80211_NAN_MATCH_FUNC_PEER,
+
+        /* keep last */
+        NUM_NL80211_NAN_MATCH_ATTR,
+        NL80211_NAN_MATCH_ATTR_MAX = NUM_NL80211_NAN_MATCH_ATTR - 1
+};
+
 #endif /* __LINUX_NL80211_H */