Skip to content

Commit 9476cda

Browse files
Jeff Johnsonkvalo
Jeff Johnson
authored and
kvalo
committed
wifi: ath11k: Consistently use ath11k_vif_to_arvif()
Helper function ath11k_vif_to_arvif() exists to retrieve a struct ath11k_vif from a struct ieee80211_vif. However, in multiple places this logic is open-coded with inline typecasting. Since the typecasting prevents the compiler from type-checking the source and destination, update the driver to consistently use the helper function. No functional changes, compile tested only. Signed-off-by: Jeff Johnson <quic_jjohnson@quicinc.com> Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com> Link: https://lore.kernel.org/r/20230821-ath11k_vif_to_arvif-v1-1-fa2c3b60b5cf@quicinc.com
1 parent 29d1558 commit 9476cda

File tree

2 files changed

+33
-33
lines changed

2 files changed

+33
-33
lines changed

‎drivers/net/wireless/ath/ath11k/mac.c‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -566,7 +566,7 @@ static void ath11k_get_arvif_iter(void *data, u8 *mac,
566566
struct ieee80211_vif *vif)
567567
{
568568
struct ath11k_vif_iter *arvif_iter = data;
569-
struct ath11k_vif *arvif = (void *)vif->drv_priv;
569+
struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif);
570570

571571
if (arvif->vdev_id == arvif_iter->vdev_id)
572572
arvif_iter->arvif = arvif;
@@ -1464,7 +1464,7 @@ static int ath11k_mac_setup_bcn_tmpl_ema(struct ath11k_vif *arvif)
14641464
u32 params = 0;
14651465
u8 i = 0;
14661466

1467-
tx_arvif = (void *)arvif->vif->mbssid_tx_vif->drv_priv;
1467+
tx_arvif = ath11k_vif_to_arvif(arvif->vif->mbssid_tx_vif);
14681468

14691469
beacons = ieee80211_beacon_get_template_ema_list(tx_arvif->ar->hw,
14701470
tx_arvif->vif, 0);
@@ -1520,8 +1520,8 @@ static int ath11k_mac_setup_bcn_tmpl_mbssid(struct ath11k_vif *arvif)
15201520
struct sk_buff *bcn;
15211521
int ret;
15221522

