[MAC80211]: remove fake set_key() call

Remove adding a fake key with a NONE key algorithm for each
associated STA. If we have hardware with such TX filtering
we should probably extend the sta_table_notification()
callback with the sta information instead; the fact that
it's treated as a key for some atheros hardware shouldn't
bother the stack.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Acked-by: Michael Wu <flamingice@sourmilk.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

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,
                 local->ops->sta_table_notification(local_to_hw(local),
                                                   local->num_sta);
         write_unlock_bh(&local->sta_lock);
-        sta->key_idx_compression = HW_KEY_IDX_INVALID;
 
 #ifdef CONFIG_MAC80211_VERBOSE_DEBUG
         printk(KERN_DEBUG "%s: Added STA " MAC_FMT "\n",
@@ -226,23 +225,6 @@ void sta_info_free(struct sta_info *sta)
                 dev_kfree_skb(skb);
         }
 
-        if (sta->key) {
-                if (local->ops->set_key) {
-                        local->ops->set_key(local_to_hw(local),
-                                           DISABLE_KEY, sta->addr,
-                                           &sta->key->conf);
-                }
-        } else if (sta->key_idx_compression != HW_KEY_IDX_INVALID) {
-                struct ieee80211_key_conf conf;
-                memset(&conf, 0, sizeof(conf));
-                conf.hw_key_idx = sta->key_idx_compression;
-                conf.alg = ALG_NONE;
-                conf.flags |= IEEE80211_KEY_FORCE_SW_ENCRYPT;
-                local->ops->set_key(local_to_hw(local), DISABLE_KEY,
-                                    sta->addr, &conf);
-                sta->key_idx_compression = HW_KEY_IDX_INVALID;
-        }
-
 #ifdef CONFIG_MAC80211_VERBOSE_DEBUG
         printk(KERN_DEBUG "%s: Removed STA " MAC_FMT "\n",
                local->mdev->name, MAC_ARG(sta->addr));