[MAC80211] key handling: remove default_wep_only

Remove the default_wep_only stuff, this wasn't really done well
and no current driver actually cares.

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, 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)
                 if (local->ops->set_key) {
                         local->ops->set_key(local_to_hw(local),
                                            DISABLE_KEY, sta->addr,
-                                           &sta->key->conf,
-                                           local->default_wep_only);
+                                           &sta->key->conf);
                 }
         } else if (sta->key_idx_compression != HW_KEY_IDX_INVALID) {
                 struct ieee80211_key_conf conf;
@@ -240,8 +239,7 @@ void sta_info_free(struct sta_info *sta)
                 conf.alg = ALG_NONE;
                 conf.flags |= IEEE80211_KEY_FORCE_SW_ENCRYPT;
                 local->ops->set_key(local_to_hw(local), DISABLE_KEY,
-                                    sta->addr, &conf,
-                                    local->default_wep_only);
+                                    sta->addr, &conf);
                 sta->key_idx_compression = HW_KEY_IDX_INVALID;
         }