diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2010-10-05 19:39:30 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-10-06 16:30:40 -0400 |
| commit | e31b82136d1adc7a599b6e99d3321e5831841f5a (patch) | |
| tree | c72d78d4cccfd08587e909c7efe59956f1cbc23e /net/mac80211/sta_info.c | |
| parent | 53f73c09d64f1fa7d7e6e8b6bb7468d42eddc92d (diff) | |
| download | kernel_samsung_smdk4412-e31b82136d1adc7a599b6e99d3321e5831841f5a.zip kernel_samsung_smdk4412-e31b82136d1adc7a599b6e99d3321e5831841f5a.tar.gz kernel_samsung_smdk4412-e31b82136d1adc7a599b6e99d3321e5831841f5a.tar.bz2 | |
cfg80211/mac80211: allow per-station GTKs
This adds API to allow adding per-station GTKs,
updates mac80211 to support it, and also allows
drivers to remove a key from hwaccel again when
this may be necessary due to multiple GTKs.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/sta_info.c')
| -rw-r--r-- | net/mac80211/sta_info.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c index aeaf2d6..6d8f897 100644 --- a/net/mac80211/sta_info.c +++ b/net/mac80211/sta_info.c @@ -616,7 +616,7 @@ static int __must_check __sta_info_destroy(struct sta_info *sta) struct ieee80211_sub_if_data *sdata; struct sk_buff *skb; unsigned long flags; - int ret; + int ret, i; might_sleep(); @@ -644,10 +644,10 @@ static int __must_check __sta_info_destroy(struct sta_info *sta) if (ret) return ret; - if (sta->key) { - ieee80211_key_free(local, sta->key); - WARN_ON(sta->key); - } + for (i = 0; i < NUM_DEFAULT_KEYS; i++) + ieee80211_key_free(local, sta->gtk[i]); + if (sta->ptk) + ieee80211_key_free(local, sta->ptk); sta->dead = true; |