Commit 9c5f2c7e authored by Miri Korenblit's avatar Miri Korenblit Committed by Johannes Berg
Browse files

wifi: mac80211: rename IEEE80211_CHANCTX_CHANGE_MIN_WIDTH 



The name is misleading, this actually indicates that
ieee80211_chanctx_conf::min_def was updated.
Rename it to IEEE80211_CHANCTX_CHANGE_MIN_DEF.

Signed-off-by: default avatarMiri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20241007144851.726b5f12ae0c.I3bd9e594c9d2735183ec049a4c7224bd0a9599c9@changeid


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

drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c

+2 −2
Original line number Diff line number Diff line
@@ -5067,7 +5067,7 @@ void iwl_mvm_change_chanctx(struct ieee80211_hw *hw, 
		      (changed & ~(IEEE80211_CHANCTX_CHANGE_WIDTH |

				   IEEE80211_CHANCTX_CHANGE_RX_CHAINS |

				   IEEE80211_CHANCTX_CHANGE_RADAR |

				   IEEE80211_CHANCTX_CHANGE_MIN_WIDTH)),

				   IEEE80211_CHANCTX_CHANGE_MIN_DEF)),

		      "Cannot change PHY. Ref=%d, changed=0x%X\n",

		      phy_ctxt->ref, changed))

		return;
@@ -5075,7 +5075,7 @@ void iwl_mvm_change_chanctx(struct ieee80211_hw *hw, 
	guard(mvm)(mvm);



	/* we are only changing the min_width, may be a noop */

	if (changed == IEEE80211_CHANCTX_CHANGE_MIN_WIDTH) {

	if (changed == IEEE80211_CHANCTX_CHANGE_MIN_DEF) {

		if (phy_ctxt->width == def->width)

			return;

include/net/mac80211.h

+2 −2
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ struct ieee80211_low_level_stats { 
 * @IEEE80211_CHANCTX_CHANGE_RADAR: radar detection flag changed

 * @IEEE80211_CHANCTX_CHANGE_CHANNEL: switched to another operating channel,

 *	this is used only with channel switching with CSA

 * @IEEE80211_CHANCTX_CHANGE_MIN_WIDTH: The min required channel width changed

 * @IEEE80211_CHANCTX_CHANGE_MIN_DEF: The min chandef changed

 * @IEEE80211_CHANCTX_CHANGE_AP: The AP channel definition changed, so (wider

 *	bandwidth) OFDMA settings need to be changed

 * @IEEE80211_CHANCTX_CHANGE_PUNCTURING: The punctured channel(s) bitmap
@@ -224,7 +224,7 @@ enum ieee80211_chanctx_change { 
	IEEE80211_CHANCTX_CHANGE_RX_CHAINS	= BIT(1),

	IEEE80211_CHANCTX_CHANGE_RADAR		= BIT(2),

	IEEE80211_CHANCTX_CHANGE_CHANNEL	= BIT(3),

	IEEE80211_CHANCTX_CHANGE_MIN_WIDTH	= BIT(4),

	IEEE80211_CHANCTX_CHANGE_MIN_DEF	= BIT(4),

	IEEE80211_CHANCTX_CHANGE_AP		= BIT(5),

	IEEE80211_CHANCTX_CHANGE_PUNCTURING	= BIT(6),

};

net/mac80211/chan.c

+1 −1
Original line number Diff line number Diff line
@@ -409,7 +409,7 @@ _ieee80211_recalc_chanctx_min_def(struct ieee80211_local *local, 
	if (!ctx->driver_present)

		return 0;



	return IEEE80211_CHANCTX_CHANGE_MIN_WIDTH;

	return IEEE80211_CHANCTX_CHANGE_MIN_DEF;

}



static void ieee80211_chan_bw_change(struct ieee80211_local *local,