1523-
if (arvif->vif->mbssid_tx_vif) {
1524-
tx_arvif = (void *)arvif->vif->mbssid_tx_vif->drv_priv;
1523+
if (vif->mbssid_tx_vif) {
1524+
tx_arvif = ath11k_vif_to_arvif(vif->mbssid_tx_vif);
15251525
if (tx_arvif != arvif) {
15261526
ar = tx_arvif->ar;
15271527
ab = ar->ab;
@@ -1562,7 +1562,7 @@ static int ath11k_mac_setup_bcn_tmpl(struct ath11k_vif *arvif)
15621562
* non-transmitting interfaces, and results in a crash if sent.
15631563
*/
15641564
if (vif->mbssid_tx_vif &&
1565-
arvif != (void *)vif->mbssid_tx_vif->drv_priv && arvif->is_up)
1565+
arvif != ath11k_vif_to_arvif(vif->mbssid_tx_vif) && arvif->is_up)
15661566
return 0;
15671567

15681568
if (vif->bss_conf.ema_ap && vif->mbssid_tx_vif)
@@ -1626,7 +1626,7 @@ static void ath11k_control_beaconing(struct ath11k_vif *arvif,
16261626
ether_addr_copy(arvif->bssid, info->bssid);
16271627

16281628
if (arvif->vif->mbssid_tx_vif)
1629-
tx_arvif = (struct ath11k_vif *)arvif->vif->mbssid_tx_vif->drv_priv;
1629+
tx_arvif = ath11k_vif_to_arvif(arvif->vif->mbssid_tx_vif);
16301630

16311631
ret = ath11k_wmi_vdev_up(arvif->ar, arvif->vdev_id, arvif->aid,
16321632
arvif->bssid,
@@ -1649,7 +1649,7 @@ static void ath11k_mac_handle_beacon_iter(void *data, u8 *mac,
16491649
{
16501650
struct sk_buff *skb = data;
16511651
struct ieee80211_mgmt *mgmt = (void *)skb->data;
1652-
struct ath11k_vif *arvif = (void *)vif->drv_priv;
1652+
struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif);
16531653

16541654
if (vif->type != NL80211_IFTYPE_STATION)
16551655
return;
@@ -1672,7 +1672,7 @@ static void ath11k_mac_handle_beacon_miss_iter(void *data, u8 *mac,
16721672
struct ieee80211_vif *vif)
16731673
{
16741674
u32 *vdev_id = data;
1675-
struct ath11k_vif *arvif = (void *)vif->drv_priv;
1675+
struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif);
16761676
struct ath11k *ar = arvif->ar;
16771677
struct ieee80211_hw *hw = ar->hw;
16781678

@@ -1718,7 +1718,7 @@ static void ath11k_peer_assoc_h_basic(struct ath11k *ar,
17181718
struct ieee80211_sta *sta,
17191719
struct peer_assoc_params *arg)
17201720
{
1721-
struct ath11k_vif *arvif = (void *)vif->drv_priv;
1721+
struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif);
17221722
u32 aid;
17231723

17241724
lockdep_assert_held(&ar->conf_mutex);
@@ -1746,7 +1746,7 @@ static void ath11k_peer_assoc_h_crypto(struct ath11k *ar,
17461746
struct ieee80211_bss_conf *info = &vif->bss_conf;
17471747
struct cfg80211_chan_def def;
17481748
struct cfg80211_bss *bss;
1749-
struct ath11k_vif *arvif = (struct ath11k_vif *)vif->drv_priv;
1749+
struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif);
17501750
const u8 *rsnie = NULL;
17511751
const u8 *wpaie = NULL;
17521752

@@ -1804,7 +1804,7 @@ static void ath11k_peer_assoc_h_rates(struct ath11k *ar,
18041804
struct ieee80211_sta *sta,
18051805
struct peer_assoc_params *arg)
18061806
{
1807-
struct ath11k_vif *arvif = (void *)vif->drv_priv;
1807+
struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif);
18081808
struct wmi_rate_set_arg *rateset = &arg->peer_legacy_rates;
18091809
struct cfg80211_chan_def def;
18101810
const struct ieee80211_supported_band *sband;
@@ -1867,7 +1867,7 @@ static void ath11k_peer_assoc_h_ht(struct ath11k *ar,
18671867
struct peer_assoc_params *arg)
18681868
{
18691869
const struct ieee80211_sta_ht_cap *ht_cap = &sta->deflink.ht_cap;
1870-
struct ath11k_vif *arvif = (void *)vif->drv_priv;
1870+
struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif);
18711871
struct cfg80211_chan_def def;
18721872
enum nl80211_band band;
18731873
const u8 *ht_mcs_mask;
@@ -2064,7 +2064,7 @@ static void ath11k_peer_assoc_h_vht(struct ath11k *ar,
20642064
struct peer_assoc_params *arg)
20652065
{
20662066
const struct ieee80211_sta_vht_cap *vht_cap = &sta->deflink.vht_cap;
2067-
struct ath11k_vif *arvif = (void *)vif->drv_priv;
2067+
struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif);
20682068
struct cfg80211_chan_def def;
20692069
enum nl80211_band band;
20702070
u16 *vht_mcs_mask;
@@ -2261,7 +2261,7 @@ static void ath11k_peer_assoc_h_he(struct ath11k *ar,
22612261
struct ieee80211_sta *sta,
22622262
struct peer_assoc_params *arg)
22632263
{
2264-
struct ath11k_vif *arvif = (void *)vif->drv_priv;
2264+
struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif);
22652265
struct cfg80211_chan_def def;
22662266
const struct ieee80211_sta_he_cap *he_cap = &sta->deflink.he_cap;
22672267
enum nl80211_band band;
@@ -2584,7 +2584,7 @@ static void ath11k_peer_assoc_h_qos(struct ath11k *ar,
25842584
struct ieee80211_sta *sta,
25852585
struct peer_assoc_params *arg)
25862586
{
2587-
struct ath11k_vif *arvif = (void *)vif->drv_priv;
2587+
struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif);
25882588

25892589
switch (arvif->vdev_type) {
25902590
case WMI_VDEV_TYPE_AP:
@@ -2747,7 +2747,7 @@ static void ath11k_peer_assoc_h_phymode(struct ath11k *ar,
27472747
struct ieee80211_sta *sta,
27482748
struct peer_assoc_params *arg)
27492749
{
2750-
struct ath11k_vif *arvif = (void *)vif->drv_priv;
2750+
struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif);
27512751
struct cfg80211_chan_def def;
27522752
enum nl80211_band band;
27532753
const u8 *ht_mcs_mask;
@@ -2933,7 +2933,7 @@ static bool ath11k_mac_vif_recalc_sta_he_txbf(struct ath11k *ar,
29332933
struct ieee80211_vif *vif,
29342934
struct ieee80211_sta_he_cap *he_cap)
29352935
{
2936-
struct ath11k_vif *arvif = (void *)vif->drv_priv;
2936+
struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif);
29372937
struct ieee80211_he_cap_elem he_cap_elem = {0};
29382938
struct ieee80211_sta_he_cap *cap_band = NULL;
29392939
struct cfg80211_chan_def def;
@@ -2995,7 +2995,7 @@ static void ath11k_bss_assoc(struct ieee80211_hw *hw,
29952995
struct ieee80211_bss_conf *bss_conf)
29962996
{
29972997
struct ath11k *ar = hw->priv;
2998-
struct ath11k_vif *arvif = (void *)vif->drv_priv;
2998+
struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif);
29992999
struct peer_assoc_params peer_arg;
30003000
struct ieee80211_sta *ap_sta;
30013001
struct ath11k_peer *peer;
@@ -3111,7 +3111,7 @@ static void ath11k_bss_disassoc(struct ieee80211_hw *hw,
31113111
struct ieee80211_vif *vif)
31123112
{
31133113
struct ath11k *ar = hw->priv;
3114-
struct ath11k_vif *arvif = (void *)vif->drv_priv;
3114+
struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif);
31153115
int ret;
31163116

31173117
lockdep_assert_held(&ar->conf_mutex);
@@ -3160,7 +3160,7 @@ static void ath11k_recalculate_mgmt_rate(struct ath11k *ar,
31603160
struct ieee80211_vif *vif,
31613161
struct cfg80211_chan_def *def)
31623162
{
3163-
struct ath11k_vif *arvif = (void *)vif->drv_priv;
3163+
struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif);
31643164
const struct ieee80211_supported_band *sband;
31653165
u8 basic_rate_idx;
31663166
int hw_rate_code;
@@ -4632,7 +4632,7 @@ static int ath11k_station_disassoc(struct ath11k *ar,
46324632
struct ieee80211_vif *vif,
46334633
struct ieee80211_sta *sta)
46344634
{
4635-
struct ath11k_vif *arvif = (void *)vif->drv_priv;
4635+
struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif);
46364636
int ret = 0;
46374637

46384638
lockdep_assert_held(&ar->conf_mutex);
@@ -5160,7 +5160,7 @@ static int ath11k_mac_op_sta_set_txpwr(struct ieee80211_hw *hw,
51605160
struct ieee80211_sta *sta)
51615161
{
51625162
struct ath11k *ar = hw->priv;
5163-
struct ath11k_vif *arvif = (void *)vif->drv_priv;
5163+
struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif);
51645164
int ret = 0;
51655165
s16 txpwr;
51665166

@@ -5210,7 +5210,7 @@ static void ath11k_mac_op_sta_rc_update(struct ieee80211_hw *hw,
52105210
{
52115211
struct ath11k *ar = hw->priv;
52125212
struct ath11k_sta *arsta = (struct ath11k_sta *)sta->drv_priv;
5213-
struct ath11k_vif *arvif = (void *)vif->drv_priv;
5213+
struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif);
52145214
struct ath11k_peer *peer;
52155215
u32 bw, smps;
52165216

@@ -5337,7 +5337,7 @@ static int ath11k_mac_op_conf_tx(struct ieee80211_hw *hw,
53375337
const struct ieee80211_tx_queue_params *params)
53385338
{
53395339
struct ath11k *ar = hw->priv;
5340-
struct ath11k_vif *arvif = (void *)vif->drv_priv;
5340+
struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif);
53415341
struct wmi_wmm_params_arg *p = NULL;
53425342
int ret;
53435343

@@ -6455,7 +6455,7 @@ static int ath11k_mac_setup_vdev_params_mbssid(struct ath11k_vif *arvif,
64556455
return 0;
64566456
}
64576457

6458-
tx_arvif = (void *)tx_vif->drv_priv;
6458+
tx_arvif = ath11k_vif_to_arvif(tx_vif);
64596459

64606460
if (arvif->vif->bss_conf.nontransmitted) {
64616461
if (ar->hw->wiphy != ieee80211_vif_to_wdev(tx_vif)->wiphy)
@@ -7408,7 +7408,7 @@ ath11k_mac_update_vif_chan(struct ath11k *ar,
74087408
/* TODO: Update ar->rx_channel */
74097409

74107410
for (i = 0; i < n_vifs; i++) {
7411-
arvif = (void *)vifs[i].vif->drv_priv;
7411+
arvif = ath11k_vif_to_arvif(vifs[i].vif);
74127412

74137413
if (WARN_ON(!arvif->is_started))
74147414
continue;
@@ -7450,7 +7450,7 @@ ath11k_mac_update_vif_chan(struct ath11k *ar,
74507450

74517451
mbssid_tx_vif = arvif->vif->mbssid_tx_vif;
74527452
if (mbssid_tx_vif)
7453-
tx_arvif = (struct ath11k_vif *)mbssid_tx_vif->drv_priv;
7453+
tx_arvif = ath11k_vif_to_arvif(mbssid_tx_vif);
74547454

74557455
ret = ath11k_wmi_vdev_up(arvif->ar, arvif->vdev_id, arvif->aid,
74567456
arvif->bssid,
@@ -7546,7 +7546,7 @@ static int ath11k_start_vdev_delay(struct ieee80211_hw *hw,
75467546
{
75477547
struct ath11k *ar = hw->priv;
75487548
struct ath11k_base *ab = ar->ab;
7549-
struct ath11k_vif *arvif = (void *)vif->drv_priv;
7549+
struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif);
75507550
int ret;
75517551

75527552
if (WARN_ON(arvif->is_started))
@@ -7596,7 +7596,7 @@ ath11k_mac_op_assign_vif_chanctx(struct ieee80211_hw *hw,
75967596
{
75977597
struct ath11k *ar = hw->priv;
75987598
struct ath11k_base *ab = ar->ab;
7599-
struct ath11k_vif *arvif = (void *)vif->drv_priv;
7599+
struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif);
76007600
int ret;
76017601
struct peer_create_params param;
76027602

@@ -7686,7 +7686,7 @@ ath11k_mac_op_unassign_vif_chanctx(struct ieee80211_hw *hw,
76867686
{
76877687
struct ath11k *ar = hw->priv;
76887688
struct ath11k_base *ab = ar->ab;
7689-
struct ath11k_vif *arvif = (void *)vif->drv_priv;
7689+
struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif);
76907690
struct ath11k_peer *peer;
76917691
int ret;
76927692

@@ -8307,7 +8307,7 @@ ath11k_mac_op_set_bitrate_mask(struct ieee80211_hw *hw,
83078307
struct ieee80211_vif *vif,
83088308
const struct cfg80211_bitrate_mask *mask)
83098309
{
8310-
struct ath11k_vif *arvif = (void *)vif->drv_priv;
8310+
struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif);
83118311
struct cfg80211_chan_def def;
83128312
struct ath11k_pdev_cap *cap;
83138313
struct ath11k *ar = arvif->ar;
@@ -8904,7 +8904,7 @@ static int ath11k_mac_op_remain_on_channel(struct ieee80211_hw *hw,
89048904
enum ieee80211_roc_type type)
89058905
{
89068906
struct ath11k *ar = hw->priv;
8907-
struct ath11k_vif *arvif = (void *)vif->drv_priv;
8907+
struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif);
89088908
struct scan_req_params arg;
89098909
int ret;
89108910
u32 scan_time_msec;

‎drivers/net/wireless/ath/ath11k/testmode.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ static int ath11k_tm_cmd_wmi(struct ath11k *ar, struct nlattr *tb[],
350350
if (ar->ab->fw_mode != ATH11K_FIRMWARE_MODE_FTM &&
351351
(tag == WMI_TAG_VDEV_SET_PARAM_CMD || tag == WMI_TAG_UNIT_TEST_CMD)) {
352352
if (vif) {
353-
arvif = (struct ath11k_vif *)vif->drv_priv;
353+
arvif = ath11k_vif_to_arvif(vif);
354354
*ptr = arvif->vdev_id;
355355
} else {
356356
ret = -EINVAL;

0 commit comments

Comments
 (0)