nl80211: advertise GTK rekey support, new triggers

Since we now have the necessary API in place to support
GTK rekeying, applications will need to know whether it
is supported by a device. Add a pseudo-trigger that is
used only to advertise that capability. Also, add some
new triggers that match what iwlagn devices can do.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

2 files changed, 37 insertions, 6 deletions

diff --git a/include/linux/nl80211.h b/include/linux/nl80211.h
index 8cb025a00094..c5f577e9ee27 100644
--- a/include/linux/nl80211.h
+++ b/include/linux/nl80211.h
@@ -989,8 +989,8 @@ enum nl80211_commands {
  *      driving the peer link management state machine.
  *      @NL80211_MESH_SETUP_USERSPACE_AMPE must be enabled.
  *
- * @NL80211_ATTR_WOWLAN_SUPPORTED: indicates, as part of the wiphy capabilities,
- *      the supported WoWLAN triggers
+ * @NL80211_ATTR_WOWLAN_TRIGGERS_SUPPORTED: indicates, as part of the wiphy
+ *      capabilities, the supported WoWLAN triggers
  * @NL80211_ATTR_WOWLAN_TRIGGERS: used by %NL80211_CMD_SET_WOWLAN to
  *      indicate which WoW triggers should be enabled. This is also
  *      used by %NL80211_CMD_GET_WOWLAN to get the currently enabled WoWLAN
@@ -2255,6 +2255,16 @@ struct nl80211_wowlan_pattern_support {
  *
  *      In %NL80211_ATTR_WOWLAN_TRIGGERS_SUPPORTED, it is a binary attribute
  *      carrying a &struct nl80211_wowlan_pattern_support.
+ * @NL80211_WOWLAN_TRIG_GTK_REKEY_SUPPORTED: Not a real trigger, and cannot be
+ *      used when setting, used only to indicate that GTK rekeying is supported
+ *      by the device (flag)
+ * @NL80211_WOWLAN_TRIG_GTK_REKEY_FAILURE: wake up on GTK rekey failure (if
+ *      done by the device) (flag)
+ * @NL80211_WOWLAN_TRIG_EAP_IDENT_REQUEST: wake up on EAP Identity Request
+ *      packet (flag)
+ * @NL80211_WOWLAN_TRIG_4WAY_HANDSHAKE: wake up on 4-way handshake (flag)
+ * @NL80211_WOWLAN_TRIG_RFKILL_RELEASE: wake up when rfkill is released
+ *      (on devices that have rfkill in the device) (flag)
  * @NUM_NL80211_WOWLAN_TRIG: number of wake on wireless triggers
  * @MAX_NL80211_WOWLAN_TRIG: highest wowlan trigger attribute number
  */
@@ -2264,6 +2274,11 @@ enum nl80211_wowlan_triggers {
         NL80211_WOWLAN_TRIG_DISCONNECT,
         NL80211_WOWLAN_TRIG_MAGIC_PKT,
         NL80211_WOWLAN_TRIG_PKT_PATTERN,
+        NL80211_WOWLAN_TRIG_GTK_REKEY_SUPPORTED,
+        NL80211_WOWLAN_TRIG_GTK_REKEY_FAILURE,
+        NL80211_WOWLAN_TRIG_EAP_IDENT_REQUEST,
+        NL80211_WOWLAN_TRIG_4WAY_HANDSHAKE,
+        NL80211_WOWLAN_TRIG_RFKILL_RELEASE,
 
         /* keep last */
         NUM_NL80211_WOWLAN_TRIG,
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 5390e3245a1a..83d5c387755d 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -1146,9 +1146,15 @@ struct cfg80211_wowlan_trig_pkt_pattern {
  * @magic_pkt: wake up on receiving magic packet
  * @patterns: wake up on receiving packet matching a pattern
  * @n_patterns: number of patterns
+ * @gtk_rekey_failure: wake up on GTK rekey failure
+ * @eap_identity_req: wake up on EAP identity request packet
+ * @four_way_handshake: wake up on 4-way handshake
+ * @rfkill_release: wake up when rfkill is released
  */
 struct cfg80211_wowlan {
-        bool any, disconnect, magic_pkt;
+        bool any, disconnect, magic_pkt, gtk_rekey_failure,
+             eap_identity_req, four_way_handshake,
+             rfkill_release;
         struct cfg80211_wowlan_trig_pkt_pattern *patterns;
         int n_patterns;
 };
@@ -1673,11 +1679,21 @@ struct ieee80211_txrx_stypes {
  * @WIPHY_WOWLAN_MAGIC_PKT: supports wakeup on magic packet
  *      (see nl80211.h)
  * @WIPHY_WOWLAN_DISCONNECT: supports wakeup on disconnect
+ * @WIPHY_WOWLAN_SUPPORTS_GTK_REKEY: supports GTK rekeying while asleep
+ * @WIPHY_WOWLAN_GTK_REKEY_FAILURE: supports wakeup on GTK rekey failure
+ * @WIPHY_WOWLAN_EAP_IDENTITY_REQ: supports wakeup on EAP identity request
+ * @WIPHY_WOWLAN_4WAY_HANDSHAKE: supports wakeup on 4-way handshake failure
+ * @WIPHY_WOWLAN_RFKILL_RELEASE: supports wakeup on RF-kill release
  */
 enum wiphy_wowlan_support_flags {
-        WIPHY_WOWLAN_ANY        = BIT(0),
-        WIPHY_WOWLAN_MAGIC_PKT  = BIT(1),
-        WIPHY_WOWLAN_DISCONNECT = BIT(2),
+        WIPHY_WOWLAN_ANY                = BIT(0),
+        WIPHY_WOWLAN_MAGIC_PKT          = BIT(1),
+        WIPHY_WOWLAN_DISCONNECT         = BIT(2),
+        WIPHY_WOWLAN_SUPPORTS_GTK_REKEY = BIT(3),
+        WIPHY_WOWLAN_GTK_REKEY_FAILURE  = BIT(4),
+        WIPHY_WOWLAN_EAP_IDENTITY_REQ   = BIT(5),
+        WIPHY_WOWLAN_4WAY_HANDSHAKE     = BIT(6),
+        WIPHY_WOWLAN_RFKILL_RELEASE     = BIT(7),
 };
 
 /**