aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/sta_info.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/mac80211/sta_info.c')
-rw-r--r--net/mac80211/sta_info.c18
1 files changed, 0 insertions, 18 deletions
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
index a1f766fcf966..fba2d79e4d2b 100644
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -165,7 +165,6 @@ struct sta_info * sta_info_add(struct ieee80211_local *local,
165 local->ops->sta_table_notification(local_to_hw(local), 165 local->ops->sta_table_notification(local_to_hw(local),
166 local->num_sta); 166 local->num_sta);
167 write_unlock_bh(&local->sta_lock); 167 write_unlock_bh(&local->sta_lock);
168 sta->key_idx_compression = HW_KEY_IDX_INVALID;
169 168
170#ifdef CONFIG_MAC80211_VERBOSE_DEBUG 169#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
171 printk(KERN_DEBUG "%s: Added STA " MAC_FMT "\n", 170 printk(KERN_DEBUG "%s: Added STA " MAC_FMT "\n",
@@ -226,23 +225,6 @@ void sta_info_free(struct sta_info *sta)
226 dev_kfree_skb(skb); 225 dev_kfree_skb(skb);
227 } 226 }
228 227
229 if (sta->key) {
230 if (local->ops->set_key) {
231 local->ops->set_key(local_to_hw(local),
232 DISABLE_KEY, sta->addr,
233 &sta->key->conf);
234 }
235 } else if (sta->key_idx_compression != HW_KEY_IDX_INVALID) {
236 struct ieee80211_key_conf conf;
237 memset(&conf, 0, sizeof(conf));
238 conf.hw_key_idx = sta->key_idx_compression;
239 conf.alg = ALG_NONE;
240 conf.flags |= IEEE80211_KEY_FORCE_SW_ENCRYPT;
241 local->ops->set_key(local_to_hw(local), DISABLE_KEY,
242 sta->addr, &conf);
243 sta->key_idx_compression = HW_KEY_IDX_INVALID;
244 }
245
246#ifdef CONFIG_MAC80211_VERBOSE_DEBUG 228#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
247 printk(KERN_DEBUG "%s: Removed STA " MAC_FMT "\n", 229 printk(KERN_DEBUG "%s: Removed STA " MAC_FMT "\n",
248 local->mdev->name, MAC_ARG(sta->addr)); 230 local->mdev->name, MAC_ARG(sta->addr));