Skip to content

Commit bf18f71

Browse files
nbd168nbd168
committed
wifi: mt76: rename struct mt76_vif to mt76_vif_link
Preparation to use it for private bss link data instead of the full vif on MLO capable devices. Link: https://patch.msgid.link/[email protected] Signed-off-by: Felix Fietkau <[email protected]>
1 parent a24f891 commit bf18f71

File tree

20 files changed

+74
-74
lines changed

20 files changed

+74
-74
lines changed

‎drivers/net/wireless/mediatek/mt76/mt76.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -754,7 +754,7 @@ struct mt76_testmode_data {
754754
} rx_stats;
755755
};
756756

757-
struct mt76_vif {
757+
struct mt76_vif_link {
758758
u8 idx;
759759
u8 omac_idx;
760760
u8 band_idx;

‎drivers/net/wireless/mediatek/mt76/mt7615/mac.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -730,7 +730,7 @@ int mt7615_mac_write_txwi(struct mt7615_dev *dev, __le32 *txwi,
730730
u16 seqno = 0;
731731

732732
if (vif) {
733-
struct mt76_vif *mvif = (struct mt76_vif *)vif->drv_priv;
733+
struct mt76_vif_link *mvif = (struct mt76_vif_link *)vif->drv_priv;
734734

735735
omac_idx = mvif->omac_idx;
736736
wmm_idx = mvif->wmm_idx;

‎drivers/net/wireless/mediatek/mt76/mt7615/main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,7 @@ mt7615_conf_tx(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
464464
unsigned int link_id, u16 queue,
465465
const struct ieee80211_tx_queue_params *params)
466466
{
467-
struct mt76_vif *mvif = (struct mt76_vif *)vif->drv_priv;
467+
struct mt76_vif_link *mvif = (struct mt76_vif_link *)vif->drv_priv;
468468
struct mt7615_dev *dev = mt7615_hw_dev(hw);
469469
int err;
470470

‎drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ struct mt7615_sta {
139139
};
140140

141141
struct mt7615_vif {
142-
struct mt76_vif mt76; /* must be first */
142+
struct mt76_vif_link mt76; /* must be first */
143143
struct mt7615_sta sta;
144144
bool sta_added;
145145
};

‎drivers/net/wireless/mediatek/mt76/mt7615/pci_mac.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ mt7615_write_fw_txp(struct mt7615_dev *dev, struct mt76_tx_info *tx_info,
4848
txp->flags |= cpu_to_le16(MT_CT_INFO_MGMT_FRAME);
4949

5050
if (vif) {
51-
struct mt76_vif *mvif = (struct mt76_vif *)vif->drv_priv;
51+
struct mt76_vif_link *mvif = (struct mt76_vif_link *)vif->drv_priv;
5252

5353
txp->bss_idx = mvif->idx;
5454
}

‎drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ u16 mt76_connac2_mac_tx_rate_val(struct mt76_phy *mphy,
294294
struct ieee80211_vif *vif,
295295
bool beacon, bool mcast)
296296
{
297-
struct mt76_vif *mvif = (struct mt76_vif *)vif->drv_priv;
297+
struct mt76_vif_link *mvif = (struct mt76_vif_link *)vif->drv_priv;
298298
struct cfg80211_chan_def *chandef = mvif->ctx ?
299299
&mvif->ctx->def : &mphy->chandef;
300300
u8 nss = 0, mode = 0, band = chandef->chan->band;
@@ -505,7 +505,7 @@ void mt76_connac2_mac_write_txwi(struct mt76_dev *dev, __le32 *txwi,
505505
bool amsdu_en = wcid->amsdu;
506506

507507
if (vif) {
508-
struct mt76_vif *mvif = (struct mt76_vif *)vif->drv_priv;
508+
struct mt76_vif_link *mvif = (struct mt76_vif_link *)vif->drv_priv;
509509

510510
omac_idx = mvif->omac_idx;
511511
wmm_idx = mvif->wmm_idx;

‎drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ EXPORT_SYMBOL_GPL(mt76_connac_mcu_set_mac_enable);
189189

190190
int mt76_connac_mcu_set_vif_ps(struct mt76_dev *dev, struct ieee80211_vif *vif)
191191
{
192-
struct mt76_vif *mvif = (struct mt76_vif *)vif->drv_priv;
192+
struct mt76_vif_link *mvif = (struct mt76_vif_link *)vif->drv_priv;
193193
struct {
194194
u8 bss_idx;
195195
u8 ps_state; /* 0: device awake
@@ -232,7 +232,7 @@ EXPORT_SYMBOL_GPL(mt76_connac_mcu_set_rts_thresh);
232232
void mt76_connac_mcu_beacon_loss_iter(void *priv, u8 *mac,
233233
struct ieee80211_vif *vif)
234234
{
235-
struct mt76_vif *mvif = (struct mt76_vif *)vif->drv_priv;
235+
struct mt76_vif_link *mvif = (struct mt76_vif_link *)vif->drv_priv;
236236
struct mt76_connac_beacon_loss_event *event = priv;
237237

238238
if (mvif->idx != event->bss_idx)
@@ -273,7 +273,7 @@ mt76_connac_mcu_add_nested_tlv(struct sk_buff *skb, int tag, int len,
273273
EXPORT_SYMBOL_GPL(mt76_connac_mcu_add_nested_tlv);
274274

275275
struct sk_buff *
276-
__mt76_connac_mcu_alloc_sta_req(struct mt76_dev *dev, struct mt76_vif *mvif,
276+
__mt76_connac_mcu_alloc_sta_req(struct mt76_dev *dev, struct mt76_vif_link *mvif,
277277
struct mt76_wcid *wcid, int len)
278278
{
279279
struct sta_req_hdr hdr = {
@@ -329,7 +329,7 @@ EXPORT_SYMBOL_GPL(mt76_connac_mcu_alloc_wtbl_req);
329329
void mt76_connac_mcu_bss_omac_tlv(struct sk_buff *skb,
330330
struct ieee80211_vif *vif)
331331
{
332-
struct mt76_vif *mvif = (struct mt76_vif *)vif->drv_priv;
332+
struct mt76_vif_link *mvif = (struct mt76_vif_link *)vif->drv_priv;
333333
u8 omac_idx = mvif->omac_idx;
334334
struct bss_info_omac *omac;
335335
struct tlv *tlv;
@@ -497,7 +497,7 @@ int mt76_connac_mcu_sta_update_hdr_trans(struct mt76_dev *dev,
497497
struct ieee80211_vif *vif,
498498
struct mt76_wcid *wcid, int cmd)
499499
{
500-
struct mt76_vif *mvif = (struct mt76_vif *)vif->drv_priv;
500+
struct mt76_vif_link *mvif = (struct mt76_vif_link *)vif->drv_priv;
501501
struct wtbl_req_hdr *wtbl_hdr;
502502
struct tlv *sta_wtbl;
503503
struct sk_buff *skb;
@@ -545,7 +545,7 @@ void mt76_connac_mcu_wtbl_generic_tlv(struct mt76_dev *dev,
545545
struct ieee80211_sta *sta,
546546
void *sta_wtbl, void *wtbl_tlv)
547547
{
548-
struct mt76_vif *mvif = (struct mt76_vif *)vif->drv_priv;
548+
struct mt76_vif_link *mvif = (struct mt76_vif_link *)vif->drv_priv;
549549
struct wtbl_generic *generic;
550550
struct wtbl_rx *rx;
551551
struct wtbl_spe *spe;
@@ -849,7 +849,7 @@ void mt76_connac_mcu_sta_tlv(struct mt76_phy *mphy, struct sk_buff *skb,
849849
struct ieee80211_vif *vif,
850850
u8 rcpi, u8 sta_state)
851851
{
852-
struct mt76_vif *mvif = (struct mt76_vif *)vif->drv_priv;
852+
struct mt76_vif_link *mvif = (struct mt76_vif_link *)vif->drv_priv;
853853
struct cfg80211_chan_def *chandef = mvif->ctx ?
854854
&mvif->ctx->def : &mphy->chandef;
855855
enum nl80211_band band = chandef->chan->band;
@@ -1041,7 +1041,7 @@ EXPORT_SYMBOL_GPL(mt76_connac_mcu_wtbl_ht_tlv);
10411041
int mt76_connac_mcu_sta_cmd(struct mt76_phy *phy,
10421042
struct mt76_sta_cmd_info *info)
10431043
{
1044-
struct mt76_vif *mvif = (struct mt76_vif *)info->vif->drv_priv;
1044+
struct mt76_vif_link *mvif = (struct mt76_vif_link *)info->vif->drv_priv;
10451045
struct ieee80211_link_sta *link_sta;
10461046
struct mt76_dev *dev = phy->dev;
10471047
struct wtbl_req_hdr *wtbl_hdr;
@@ -1137,7 +1137,7 @@ EXPORT_SYMBOL_GPL(mt76_connac_mcu_wtbl_ba_tlv);
11371137

11381138
int mt76_connac_mcu_uni_add_dev(struct mt76_phy *phy,
11391139
struct ieee80211_bss_conf *bss_conf,
1140-
struct mt76_vif *mvif,
1140+
struct mt76_vif_link *mvif,
11411141
struct mt76_wcid *wcid,
11421142
bool enable)
11431143
{
@@ -1266,7 +1266,7 @@ int mt76_connac_mcu_sta_wed_update(struct mt76_dev *dev, struct sk_buff *skb)
12661266
}
12671267
EXPORT_SYMBOL_GPL(mt76_connac_mcu_sta_wed_update);
12681268

1269-
int mt76_connac_mcu_sta_ba(struct mt76_dev *dev, struct mt76_vif *mvif,
1269+
int mt76_connac_mcu_sta_ba(struct mt76_dev *dev, struct mt76_vif_link *mvif,
12701270
struct ieee80211_ampdu_params *params,
12711271
int cmd, bool enable, bool tx)
12721272
{
@@ -1404,7 +1404,7 @@ EXPORT_SYMBOL_GPL(mt76_connac_get_phy_mode_ext);
14041404
const struct ieee80211_sta_he_cap *
14051405
mt76_connac_get_he_phy_cap(struct mt76_phy *phy, struct ieee80211_vif *vif)
14061406
{
1407-
struct mt76_vif *mvif = (struct mt76_vif *)vif->drv_priv;
1407+
struct mt76_vif_link *mvif = (struct mt76_vif_link *)vif->drv_priv;
14081408
struct cfg80211_chan_def *chandef = mvif->ctx ?
14091409
&mvif->ctx->def : &phy->chandef;
14101410
enum nl80211_band band = chandef->chan->band;
@@ -1453,7 +1453,7 @@ mt76_connac_mcu_uni_bss_he_tlv(struct mt76_phy *phy, struct ieee80211_vif *vif,
14531453
he->max_nss_mcs[CMD_HE_MCS_BW8080] = cap->he_mcs_nss_supp.tx_mcs_80p80;
14541454
}
14551455

1456-
int mt76_connac_mcu_uni_set_chctx(struct mt76_phy *phy, struct mt76_vif *mvif,
1456+
int mt76_connac_mcu_uni_set_chctx(struct mt76_phy *phy, struct mt76_vif_link *mvif,
14571457
struct ieee80211_chanctx_conf *ctx)
14581458
{
14591459
struct cfg80211_chan_def *chandef = ctx ? &ctx->def : &phy->chandef;
@@ -1541,7 +1541,7 @@ int mt76_connac_mcu_uni_add_bss(struct mt76_phy *phy,
15411541
bool enable,
15421542
struct ieee80211_chanctx_conf *ctx)
15431543
{
1544-
struct mt76_vif *mvif = (struct mt76_vif *)vif->drv_priv;
1544+
struct mt76_vif_link *mvif = (struct mt76_vif_link *)vif->drv_priv;
15451545
struct cfg80211_chan_def *chandef = ctx ? &ctx->def : &phy->chandef;
15461546
enum nl80211_band band = chandef->chan->band;
15471547
struct mt76_dev *mdev = phy->dev;
@@ -1667,7 +1667,7 @@ EXPORT_SYMBOL_GPL(mt76_connac_mcu_uni_add_bss);
16671667
int mt76_connac_mcu_hw_scan(struct mt76_phy *phy, struct ieee80211_vif *vif,
16681668
struct ieee80211_scan_request *scan_req)
16691669
{
1670-
struct mt76_vif *mvif = (struct mt76_vif *)vif->drv_priv;
1670+
struct mt76_vif_link *mvif = (struct mt76_vif_link *)vif->drv_priv;
16711671
struct cfg80211_scan_request *sreq = &scan_req->req;
16721672
int n_ssids = 0, err, i, duration;
16731673
int ext_channels_num = max_t(int, sreq->n_channels - 32, 0);
@@ -1773,7 +1773,7 @@ EXPORT_SYMBOL_GPL(mt76_connac_mcu_hw_scan);
17731773
int mt76_connac_mcu_cancel_hw_scan(struct mt76_phy *phy,
17741774
struct ieee80211_vif *vif)
17751775
{
1776-
struct mt76_vif *mvif = (struct mt76_vif *)vif->drv_priv;
1776+
struct mt76_vif_link *mvif = (struct mt76_vif_link *)vif->drv_priv;
17771777
struct {
17781778
u8 seq_num;
17791779
u8 is_ext_channel;
@@ -1799,7 +1799,7 @@ int mt76_connac_mcu_sched_scan_req(struct mt76_phy *phy,
17991799
struct ieee80211_vif *vif,
18001800
struct cfg80211_sched_scan_request *sreq)
18011801
{
1802-
struct mt76_vif *mvif = (struct mt76_vif *)vif->drv_priv;
1802+
struct mt76_vif_link *mvif = (struct mt76_vif_link *)vif->drv_priv;
18031803
struct ieee80211_channel **scan_list = sreq->channels;
18041804
struct mt76_connac_mcu_scan_channel *chan;
18051805
struct mt76_connac_sched_scan_req *req;
@@ -2211,7 +2211,7 @@ int mt76_connac_mcu_set_rate_txpower(struct mt76_phy *phy)
22112211
EXPORT_SYMBOL_GPL(mt76_connac_mcu_set_rate_txpower);
22122212

22132213
int mt76_connac_mcu_update_arp_filter(struct mt76_dev *dev,
2214-
struct mt76_vif *vif,
2214+
struct mt76_vif_link *vif,
22152215
struct ieee80211_bss_conf *info)
22162216
{
22172217
struct ieee80211_vif *mvif = container_of(info, struct ieee80211_vif,
@@ -2254,7 +2254,7 @@ EXPORT_SYMBOL_GPL(mt76_connac_mcu_update_arp_filter);
22542254
int mt76_connac_mcu_set_p2p_oppps(struct ieee80211_hw *hw,
22552255
struct ieee80211_vif *vif)
22562256
{
2257-
struct mt76_vif *mvif = (struct mt76_vif *)vif->drv_priv;
2257+
struct mt76_vif_link *mvif = (struct mt76_vif_link *)vif->drv_priv;
22582258
int ct_window = vif->bss_conf.p2p_noa_attr.oppps_ctwindow;
22592259
struct mt76_phy *phy = hw->priv;
22602260
struct {
@@ -2321,7 +2321,7 @@ int mt76_connac_mcu_update_gtk_rekey(struct ieee80211_hw *hw,
23212321
struct ieee80211_vif *vif,
23222322
struct cfg80211_gtk_rekey_data *key)
23232323
{
2324-
struct mt76_vif *mvif = (struct mt76_vif *)vif->drv_priv;
2324+
struct mt76_vif_link *mvif = (struct mt76_vif_link *)vif->drv_priv;
23252325
struct mt76_connac_gtk_rekey_tlv *gtk_tlv;
23262326
struct mt76_phy *phy = hw->priv;
23272327
struct sk_buff *skb;
@@ -2362,7 +2362,7 @@ static int
23622362
mt76_connac_mcu_set_arp_filter(struct mt76_dev *dev, struct ieee80211_vif *vif,
23632363
bool suspend)
23642364
{
2365-
struct mt76_vif *mvif = (struct mt76_vif *)vif->drv_priv;
2365+
struct mt76_vif_link *mvif = (struct mt76_vif_link *)vif->drv_priv;
23662366
struct {
23672367
struct {
23682368
u8 bss_idx;
@@ -2388,7 +2388,7 @@ int
23882388
mt76_connac_mcu_set_gtk_rekey(struct mt76_dev *dev, struct ieee80211_vif *vif,
23892389
bool suspend)
23902390
{
2391-
struct mt76_vif *mvif = (struct mt76_vif *)vif->drv_priv;
2391+
struct mt76_vif_link *mvif = (struct mt76_vif_link *)vif->drv_priv;
23922392
struct {
23932393
struct {
23942394
u8 bss_idx;
@@ -2417,7 +2417,7 @@ mt76_connac_mcu_set_suspend_mode(struct mt76_dev *dev,
24172417
bool enable, u8 mdtim,
24182418
bool wow_suspend)
24192419
{
2420-
struct mt76_vif *mvif = (struct mt76_vif *)vif->drv_priv;
2420+
struct mt76_vif_link *mvif = (struct mt76_vif_link *)vif->drv_priv;
24212421
struct {
24222422
struct {
24232423
u8 bss_idx;
@@ -2448,7 +2448,7 @@ mt76_connac_mcu_set_wow_pattern(struct mt76_dev *dev,
24482448
u8 index, bool enable,
24492449
struct cfg80211_pkt_pattern *pattern)
24502450
{
2451-
struct mt76_vif *mvif = (struct mt76_vif *)vif->drv_priv;
2451+
struct mt76_vif_link *mvif = (struct mt76_vif_link *)vif->drv_priv;
24522452
struct mt76_connac_wow_pattern_tlv *ptlv;
24532453
struct sk_buff *skb;
24542454
struct req_hdr {
@@ -2480,7 +2480,7 @@ int
24802480
mt76_connac_mcu_set_wow_ctrl(struct mt76_phy *phy, struct ieee80211_vif *vif,
24812481
bool suspend, struct cfg80211_wowlan *wowlan)
24822482
{
2483-
struct mt76_vif *mvif = (struct mt76_vif *)vif->drv_priv;
2483+
struct mt76_vif_link *mvif = (struct mt76_vif_link *)vif->drv_priv;
24842484
struct mt76_dev *dev = phy->dev;
24852485
struct {
24862486
struct {
@@ -2689,7 +2689,7 @@ int mt76_connac_mcu_add_key(struct mt76_dev *dev, struct ieee80211_vif *vif,
26892689
struct ieee80211_key_conf *key, int mcu_cmd,
26902690
struct mt76_wcid *wcid, enum set_key_cmd cmd)
26912691
{
2692-
struct mt76_vif *mvif = (struct mt76_vif *)vif->drv_priv;
2692+
struct mt76_vif_link *mvif = (struct mt76_vif_link *)vif->drv_priv;
26932693
struct sk_buff *skb;
26942694
int ret;
26952695

@@ -2711,7 +2711,7 @@ EXPORT_SYMBOL_GPL(mt76_connac_mcu_add_key);
27112711

27122712
/* SIFS 20us + 512 byte beacon transmitted by 1Mbps (3906us) */
27132713
#define BCN_TX_ESTIMATE_TIME (4096 + 20)
2714-
void mt76_connac_mcu_bss_ext_tlv(struct sk_buff *skb, struct mt76_vif *mvif)
2714+
void mt76_connac_mcu_bss_ext_tlv(struct sk_buff *skb, struct mt76_vif_link *mvif)
27152715
{
27162716
struct bss_info_ext_bss *ext;
27172717
int ext_bss_idx, tsf_offset;
@@ -2735,7 +2735,7 @@ int mt76_connac_mcu_bss_basic_tlv(struct sk_buff *skb,
27352735
struct mt76_phy *phy, u16 wlan_idx,
27362736
bool enable)
27372737
{
2738-
struct mt76_vif *mvif = (struct mt76_vif *)vif->drv_priv;
2738+
struct mt76_vif_link *mvif = (struct mt76_vif_link *)vif->drv_priv;
27392739
u32 type = vif->p2p ? NETWORK_P2P : NETWORK_INFRA;
27402740
struct bss_info_basic *bss;
27412741
struct tlv *tlv;

‎drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1878,10 +1878,10 @@ mt76_connac_mcu_get_wlan_idx(struct mt76_dev *dev, struct mt76_wcid *wcid,
18781878
}
18791879

18801880
struct sk_buff *
1881-
__mt76_connac_mcu_alloc_sta_req(struct mt76_dev *dev, struct mt76_vif *mvif,
1881+
__mt76_connac_mcu_alloc_sta_req(struct mt76_dev *dev, struct mt76_vif_link *mvif,
18821882
struct mt76_wcid *wcid, int len);
18831883
static inline struct sk_buff *
1884-
mt76_connac_mcu_alloc_sta_req(struct mt76_dev *dev, struct mt76_vif *mvif,
1884+
mt76_connac_mcu_alloc_sta_req(struct mt76_dev *dev, struct mt76_vif_link *mvif,
18851885
struct mt76_wcid *wcid)
18861886
{
18871887
return __mt76_connac_mcu_alloc_sta_req(dev, mvif, wcid,
@@ -1940,14 +1940,14 @@ void mt76_connac_mcu_sta_ba_tlv(struct sk_buff *skb,
19401940
bool enable, bool tx);
19411941
int mt76_connac_mcu_uni_add_dev(struct mt76_phy *phy,
19421942
struct ieee80211_bss_conf *bss_conf,
1943-
struct mt76_vif *mvif,
1943+
struct mt76_vif_link *mvif,
19441944
struct mt76_wcid *wcid,
19451945
bool enable);
1946-
int mt76_connac_mcu_sta_ba(struct mt76_dev *dev, struct mt76_vif *mvif,
1946+
int mt76_connac_mcu_sta_ba(struct mt76_dev *dev, struct mt76_vif_link *mvif,
19471947
struct ieee80211_ampdu_params *params,
19481948
int cmd, bool enable, bool tx);
19491949
int mt76_connac_mcu_uni_set_chctx(struct mt76_phy *phy,
1950-
struct mt76_vif *vif,
1950+
struct mt76_vif_link *vif,
19511951
struct ieee80211_chanctx_conf *ctx);
19521952
int mt76_connac_mcu_uni_add_bss(struct mt76_phy *phy,
19531953
struct ieee80211_vif *vif,
@@ -1978,7 +1978,7 @@ int mt76_connac_mcu_sched_scan_enable(struct mt76_phy *phy,
19781978
struct ieee80211_vif *vif,
19791979
bool enable);
19801980
int mt76_connac_mcu_update_arp_filter(struct mt76_dev *dev,
1981-
struct mt76_vif *vif,
1981+
struct mt76_vif_link *vif,
19821982
struct ieee80211_bss_conf *info);
19831983
int mt76_connac_mcu_set_gtk_rekey(struct mt76_dev *dev, struct ieee80211_vif *vif,
19841984
bool suspend);
@@ -2025,7 +2025,7 @@ int mt76_connac_mcu_add_key(struct mt76_dev *dev, struct ieee80211_vif *vif,
20252025
struct ieee80211_key_conf *key, int mcu_cmd,
20262026
struct mt76_wcid *wcid, enum set_key_cmd cmd);
20272027

2028-
void mt76_connac_mcu_bss_ext_tlv(struct sk_buff *skb, struct mt76_vif *mvif);
2028+
void mt76_connac_mcu_bss_ext_tlv(struct sk_buff *skb, struct mt76_vif_link *mvif);
20292029
void mt76_connac_mcu_bss_omac_tlv(struct sk_buff *skb,
20302030
struct ieee80211_vif *vif);
20312031
int mt76_connac_mcu_bss_basic_tlv(struct sk_buff *skb,

‎drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ struct mt7915_vif_cap {
166166
};
167167

168168
struct mt7915_vif {
169-
struct mt76_vif mt76; /* must be first */
169+
struct mt76_vif_link mt76; /* must be first */
170170

171171
struct mt7915_vif_cap cap;
172172
struct mt7915_sta sta;

‎drivers/net/wireless/mediatek/mt76/mt7921/mcu.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ static void
180180
mt7921_mcu_connection_loss_iter(void *priv, u8 *mac,
181181
struct ieee80211_vif *vif)
182182
{
183-
struct mt76_vif *mvif = (struct mt76_vif *)vif->drv_priv;
183+
struct mt76_vif_link *mvif = (struct mt76_vif_link *)vif->drv_priv;
184184
struct mt76_connac_beacon_loss_event *event = priv;
185185

186186
if (mvif->idx != event->bss_idx)
@@ -1131,7 +1131,7 @@ int mt7921_get_txpwr_info(struct mt792x_dev *dev, struct mt7921_txpwr *txpwr)
11311131
int mt7921_mcu_set_sniffer(struct mt792x_dev *dev, struct ieee80211_vif *vif,
11321132
bool enable)
11331133
{
1134-
struct mt76_vif *mvif = (struct mt76_vif *)vif->drv_priv;
1134+
struct mt76_vif_link *mvif = (struct mt76_vif_link *)vif->drv_priv;
11351135
struct {
11361136
struct {
11371137
u8 band_idx;

0 commit comments

Comments
 (0)