mt76: fix tx status reporting for non-probing frames
Subsystems (2)
Felix Fietkau
maintainerPATCH 1/7 mt76: fix tx status reporting for non-probing frames
On MT76x2, the hardware does not report tx status in the FIFO register, if the packet id is 0.
Change the allocation of packet IDs to use 0 for no-ack packets, 1 for non-probing packets and 2-255 for packets with tx status requested. Fixes rate control issues
--- drivers/net/wireless/mediatek/mt76/mt76.h | 4 +++- drivers/net/wireless/mediatek/mt76/mt76x02_mac.c | 2 +- drivers/net/wireless/mediatek/mt76/mt76x02_txrx.c | 2 +- drivers/net/wireless/mediatek/mt76/mt76x02_usb_core.c | 3 +-- drivers/net/wireless/mediatek/mt76/tx.c | 9 +++++---- 5 files changed, 11 insertions(+), 9 deletions(-)
drivers/net/wireless/mediatek/mt76/mt76.h +3 -1
@@ -239,7 +239,9 @@ struct mt76_rx_tid {#define MT_TX_CB_TXS_FAILED BIT(2)#define MT_PACKET_ID_MASK GENMASK(7, 0) -#define MT_PACKET_ID_NO_ACK MT_PACKET_ID_MASK +#define MT_PACKET_ID_NO_ACK 0 +#define MT_PACKET_ID_NO_SKB 1 +#define MT_PACKET_ID_FIRST 2#define MT_TX_STATUS_SKB_TIMEOUT HZ
drivers/net/wireless/mediatek/mt76/mt76x02_mac.c +1 -1
@@ -433,7 +433,7 @@ void mt76x02_send_tx_status(struct mt76x02_dev *dev, }if (wcid) { -if (stat->pktid) +if (stat->pktid >=MT_PACKET_ID_FIRST ) status.skb =mt76_tx_status_skb_get (mdev, wcid, stat->pktid, &list);if (status.skb)
drivers/net/wireless/mediatek/mt76/mt76x02_txrx.c +1 -1
@@ -177,7 +177,7 @@ int mt76x02_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,if (ret <0 )return ret; -if (pid && pid !=MT_PACKET_ID_NO_ACK ) +if (pid >=MT_PACKET_ID_FIRST ) qsel =MT_QSEL_MGMT ; *tx_info = FIELD_PREP(MT_TXD_INFO_QSEL, qsel) |
drivers/net/wireless/mediatek/mt76/mt76x02_usb_core.c +1 -2
@@ -87,8 +87,7 @@ int mt76x02u_tx_prepare_skb(struct mt76_dev *mdev, void *data, pid =mt76_tx_status_skb_add (mdev, wcid, skb); txwi->pktid = pid; -if ((pid && pid !=MT_PACKET_ID_NO_ACK ) || -q2ep (q->hw_idx) ==MT_EP_OUT_HCCA ) +if (pid >=MT_PACKET_ID_FIRST ||q2ep (q->hw_idx) ==MT_EP_OUT_HCCA ) qsel =MT_QSEL_MGMT ;else qsel =MT_QSEL_EDCA ;
drivers/net/wireless/mediatek/mt76/tx.c +5 -4
@@ -170,21 +170,22 @@ mt76_tx_status_skb_add(struct mt76_dev *dev, struct mt76_wcid *wcid,int pid;if (!wcid) -return 0 ; +return MT_PACKET_ID_NO_ACK ;if (info->flags &IEEE80211_TX_CTL_NO_ACK )return MT_PACKET_ID_NO_ACK ;if (!(info->flags & (IEEE80211_TX_CTL_REQ_TX_STATUS |IEEE80211_TX_CTL_RATE_CTRL_PROBE ))) -return 0 ; +return MT_PACKET_ID_NO_SKB ;spin_lock_bh (&dev->status_list.lock);memset (cb,0 ,sizeof (*cb)); wcid->packet_id = (wcid->packet_id +1 ) &MT_PACKET_ID_MASK ; -if (!wcid->packet_id || wcid->packet_id ==MT_PACKET_ID_NO_ACK ) - wcid->packet_id =1 ; +if (wcid->packet_id ==MT_PACKET_ID_NO_ACK || + wcid->packet_id ==MT_PACKET_ID_NO_SKB ) + wcid->packet_id =MT_PACKET_ID_FIRST ; pid = wcid->packet_id; cb->wcid = wcid->idx;
Signature · 1 line
2.17.0
Felix Fietkau
maintainerPATCH 2/7 mt76: set IEEE80211_HW_NEEDS_UNIQUE_STA_ADDR flag
The hardware does not deal with multiple WCID entries for the same station properly. Set IEEE80211_HW_NEEDS_UNIQUE_STA_ADDR to avoid those cases
--- drivers/net/wireless/mediatek/mt76/mac80211.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/wireless/mediatek/mt76/mac80211.c +1 -0
@@ -328,6 +328,7 @@ int mt76_register_device(struct mt76_dev *dev, bool vht,ieee80211_hw_set (hw,MFP_CAPABLE );ieee80211_hw_set (hw,AP_LINK_PS );ieee80211_hw_set (hw,REPORTS_TX_ACK_STATUS ); +ieee80211_hw_set (hw,NEEDS_UNIQUE_STA_ADDR ); wiphy->flags |=WIPHY_FLAG_IBSS_RSN ;
Signature · 1 line
2.17.0
Felix Fietkau
maintainerPATCH 3/7 mt76: move mt76x02_get_txpower to mt76 core
In reply to Felix FietkauIt will be reused by mt7603 later
--- drivers/net/wireless/mediatek/mt76/mac80211.c | 18 ++++++++++++++++++ drivers/net/wireless/mediatek/mt76/mt76.h | 3 +++ .../net/wireless/mediatek/mt76/mt76x0/pci.c | 2 +- .../net/wireless/mediatek/mt76/mt76x0/usb.c | 2 +- drivers/net/wireless/mediatek/mt76/mt76x02.h | 2 -- .../net/wireless/mediatek/mt76/mt76x02_util.c | 18 ------------------ .../wireless/mediatek/mt76/mt76x2/pci_main.c | 2 +- .../wireless/mediatek/mt76/mt76x2/usb_main.c | 2 +- 8 files changed, 25 insertions(+), 24 deletions(-)
drivers/net/wireless/mediatek/mt76/mac80211.c +18 -0
@@ -710,3 +710,21 @@ int mt76_sta_state(struct ieee80211_hw *hw, struct ieee80211_vif *vif,return 0 ; }EXPORT_SYMBOL_GPL (mt76_sta_state); + +int mt76_get_txpower (struct ieee80211_hw *hw,struct ieee80211_vif *vif, +int *dbm) +{ +struct mt76_dev *dev = hw->priv; +int n_chains =__sw_hweight8 (dev->antenna_mask); + + *dbm = dev->txpower_cur /2 ; + +/* convert from per-chain power to combined +* output on 2x2 devices +*/ +if (n_chains >1 ) + *dbm +=3 ; + +return 0 ; +} +EXPORT_SYMBOL_GPL (mt76_get_txpower);
drivers/net/wireless/mediatek/mt76/mt76.h +3 -0
@@ -680,6 +680,9 @@ int mt76_sta_state(struct ieee80211_hw *hw, struct ieee80211_vif *vif,struct ieee80211_sta *mt76_rx_convert (struct sk_buff *skb); +int mt76_get_txpower (struct ieee80211_hw *hw,struct ieee80211_vif *vif, +int *dbm); +/* internal */ void mt76_tx_free (struct mt76_dev *dev);struct mt76_txwi_cache *mt76_get_txwi (struct mt76_dev *dev);
drivers/net/wireless/mediatek/mt76/mt76x0/pci.c +1 -1
@@ -99,7 +99,7 @@ static const struct ieee80211_ops mt76x0e_ops = { .sta_rate_tbl_update = mt76x02_sta_rate_tbl_update, .wake_tx_queue = mt76_wake_tx_queue, .get_survey = mt76_get_survey, - .get_txpower = mt76x02_get_txpower, + .get_txpower = mt76_get_txpower, .flush = mt76x0e_flush, .set_tim = mt76x0e_set_tim, .release_buffered_frames = mt76_release_buffered_frames,
drivers/net/wireless/mediatek/mt76/mt76x0/usb.c +1 -1
@@ -155,7 +155,7 @@ static const struct ieee80211_ops mt76x0u_ops = { .sta_rate_tbl_update = mt76x02_sta_rate_tbl_update, .set_rts_threshold = mt76x02_set_rts_threshold, .wake_tx_queue = mt76_wake_tx_queue, - .get_txpower = mt76x02_get_txpower, + .get_txpower = mt76_get_txpower, };static int mt76x0u_register_device (struct mt76x02_dev *dev)
drivers/net/wireless/mediatek/mt76/mt76x02.h +0 -2
@@ -172,8 +172,6 @@ void mt76x02_sw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif, const u8 *mac);void mt76x02_sw_scan_complete (struct ieee80211_hw *hw,struct ieee80211_vif *vif); -int mt76x02_get_txpower (struct ieee80211_hw *hw, -struct ieee80211_vif *vif,int *dbm);void mt76x02_sta_ps (struct mt76_dev *dev,struct ieee80211_sta *sta,bool ps); void mt76x02_bss_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
drivers/net/wireless/mediatek/mt76/mt76x02_util.c +0 -18
@@ -607,24 +607,6 @@ void mt76x02_sw_scan_complete(struct ieee80211_hw *hw, }EXPORT_SYMBOL_GPL (mt76x02_sw_scan_complete); -int mt76x02_get_txpower (struct ieee80211_hw *hw, -struct ieee80211_vif *vif,int *dbm) -{ -struct mt76x02_dev *dev = hw->priv; -u8 nstreams = dev->mt76.chainmask &0xf ; - - *dbm = dev->mt76.txpower_cur /2 ; - -/* convert from per-chain power to combined -* output on 2x2 devices -*/ -if (nstreams >1 ) - *dbm +=3 ; - -return 0 ; -} -EXPORT_SYMBOL_GPL (mt76x02_get_txpower); -void mt76x02_sta_ps (struct mt76_dev *mdev,struct ieee80211_sta *sta,bool ps) {
drivers/net/wireless/mediatek/mt76/mt76x2/pci_main.c +1 -1
@@ -191,7 +191,7 @@ const struct ieee80211_ops mt76x2_ops = { .sw_scan_complete = mt76x02_sw_scan_complete, .flush = mt76x2_flush, .ampdu_action = mt76x02_ampdu_action, - .get_txpower = mt76x02_get_txpower, + .get_txpower = mt76_get_txpower, .wake_tx_queue = mt76_wake_tx_queue, .sta_rate_tbl_update = mt76x02_sta_rate_tbl_update, .release_buffered_frames = mt76_release_buffered_frames,
drivers/net/wireless/mediatek/mt76/mt76x2/usb_main.c +1 -1
@@ -138,5 +138,5 @@ const struct ieee80211_ops mt76x2u_ops = { .sw_scan_start = mt76x02_sw_scan, .sw_scan_complete = mt76x02_sw_scan_complete, .sta_rate_tbl_update = mt76x02_sta_rate_tbl_update, - .get_txpower = mt76x02_get_txpower, + .get_txpower = mt76_get_txpower, };
Signature · 1 line
2.17.0
Felix Fietkau
maintainerPATCH 4/7 mt76: move mt76x02_phy_get_min_avg_rssi to mt76 core
In reply to Felix FietkauThis will be used by mt7603 as well
--- drivers/net/wireless/mediatek/mt76/mac80211.c | 8 +++- drivers/net/wireless/mediatek/mt76/mt76.h | 8 ++++ .../net/wireless/mediatek/mt76/mt76x0/phy.c | 4 +- .../net/wireless/mediatek/mt76/mt76x02_mac.c | 5 -- .../net/wireless/mediatek/mt76/mt76x02_mac.h | 6 --- .../net/wireless/mediatek/mt76/mt76x02_phy.c | 47 ------------------- .../net/wireless/mediatek/mt76/mt76x02_phy.h | 1 - .../net/wireless/mediatek/mt76/mt76x02_util.c | 2 - .../net/wireless/mediatek/mt76/mt76x2/phy.c | 4 +- drivers/net/wireless/mediatek/mt76/util.c | 42 +++++++++++++++++ 10 files changed, 62 insertions(+), 65 deletions(-)
drivers/net/wireless/mediatek/mt76/mac80211.c +6 -2
@@ -548,7 +548,7 @@ mt76_check_ccmp_pn(struct sk_buff *skb) }static void -mt76_check_ps (struct mt76_dev *dev,struct sk_buff *skb) +mt76_check_sta (struct mt76_dev *dev,struct sk_buff *skb) {struct mt76_rx_status *status = (struct mt76_rx_status *) skb->cb;struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
@@ -567,6 +567,9 @@ mt76_check_ps(struct mt76_dev *dev, struct sk_buff *skb) sta = container_of((void *) wcid, struct ieee80211_sta, drv_priv); +ewma_signal_add (&wcid->rssi, status->signal); + wcid->inactive_count =0 ; +if (!test_bit (MT_WCID_FLAG_CHECK_PS , &wcid->flags))return ;
@@ -626,7 +629,7 @@ void mt76_rx_poll_complete(struct mt76_dev *dev, enum mt76_rxq_id q,__skb_queue_head_init (&frames);while ((skb =__skb_dequeue (&dev->rx_skb[q])) !=NULL ) { -mt76_check_ps (dev, skb); +mt76_check_sta (dev, skb);mt76_rx_aggr_reorder (skb, &frames); }
@@ -660,6 +663,7 @@ mt76_sta_add(struct mt76_dev *dev, struct ieee80211_vif *vif,mt76_txq_init (dev, sta->txq[i]); } +ewma_signal_init (&wcid->rssi);rcu_assign_pointer (dev->wcid[wcid->idx], wcid); out:
drivers/net/wireless/mediatek/mt76/mt76.h +8 -0
@@ -23,6 +23,7 @@#include <linux/skbuff.h> #include <linux/leds.h> #include <linux/usb.h> +#include <linux/average.h> #include <net/mac80211.h> #include "util.h"
@@ -174,6 +175,8 @@ enum mt76_wcid_flags {#define MT76_N_WCIDS 128 +DECLARE_EWMA (signal,10 ,8 ); +struct mt76_wcid {struct mt76_rx_tid __rcu *aggr[IEEE80211_NUM_TIDS ];
@@ -181,6 +184,9 @@ struct mt76_wcid {unsigned long flags; +struct ewma_signal rssi; +int inactive_count; +u8 idx;u8 hw_key_idx;
@@ -680,6 +686,8 @@ int mt76_sta_state(struct ieee80211_hw *hw, struct ieee80211_vif *vif,struct ieee80211_sta *mt76_rx_convert (struct sk_buff *skb); +int mt76_get_min_avg_rssi (struct mt76_dev *dev); +int mt76_get_txpower (struct ieee80211_hw *hw,struct ieee80211_vif *vif,int *dbm);
drivers/net/wireless/mediatek/mt76/mt76x0/phy.c +3 -1
@@ -1077,7 +1077,9 @@ mt76x0_phy_update_channel_gain(struct mt76x02_dev *dev)u8 gain_delta;int low_gain; - dev->cal.avg_rssi_all =mt76x02_phy_get_min_avg_rssi (dev); + dev->cal.avg_rssi_all =mt76_get_min_avg_rssi (&dev->mt76); +if (!dev->cal.avg_rssi_all) + dev->cal.avg_rssi_all =-75 ; low_gain = (dev->cal.avg_rssi_all >mt76x02_get_rssi_gain_thresh (dev)) + (dev->cal.avg_rssi_all >mt76x02_get_low_rssi_gain_thresh (dev));
drivers/net/wireless/mediatek/mt76/mt76x02_mac.c +0 -5
@@ -656,11 +656,6 @@ int mt76x02_mac_process_rx(struct mt76x02_dev *dev, struct sk_buff *skb, status->tid =FIELD_GET (MT_RXWI_TID , tid_sn); status->seqno =FIELD_GET (MT_RXWI_SN , tid_sn); -if (sta) { -ewma_signal_add (&sta->rssi, status->signal); - sta->inactive_count =0 ; - } -return mt76x02_mac_process_rate (status, rate); }
drivers/net/wireless/mediatek/mt76/mt76x02_mac.h +0 -6
@@ -18,8 +18,6 @@#ifndef __MT76X02_MAC_H#define __MT76X02_MAC_H -#include <linux/average.h> -struct mt76x02_dev ; struct mt76x02_tx_status {
@@ -41,8 +39,6 @@ struct mt76x02_vif {u8 idx; }; -DECLARE_EWMA (signal,10 ,8 ); -struct mt76x02_sta {struct mt76_wcid wcid;/* must be first */
@@ -50,8 +46,6 @@ struct mt76x02_sta {struct mt76x02_tx_status status;int n_frames; -struct ewma_signal rssi; -int inactive_count; };#define MT_RXINFO_BA BIT(0)
drivers/net/wireless/mediatek/mt76/mt76x02_phy.c +0 -47
53 lines not on this page · raw message
drivers/net/wireless/mediatek/mt76/mt76x02_phy.h +0 -1
@@ -51,7 +51,6 @@ void mt76x02_limit_rate_power(struct mt76_rate_power *r, int limit);int mt76x02_get_max_rate_power (struct mt76_rate_power *r);void mt76x02_phy_set_rxpath (struct mt76x02_dev *dev);void mt76x02_phy_set_txdac (struct mt76x02_dev *dev); -int mt76x02_phy_get_min_avg_rssi (struct mt76x02_dev *dev);void mt76x02_phy_set_bw (struct mt76x02_dev *dev,int width,u8 ctrl);void mt76x02_phy_set_band (struct mt76x02_dev *dev,int band,bool primary_upper);
drivers/net/wireless/mediatek/mt76/mt76x02_util.c +0 -2
@@ -250,8 +250,6 @@ int mt76x02_sta_add(struct mt76_dev *mdev, struct ieee80211_vif *vif,if (vif->type ==NL80211_IFTYPE_AP )set_bit (MT_WCID_FLAG_CHECK_PS , &msta->wcid.flags); -ewma_signal_init (&msta->rssi); -return 0 ; }EXPORT_SYMBOL_GPL (mt76x02_sta_add);
drivers/net/wireless/mediatek/mt76/mt76x2/phy.c +3 -1
@@ -284,7 +284,9 @@ void mt76x2_phy_update_channel_gain(struct mt76x02_dev *dev)int low_gain;u32 val; - dev->cal.avg_rssi_all =mt76x02_phy_get_min_avg_rssi (dev); + dev->cal.avg_rssi_all =mt76_get_min_avg_rssi (&dev->mt76); +if (!dev->cal.avg_rssi_all) + dev->cal.avg_rssi_all =-75 ; low_gain = (dev->cal.avg_rssi_all >mt76x02_get_rssi_gain_thresh (dev)) + (dev->cal.avg_rssi_all >mt76x02_get_low_rssi_gain_thresh (dev));
drivers/net/wireless/mediatek/mt76/util.c +42 -0
46 lines not on this page · raw message
Signature · 1 line
2.17.0
Felix Fietkau
maintainerPATCH 5/7 mt76: fix rssi ewma tracking
In reply to Felix FietkauThe generic EWMA code cannot deal with negative numbers, so convert signal to a positive number before adding it
Fixes mt76x2 AGC tuning
--- drivers/net/wireless/mediatek/mt76/mac80211.c | 4 +++- drivers/net/wireless/mediatek/mt76/util.c | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-)
drivers/net/wireless/mediatek/mt76/mac80211.c +3 -1
@@ -567,7 +567,9 @@ mt76_check_sta(struct mt76_dev *dev, struct sk_buff *skb) sta = container_of((void *) wcid, struct ieee80211_sta, drv_priv); -ewma_signal_add (&wcid->rssi, status->signal); +if (status->signal <=0 ) +ewma_signal_add (&wcid->rssi, -status->signal); + wcid->inactive_count =0 ;if (!test_bit (MT_WCID_FLAG_CHECK_PS , &wcid->flags))
drivers/net/wireless/mediatek/mt76/util.c +1 -1
@@ -100,7 +100,7 @@ int mt76_get_min_avg_rssi(struct mt76_dev *dev)spin_lock (&dev->rx_lock);if (wcid->inactive_count++ <5 ) - cur_rssi =ewma_signal_read (&wcid->rssi); + cur_rssi = -ewma_signal_read (&wcid->rssi);else cur_rssi =0 ;spin_unlock (&dev->rx_lock);
Signature · 1 line
2.17.0
Felix Fietkau
maintainerPATCH 6/7 mt76: fix signedness of rx status signal field
In reply to Felix FietkauIt is usually negative, so it needs to be signed.
--- drivers/net/wireless/mediatek/mt76/mt76.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt76/mt76.h +1 -1
@@ -497,7 +497,7 @@ struct mt76_rx_status {u8 rate_idx;u8 nss;u8 band; -u8 signal; +s8 signal;u8 chains;s8 chain_signal[IEEE80211_MAX_CHAINS ]; };
Signature · 1 line
2.17.0
Felix Fietkau
maintainerPATCH 7/7 mt76: add channel switch announcement support
In reply to Felix FietkauUse the appropriate mac80211 callbacks after beacon transmission
--- drivers/net/wireless/mediatek/mt76/mac80211.c | 39 +++++++++++++++++++ drivers/net/wireless/mediatek/mt76/mt76.h | 5 +++ .../net/wireless/mediatek/mt76/mt76x02_mmio.c | 13 ++++++- .../net/wireless/mediatek/mt76/mt76x02_util.c | 2 + 4 files changed, 57 insertions(+), 2 deletions(-)
drivers/net/wireless/mediatek/mt76/mac80211.c +39 -0
@@ -734,3 +734,42 @@ int mt76_get_txpower(struct ieee80211_hw *hw, struct ieee80211_vif *vif,return 0 ; }EXPORT_SYMBOL_GPL (mt76_get_txpower); + +static void +__mt76_csa_finish (void *priv,u8 *mac,struct ieee80211_vif *vif) +{ +if (vif->csa_active &&ieee80211_csa_is_complete (vif)) +ieee80211_csa_finish (vif); +} + +void mt76_csa_finish (struct mt76_dev *dev) +{ +if (!dev->csa_complete) +return ; + +ieee80211_iterate_active_interfaces_atomic (dev->hw, +IEEE80211_IFACE_ITER_RESUME_ALL , + __mt76_csa_finish, dev); + + dev->csa_complete =0 ; +} +EXPORT_SYMBOL_GPL (mt76_csa_finish); + +static void +__mt76_csa_check (void *priv,u8 *mac,struct ieee80211_vif *vif) +{ +struct mt76_dev *dev = priv; + +if (!vif->csa_active) +return ; + + dev->csa_complete |=ieee80211_csa_is_complete (vif); +} + +void mt76_csa_check (struct mt76_dev *dev) +{ +ieee80211_iterate_active_interfaces_atomic (dev->hw, +IEEE80211_IFACE_ITER_RESUME_ALL , + __mt76_csa_check, dev); +} +EXPORT_SYMBOL_GPL (mt76_csa_check);
drivers/net/wireless/mediatek/mt76/mt76.h +5 -0
@@ -463,6 +463,8 @@ struct mt76_dev {bool led_al;u8 led_pin; +u8 csa_complete; +u32 rxfilter;union {
@@ -691,6 +693,9 @@ int mt76_get_min_avg_rssi(struct mt76_dev *dev);int mt76_get_txpower (struct ieee80211_hw *hw,struct ieee80211_vif *vif,int *dbm); +void mt76_csa_check (struct mt76_dev *dev); +void mt76_csa_finish (struct mt76_dev *dev); +/* internal */ void mt76_tx_free (struct mt76_dev *dev);struct mt76_txwi_cache *mt76_get_txwi (struct mt76_dev *dev);
drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c +11 -2
@@ -116,6 +116,11 @@ static void mt76x02_pre_tbtt_tasklet(unsigned long arg) IEEE80211_IFACE_ITER_RESUME_ALL, mt76x02_update_beacon_iter, dev); +mt76_csa_check (&dev->mt76); + +if (dev->mt76.csa_complete) +return ; + do { nframes = skb_queue_len(&data.q); ieee80211_iterate_active_interfaces_atomic(mt76_hw(dev),
@@ -309,8 +314,12 @@ irqreturn_t mt76x02_irq_handler(int irq, void *dev_instance)tasklet_schedule (&dev->pre_tbtt_tasklet);/* send buffered multicast frames now */ -if (intr &MT_INT_TBTT ) -mt76_queue_kick (dev, &dev->mt76.q_tx[MT_TXQ_PSD ]); +if (intr &MT_INT_TBTT ) { +if (dev->mt76.csa_complete) +mt76_csa_finish (&dev->mt76); +else +mt76_queue_kick (dev, &dev->mt76.q_tx[MT_TXQ_PSD ]); + }if (intr &MT_INT_TX_STAT ) {mt76x02_mac_poll_tx_status (dev, true);
drivers/net/wireless/mediatek/mt76/mt76x02_util.c +2 -0
@@ -160,6 +160,8 @@ void mt76x02_init_device(struct mt76x02_dev *dev)#endif BIT (NL80211_IFTYPE_ADHOC ); + wiphy->flags |=WIPHY_FLAG_HAS_CHANNEL_SWITCH ; +wiphy_ext_feature_set (wiphy,NL80211_EXT_FEATURE_VHT_IBSS );/* init led callbacks */
Signature · 1 line
2.17.0