[MAC80211]: remove set_key_idx callback

No existing drivers use this callback, hence there's no telling
how it might be used. In fact, it is unlikely to be of much use
as-is because the default key index isn't something that the
driver can do much with without knowing which interface it was
for etc. And if it needs the key index for the transmitted frame,
it can get it by keeping a reference to the key_conf structure
and looking it up by hw_key_idx.

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>

diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 9137579c12a47e5fc64231497dafb344b8d26900..8f22b7384805c9573f216eefa4f63983126a27bb 100644 (file)
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -645,19 +645,6 @@ struct ieee80211_ops {
                       const u8 *local_address, const u8 *address,
                       struct ieee80211_key_conf *key);
 
-       /*
-        * Set TX key index for default/broadcast keys. This is needed in cases
-        * where wlan card is doing full WEP/TKIP encapsulation (wep_include_iv
-        * is not set), in other cases, this function pointer can be set to
-        * NULL since the IEEE 802.11 module takes care of selecting the key
-        * index for each TX frame.
-        *
-        * TODO: If you use this callback in your driver tell us if you need
-        *       any other information from it to make it easier, like the
-        *       key_conf instead.
-        */
-       int (*set_key_idx)(struct ieee80211_hw *hw, int idx);
-
        /* Enable/disable IEEE 802.1X. This item requests wlan card to pass
         * unencrypted EAPOL-Key frames even when encryption is configured.
         * If the wlan card does not require such a configuration, this

diff --git a/net/mac80211/key.c b/net/mac80211/key.c
index 19e77f626d848a0d532234e6733fbda092b8ddcb..b10e33deb63ec8e052548a18f4c4674d408ca460 100644 (file)
--- a/net/mac80211/key.c
+++ b/net/mac80211/key.c
@@ -250,10 +250,6 @@ void ieee80211_set_default_key(struct ieee80211_sub_if_data *sdata, int idx)
 
                if (sdata->default_key)
                        ieee80211_debugfs_key_add_default(sdata);
-
-               if (sdata->local->ops->set_key_idx)
-                       sdata->local->ops->set_key_idx(
-                               local_to_hw(sdata->local), idx);
        }
 }