diff mbox series

wifi: ath11k: Really consistently use ath11k_vif_to_arvif()

Message ID 20240205-ath11k_vif_to_arvif-v1-1-7c41313c8318@quicinc.com
State New
Headers show
Series wifi: ath11k: Really consistently use ath11k_vif_to_arvif() | expand

Commit Message

Jeff Johnson Feb. 5, 2024, 4:16 p.m. UTC
Patch 9476cda44c13 ("wifi: ath11k: Consistently use ath11k_vif_to_arvif()")
previously replaced all open coding of the ath11k_vif_to_arvif()
functionality. Subsequently two more instances of open coding were
introduced, one in patch 92425f788fee ("wifi: ath11k: fill parameters for
vdev set tpc power WMI command") and one in patch 6f4e235be655 ("wifi:
ath11k: add parse of transmit power envelope element"), so fix those as
well.

No functional changes, compile tested only.

Signed-off-by: Jeff Johnson <quic_jjohnson@quicinc.com>
---
 drivers/net/wireless/ath/ath11k/mac.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


---
base-commit: 2a71528427c635f0a8bff704b2e62ce81c641d6f
change-id: 20240201-ath11k_vif_to_arvif-f50b63d43d3b

Comments

Kalle Valo Feb. 7, 2024, 3:07 p.m. UTC | #1
Jeff Johnson <quic_jjohnson@quicinc.com> wrote:

> Commit 9476cda44c13 ("wifi: ath11k: Consistently use ath11k_vif_to_arvif()")
> previously replaced all open coding of the ath11k_vif_to_arvif()
> functionality. Subsequently two more instances of open coding were
> introduced, one in commit 92425f788fee ("wifi: ath11k: fill parameters for
> vdev set tpc power WMI command") and one in commit 6f4e235be655 ("wifi:
> ath11k: add parse of transmit power envelope element"), so fix those as
> well.
> 
> No functional changes, compile tested only.
> 
> Signed-off-by: Jeff Johnson <quic_jjohnson@quicinc.com>
> Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>

Patch applied to ath-next branch of ath.git, thanks.

d7a5c7cde2cb wifi: ath11k: Really consistently use ath11k_vif_to_arvif()
diff mbox series

Patch

diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c
index bbf4d1f4d310..18b949352547 100644
--- a/drivers/net/wireless/ath/ath11k/mac.c
+++ b/drivers/net/wireless/ath/ath11k/mac.c
@@ -7585,7 +7585,7 @@  void ath11k_mac_fill_reg_tpc_info(struct ath11k *ar,
 				  struct ieee80211_chanctx_conf *ctx)
 {
 	struct ath11k_base *ab = ar->ab;
-	struct ath11k_vif *arvif = (void *)vif->drv_priv;
+	struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif);
 	struct ieee80211_bss_conf *bss_conf = &vif->bss_conf;
 	struct ath11k_reg_tpc_power_info *reg_tpc_info = &arvif->reg_tpc_info;
 	struct ieee80211_channel *chan, *temp_chan;
@@ -7758,7 +7758,7 @@  static void ath11k_mac_parse_tx_pwr_env(struct ath11k *ar,
 					struct ieee80211_chanctx_conf *ctx)
 {
 	struct ath11k_base *ab = ar->ab;
-	struct ath11k_vif *arvif = (void *)vif->drv_priv;
+	struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif);
 	struct ieee80211_bss_conf *bss_conf = &vif->bss_conf;
 	struct ieee80211_tx_pwr_env *single_tpe;
 	enum wmi_reg_6ghz_client_type client_type;