aboutsummaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2011-07-13 04:48:55 -0400
committerJohn W. Linville <linville@tuxdriver.com>2011-07-15 13:38:28 -0400
commit77dbbb138986b26cb99f868d4b6410577ef4c040 (patch)
treee3f4f9a2bb6b36938e3b221f4f0ee2e74d1ab238 /include/net
parent95acac61ba66c4abd40e038dae8c1ed2e176c7b1 (diff)
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>
Diffstat (limited to 'include/net')
-rw-r--r--include/net/cfg80211.h24
1 files changed, 20 insertions, 4 deletions
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 {
1146 * @magic_pkt: wake up on receiving magic packet 1146 * @magic_pkt: wake up on receiving magic packet
1147 * @patterns: wake up on receiving packet matching a pattern 1147 * @patterns: wake up on receiving packet matching a pattern
1148 * @n_patterns: number of patterns 1148 * @n_patterns: number of patterns
1149 * @gtk_rekey_failure: wake up on GTK rekey failure
1150 * @eap_identity_req: wake up on EAP identity request packet
1151 * @four_way_handshake: wake up on 4-way handshake
1152 * @rfkill_release: wake up when rfkill is released
1149 */ 1153 */
1150struct cfg80211_wowlan { 1154struct cfg80211_wowlan {
1151 bool any, disconnect, magic_pkt; 1155 bool any, disconnect, magic_pkt, gtk_rekey_failure,
1156 eap_identity_req, four_way_handshake,
1157 rfkill_release;
1152 struct cfg80211_wowlan_trig_pkt_pattern *patterns; 1158 struct cfg80211_wowlan_trig_pkt_pattern *patterns;
1153 int n_patterns; 1159 int n_patterns;
1154}; 1160};
@@ -1673,11 +1679,21 @@ struct ieee80211_txrx_stypes {
1673 * @WIPHY_WOWLAN_MAGIC_PKT: supports wakeup on magic packet 1679 * @WIPHY_WOWLAN_MAGIC_PKT: supports wakeup on magic packet
1674 * (see nl80211.h) 1680 * (see nl80211.h)
1675 * @WIPHY_WOWLAN_DISCONNECT: supports wakeup on disconnect 1681 * @WIPHY_WOWLAN_DISCONNECT: supports wakeup on disconnect
1682 * @WIPHY_WOWLAN_SUPPORTS_GTK_REKEY: supports GTK rekeying while asleep
1683 * @WIPHY_WOWLAN_GTK_REKEY_FAILURE: supports wakeup on GTK rekey failure
1684 * @WIPHY_WOWLAN_EAP_IDENTITY_REQ: supports wakeup on EAP identity request
1685 * @WIPHY_WOWLAN_4WAY_HANDSHAKE: supports wakeup on 4-way handshake failure
1686 * @WIPHY_WOWLAN_RFKILL_RELEASE: supports wakeup on RF-kill release
1676 */ 1687 */
1677enum wiphy_wowlan_support_flags { 1688enum wiphy_wowlan_support_flags {
1678 WIPHY_WOWLAN_ANY = BIT(0), 1689 WIPHY_WOWLAN_ANY = BIT(0),
1679 WIPHY_WOWLAN_MAGIC_PKT = BIT(1), 1690 WIPHY_WOWLAN_MAGIC_PKT = BIT(1),
1680 WIPHY_WOWLAN_DISCONNECT = BIT(2), 1691 WIPHY_WOWLAN_DISCONNECT = BIT(2),
1692 WIPHY_WOWLAN_SUPPORTS_GTK_REKEY = BIT(3),
1693 WIPHY_WOWLAN_GTK_REKEY_FAILURE = BIT(4),
1694 WIPHY_WOWLAN_EAP_IDENTITY_REQ = BIT(5),
1695 WIPHY_WOWLAN_4WAY_HANDSHAKE = BIT(6),
1696 WIPHY_WOWLAN_RFKILL_RELEASE = BIT(7),
1681}; 1697};
1682 1698
1683/** 1699/**