3 @@ -730,12 +730,12 @@ mt7615_mcu_add_beacon_offload(struct mt7
4 memcpy(req.pkt + MT_TXD_SIZE, skb->data, skb->len);
5 req.pkt_len = cpu_to_le16(MT_TXD_SIZE + skb->len);
6 req.tim_ie_pos = cpu_to_le16(MT_TXD_SIZE + offs.tim_offset);
7 - if (offs.csa_counter_offs[0]) {
8 + if (offs.cntdwn_counter_offs[0]) {
11 - csa_offs = MT_TXD_SIZE + offs.csa_counter_offs[0] - 4;
12 + csa_offs = MT_TXD_SIZE + offs.cntdwn_counter_offs[0] - 4;
13 req.csa_ie_pos = cpu_to_le16(csa_offs);
14 - req.csa_cnt = skb->data[offs.csa_counter_offs[0]];
15 + req.csa_cnt = skb->data[offs.cntdwn_counter_offs[0]];
19 @@ -1801,10 +1801,10 @@ mt7615_mcu_uni_add_beacon_offload(struct
20 req.beacon_tlv.pkt_len = cpu_to_le16(MT_TXD_SIZE + skb->len);
21 req.beacon_tlv.tim_ie_pos = cpu_to_le16(MT_TXD_SIZE + offs.tim_offset);
23 - if (offs.csa_counter_offs[0]) {
24 + if (offs.cntdwn_counter_offs[0]) {
27 - csa_offs = MT_TXD_SIZE + offs.csa_counter_offs[0] - 4;
28 + csa_offs = MT_TXD_SIZE + offs.cntdwn_counter_offs[0] - 4;
29 req.beacon_tlv.csa_ie_pos = cpu_to_le16(csa_offs);
34 @@ -2358,7 +2358,7 @@ mt7915_mcu_beacon_csa(struct sk_buff *rs
35 struct bss_info_bcn *bcn,
36 struct ieee80211_mutable_offsets *offs)
38 - if (offs->csa_counter_offs[0]) {
39 + if (offs->cntdwn_counter_offs[0]) {
41 struct bss_info_bcn_csa *csa;
43 @@ -2366,7 +2366,7 @@ mt7915_mcu_beacon_csa(struct sk_buff *rs
44 sizeof(*csa), &bcn->sub_ntlv,
46 csa = (struct bss_info_bcn_csa *)tlv;
47 - csa->cnt = skb->data[offs->csa_counter_offs[0]];
48 + csa->cnt = skb->data[offs->cntdwn_counter_offs[0]];
52 @@ -2388,8 +2388,8 @@ mt7915_mcu_beacon_cont(struct mt7915_dev
53 cont->pkt_len = cpu_to_le16(MT_TXD_SIZE + skb->len);
54 cont->tim_ofs = cpu_to_le16(offs->tim_offset);
56 - if (offs->csa_counter_offs[0])
57 - cont->csa_ofs = cpu_to_le16(offs->csa_counter_offs[0] - 4);
58 + if (offs->cntdwn_counter_offs[0])
59 + cont->csa_ofs = cpu_to_le16(offs->cntdwn_counter_offs[0] - 4);
61 buf = (u8 *)tlv + sizeof(*cont);
62 mt7915_mac_write_txwi(dev, (__le32 *)buf, skb, wcid, NULL,
65 @@ -1082,7 +1082,7 @@ EXPORT_SYMBOL_GPL(mt76_get_txpower);
67 __mt76_csa_finish(void *priv, u8 *mac, struct ieee80211_vif *vif)
69 - if (vif->csa_active && ieee80211_csa_is_complete(vif))
70 + if (vif->csa_active && ieee80211_beacon_cntdwn_is_complete(vif))
71 ieee80211_csa_finish(vif);
74 @@ -1107,7 +1107,7 @@ __mt76_csa_check(void *priv, u8 *mac, st
78 - dev->csa_complete |= ieee80211_csa_is_complete(vif);
79 + dev->csa_complete |= ieee80211_beacon_cntdwn_is_complete(vif);
82 void mt76_csa_check(struct mt76_dev *dev)