diff options
author | Johannes Berg <johannes.berg@intel.com> | 2011-07-13 10:48:55 +0200 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-07-15 13:38:28 -0400 |
commit | 77dbbb138986b26cb99f868d4b6410577ef4c040 (patch) | |
tree | e3f4f9a2bb6b36938e3b221f4f0ee2e74d1ab238 /net/wireless/core.c | |
parent | 95acac61ba66c4abd40e038dae8c1ed2e176c7b1 (diff) | |
download | linux-stable-77dbbb138986b26cb99f868d4b6410577ef4c040.tar.gz linux-stable-77dbbb138986b26cb99f868d4b6410577ef4c040.tar.bz2 linux-stable-77dbbb138986b26cb99f868d4b6410577ef4c040.zip |
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 'net/wireless/core.c')
-rw-r--r-- | net/wireless/core.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/wireless/core.c b/net/wireless/core.c index 880dbe2e6f94..112959d5256a 100644 --- a/net/wireless/core.c +++ b/net/wireless/core.c @@ -488,6 +488,10 @@ int wiphy_register(struct wiphy *wiphy) int i; u16 ifmodes = wiphy->interface_modes; + if (WARN_ON((wiphy->wowlan.flags & WIPHY_WOWLAN_GTK_REKEY_FAILURE) && + !(wiphy->wowlan.flags & WIPHY_WOWLAN_SUPPORTS_GTK_REKEY))) + return -EINVAL; + if (WARN_ON(wiphy->addresses && !wiphy->n_addresses)) return -EINVAL; |