wifi: mac80211: Remove unused ieee80211_smps_is_restrictive
authorDr. David Alan Gilbert <linux@treblig.org>
Thu, 26 Dec 2024 17:01:19 +0000 (17:01 +0000)
committerJohannes Berg <johannes.berg@intel.com>
Mon, 13 Jan 2025 13:01:23 +0000 (14:01 +0100)
The last use of ieee80211_smps_is_restrictive() was removed in 2020 by
commit 52b4810bed83 ("mac80211: Remove support for changing AP SMPS mode")

Remove it.

Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org>
Link: https://patch.msgid.link/20241226170119.108947-1-linux@treblig.org
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
net/mac80211/ieee80211_i.h
net/mac80211/util.c

index a98133d..a214335 100644 (file)
@@ -2109,8 +2109,6 @@ void ieee80211_send_delba(struct ieee80211_sub_if_data *sdata,
 int ieee80211_send_smps_action(struct ieee80211_sub_if_data *sdata,
                               enum ieee80211_smps_mode smps, const u8 *da,
                               const u8 *bssid, int link_id);
-bool ieee80211_smps_is_restrictive(enum ieee80211_smps_mode smps_mode_old,
-                                  enum ieee80211_smps_mode smps_mode_new);
 void ieee80211_add_addbaext(struct sk_buff *skb,
                            const u8 req_addba_ext_data,
                            u16 buf_size);
index 7b65632..5e8e5a1 100644 (file)
@@ -3654,31 +3654,6 @@ again:
        WARN_ON_ONCE(!cfg80211_chandef_valid(c));
 }
 
-/*
- * Returns true if smps_mode_new is strictly more restrictive than
- * smps_mode_old.
- */
-bool ieee80211_smps_is_restrictive(enum ieee80211_smps_mode smps_mode_old,
-                                  enum ieee80211_smps_mode smps_mode_new)
-{
-       if (WARN_ON_ONCE(smps_mode_old == IEEE80211_SMPS_AUTOMATIC ||
-                        smps_mode_new == IEEE80211_SMPS_AUTOMATIC))
-               return false;
-
-       switch (smps_mode_old) {
-       case IEEE80211_SMPS_STATIC:
-               return false;
-       case IEEE80211_SMPS_DYNAMIC:
-               return smps_mode_new == IEEE80211_SMPS_STATIC;
-       case IEEE80211_SMPS_OFF:
-               return smps_mode_new != IEEE80211_SMPS_OFF;
-       default:
-               WARN_ON(1);
-       }
-
-       return false;
-}
-
 int ieee80211_send_action_csa(struct ieee80211_sub_if_data *sdata,
                              struct cfg80211_csa_settings *csa_settings)
 {