mac80211: remove ieee80211_key_removed

This API call was intended to be used by drivers
if they want to optimize key handling by removing
one key when another is added. Remove it since no
driver is using it. If needed, it can always be
added back.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/Documentation/DocBook/80211.tmpl b/Documentation/DocBook/80211.tmpl
index f3e214f9e25675660257eb25060bd62890b049b7..42e7f030cb161f018992ffd72fc64508201c9ddf 100644 (file)
--- a/Documentation/DocBook/80211.tmpl
+++ b/Documentation/DocBook/80211.tmpl
@@ -404,7 +404,6 @@
 !Finclude/net/mac80211.h ieee80211_get_tkip_p1k
 !Finclude/net/mac80211.h ieee80211_get_tkip_p1k_iv
 !Finclude/net/mac80211.h ieee80211_get_tkip_p2k
-!Finclude/net/mac80211.h ieee80211_key_removed
       </chapter>
 
       <chapter id="powersave">

diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index e3fa90ce9ecb0691879c21a3beca687a9702fcbb..c5dbb46debb0a1362a686603b4c7c028961c4dde 100644 (file)
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -3591,22 +3591,6 @@ void ieee80211_chswitch_done(struct ieee80211_vif *vif, bool success);
 void ieee80211_request_smps(struct ieee80211_vif *vif,
                            enum ieee80211_smps_mode smps_mode);
 
-/**
- * ieee80211_key_removed - disable hw acceleration for key
- * @key_conf: The key hw acceleration should be disabled for
- *
- * This allows drivers to indicate that the given key has been
- * removed from hardware acceleration, due to a new key that
- * was added. Don't use this if the key can continue to be used
- * for TX, if the key restriction is on RX only it is permitted
- * to keep the key for TX only and not call this function.
- *
- * Due to locking constraints, it may only be called during
- * @set_key. This function must be allowed to sleep, and the
- * key it tries to disable may still be used until it returns.
- */
-void ieee80211_key_removed(struct ieee80211_key_conf *key_conf);
-
 /**
  * ieee80211_ready_on_channel - notification of remain-on-channel start
  * @hw: pointer as obtained from ieee80211_alloc_hw()

diff --git a/net/mac80211/key.c b/net/mac80211/key.c
index b3b7e526e245cdb7cb925e9c39146ec6189bd359..7ae678ba5d679dbd40fc7c199c499ed82228757f 100644 (file)
--- a/net/mac80211/key.c
+++ b/net/mac80211/key.c
@@ -194,26 +194,6 @@ static void ieee80211_key_disable_hw_accel(struct ieee80211_key *key)
        key->flags &= ~KEY_FLAG_UPLOADED_TO_HARDWARE;
 }
 
-void ieee80211_key_removed(struct ieee80211_key_conf *key_conf)
-{
-       struct ieee80211_key *key;
-
-       key = container_of(key_conf, struct ieee80211_key, conf);
-
-       might_sleep();
-       assert_key_lock(key->local);
-
-       key->flags &= ~KEY_FLAG_UPLOADED_TO_HARDWARE;
-
-       /*
-        * Flush TX path to avoid attempts to use this key
-        * after this function returns. Until then, drivers
-        * must be prepared to handle the key.
-        */
-       synchronize_rcu();
-}
-EXPORT_SYMBOL_GPL(ieee80211_key_removed);
-
 static void __ieee80211_set_default_key(struct ieee80211_sub_if_data *sdata,
                                        int idx, bool uni, bool multi)
 {