wifi: mac80211: remove ieee80211_remove_key

It is no longer used, remove it.

Reviewed-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20250721091956.e964ceacd85c.Idecab8ef161fa58e000b3969bc936399284b79f0@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index a2dbaad2f6d3ff6d73142f7a6fb952c4d839728d..a0cf976a91177992a33361ded01be84db1849aa0 100644 (file)
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -6032,18 +6032,6 @@ void ieee80211_get_key_rx_seq(struct ieee80211_key_conf *keyconf,
 void ieee80211_set_key_rx_seq(struct ieee80211_key_conf *keyconf,
                              int tid, struct ieee80211_key_seq *seq);
 
-/**
- * ieee80211_remove_key - remove the given key
- * @keyconf: the parameter passed with the set key
- *
- * Context: Must be called with the wiphy mutex held.
- *
- * Remove the given key. If the key was uploaded to the hardware at the
- * time this function is called, it is not deleted in the hardware but
- * instead assumed to have been removed already.
- */
-void ieee80211_remove_key(struct ieee80211_key_conf *keyconf);
-
 /**
  * ieee80211_gtk_rekey_add - add a GTK key from rekeying during WoWLAN
  * @vif: the virtual interface to add the key on
@@ -6070,9 +6058,7 @@ void ieee80211_remove_key(struct ieee80211_key_conf *keyconf);
  * for the new key for each TID to set up sequence counters properly.
  *
  * IMPORTANT: If this replaces a key that is present in the hardware,
- * then it will attempt to remove it during this call. In many cases
- * this isn't what you want, so call ieee80211_remove_key() first for
- * the key that's being replaced.
+ * then it will attempt to remove it during this call.
  */
 struct ieee80211_key_conf *
 ieee80211_gtk_rekey_add(struct ieee80211_vif *vif,

diff --git a/net/mac80211/key.c b/net/mac80211/key.c
index 997892da8886f97210ec9b05877779878e1e400b..9d65013ddac79c11170f55e28eaae9d98facd013 100644 (file)
--- a/net/mac80211/key.c
+++ b/net/mac80211/key.c
@@ -6,7 +6,7 @@
  * Copyright 2007-2008 Johannes Berg <johannes@sipsolutions.net>
  * Copyright 2013-2014  Intel Mobile Communications GmbH
  * Copyright 2015-2017 Intel Deutschland GmbH
- * Copyright 2018-2020, 2022-2024  Intel Corporation
+ * Copyright 2018-2020, 2022-2025  Intel Corporation
  */
 
 #include <crypto/utils.h>
@@ -1354,31 +1354,6 @@ void ieee80211_set_key_rx_seq(struct ieee80211_key_conf *keyconf,
 }
 EXPORT_SYMBOL_GPL(ieee80211_set_key_rx_seq);
 
-void ieee80211_remove_key(struct ieee80211_key_conf *keyconf)
-{
-       struct ieee80211_key *key;
-
-       key = container_of(keyconf, struct ieee80211_key, conf);
-
-       lockdep_assert_wiphy(key->local->hw.wiphy);
-
-       /*
-        * if key was uploaded, we assume the driver will/has remove(d)
-        * it, so adjust bookkeeping accordingly
-        */
-       if (key->flags & KEY_FLAG_UPLOADED_TO_HARDWARE) {
-               key->flags &= ~KEY_FLAG_UPLOADED_TO_HARDWARE;
-
-               if (!(key->conf.flags & (IEEE80211_KEY_FLAG_GENERATE_MMIC |
-                                        IEEE80211_KEY_FLAG_PUT_MIC_SPACE |
-                                        IEEE80211_KEY_FLAG_RESERVE_TAILROOM)))
-                       increment_tailroom_need_count(key->sdata);
-       }
-
-       ieee80211_key_free(key, false);
-}
-EXPORT_SYMBOL_GPL(ieee80211_remove_key);
-
 struct ieee80211_key_conf *
 ieee80211_gtk_rekey_add(struct ieee80211_vif *vif,
                        struct ieee80211_key_conf *keyconf,