diff options
Diffstat (limited to 'net/mac80211/sta_info.c')
-rw-r--r-- | net/mac80211/sta_info.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c index 7e10c692c4ad..a1f766fcf966 100644 --- a/net/mac80211/sta_info.c +++ b/net/mac80211/sta_info.c | |||
@@ -230,8 +230,7 @@ void sta_info_free(struct sta_info *sta) | |||
230 | if (local->ops->set_key) { | 230 | if (local->ops->set_key) { |
231 | local->ops->set_key(local_to_hw(local), | 231 | local->ops->set_key(local_to_hw(local), |
232 | DISABLE_KEY, sta->addr, | 232 | DISABLE_KEY, sta->addr, |
233 | &sta->key->conf, | 233 | &sta->key->conf); |
234 | local->default_wep_only); | ||
235 | } | 234 | } |
236 | } else if (sta->key_idx_compression != HW_KEY_IDX_INVALID) { | 235 | } else if (sta->key_idx_compression != HW_KEY_IDX_INVALID) { |
237 | struct ieee80211_key_conf conf; | 236 | struct ieee80211_key_conf conf; |
@@ -240,8 +239,7 @@ void sta_info_free(struct sta_info *sta) | |||
240 | conf.alg = ALG_NONE; | 239 | conf.alg = ALG_NONE; |
241 | conf.flags |= IEEE80211_KEY_FORCE_SW_ENCRYPT; | 240 | conf.flags |= IEEE80211_KEY_FORCE_SW_ENCRYPT; |
242 | local->ops->set_key(local_to_hw(local), DISABLE_KEY, | 241 | local->ops->set_key(local_to_hw(local), DISABLE_KEY, |
243 | sta->addr, &conf, | 242 | sta->addr, &conf); |
244 | local->default_wep_only); | ||
245 | sta->key_idx_compression = HW_KEY_IDX_INVALID; | 243 | sta->key_idx_compression = HW_KEY_IDX_INVALID; |
246 | } | 244 | } |
247 | 245 | ||