Commit aa93ca6f authored by Dr. David Alan Gilbert's avatar Dr. David Alan Gilbert Committed by Johannes Berg
Browse files

wifi: mac80211: Remove unused ieee80211_smps_is_restrictive 



The last use of ieee80211_smps_is_restrictive() was removed in 2020 by
commit 52b4810b ("mac80211: Remove support for changing AP SMPS mode")

Remove it.

Signed-off-by: default avatarDr. David Alan Gilbert <linux@treblig.org>
Link: https://patch.msgid.link/20241226170119.108947-1-linux@treblig.org


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 7ceae9b7

net/mac80211/ieee80211_i.h

+0 −2
Original line number Diff line number Diff line
@@ -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);

net/mac80211/util.c

+0 −25
Original line number Diff line number Diff line
@@ -3654,31 +3654,6 @@ void ieee80211_chandef_downgrade(struct cfg80211_chan_def *c, 
	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)

{