mt76: fix per-driver wcid range checks after wcid array size bump
Subsystems (2)
Felix Fietkau
maintainerPATCH 1/1 mt76: fix per-driver wcid range checks after wcid array size bump
All drivers before MT7915 have a limit of 128 WCID entries. Stop relying on ARRAY_SIZE(dev->mt76.wcid), since it no longer reflects that limit.
Fixes 49e649c3e0a6 ("mt76: adjust wcid size to support new 802.11ax generation")
Reported-by kbuild test robot <[email protected]>
Signed-off-by Felix Fietkau <[email protected]>
--- drivers/net/wireless/mediatek/mt76/mt7603/mac.c | 4 ++-- drivers/net/wireless/mediatek/mt76/mt7615/mac.c | 4 ++-- drivers/net/wireless/mediatek/mt76/mt76x02.h | 3 ++- drivers/net/wireless/mediatek/mt76/mt76x02_mac.c | 2 +- drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c | 2 +- drivers/net/wireless/mediatek/mt76/mt76x02_util.c | 2 +- 6 files changed, 9 insertions(+), 8 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7603/mac.c +2 -2
@@ -473,7 +473,7 @@ mt7603_rx_get_wcid(struct mt7603_dev *dev, u8 idx, bool unicast)struct mt7603_sta *sta;struct mt76_wcid *wcid; -if (idx >=ARRAY_SIZE (dev->mt76.wcid)) +if (idx >=MT7603_WTBL_SIZE )return NULL ; wcid =rcu_dereference (dev->mt76.wcid[idx]);
@@ -1238,7 +1238,7 @@ void mt7603_mac_add_txs(struct mt7603_dev *dev, void *data)if (pid ==MT_PACKET_ID_NO_ACK )return ; -if (wcidx >=ARRAY_SIZE (dev->mt76.wcid)) +if (wcidx >=MT7603_WTBL_SIZE )return ;rcu_read_lock ();
drivers/net/wireless/mediatek/mt76/mt7615/mac.c +2 -2
@@ -61,7 +61,7 @@ static struct mt76_wcid *mt7615_rx_get_wcid(struct mt7615_dev *dev,struct mt7615_sta *sta;struct mt76_wcid *wcid; -if (idx >=ARRAY_SIZE (dev->mt76.wcid)) +if (idx >=MT7615_WTBL_SIZE )return NULL ; wcid =rcu_dereference (dev->mt76.wcid[idx]);
@@ -1303,7 +1303,7 @@ static void mt7615_mac_add_txs(struct mt7615_dev *dev, void *data)if (pid ==MT_PACKET_ID_NO_ACK )return ; -if (wcidx >=ARRAY_SIZE (dev->mt76.wcid)) +if (wcidx >=MT7615_WTBL_SIZE )return ;rcu_read_lock ();
drivers/net/wireless/mediatek/mt76/mt76x02.h +2 -1
@@ -15,6 +15,7 @@#include "mt76x02_dfs.h" #include "mt76x02_dma.h" +#define MT76x02_N_WCIDS 128#define MT_CALIBRATE_INTERVAL HZ#define MT_MAC_WORK_INTERVAL (HZ / 10)
@@ -246,7 +247,7 @@ mt76x02_rx_get_sta(struct mt76_dev *dev, u8 idx) {struct mt76_wcid *wcid; -if (idx >=ARRAY_SIZE (dev->wcid)) +if (idx >= MT76x02_N_WCIDS)return NULL ; wcid =rcu_dereference (dev->wcid[idx]);
drivers/net/wireless/mediatek/mt76/mt76x02_mac.c +1 -1
@@ -561,7 +561,7 @@ void mt76x02_send_tx_status(struct mt76x02_dev *dev,rcu_read_lock (); -if (stat->wcid <ARRAY_SIZE (dev->mt76.wcid)) +if (stat->wcid < MT76x02_N_WCIDS) wcid =rcu_dereference (dev->mt76.wcid[stat->wcid]);if (wcid && wcid->sta) {
drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c +1 -1
@@ -415,7 +415,7 @@ static void mt76x02_reset_state(struct mt76x02_dev *dev)ieee80211_iter_keys_rcu (dev->mt76.hw,NULL , mt76x02_key_sync,NULL );rcu_read_unlock (); -for (i =0 ; i <ARRAY_SIZE (dev->mt76.wcid); i++) { +for (i =0 ; i < MT76x02_N_WCIDS; i++) {struct ieee80211_sta *sta;struct ieee80211_vif *vif;struct mt76x02_sta *msta;
drivers/net/wireless/mediatek/mt76/mt76x02_util.c +1 -1
@@ -249,7 +249,7 @@ int mt76x02_sta_add(struct mt76_dev *mdev, struct ieee80211_vif *vif,memset (msta,0 ,sizeof (*msta)); - idx =mt76_wcid_alloc (dev->mt76.wcid_mask,ARRAY_SIZE (dev->mt76.wcid)); + idx =mt76_wcid_alloc (dev->mt76.wcid_mask, MT76x02_N_WCIDS);if (idx <0 )return -ENOSPC ;
Signature · 1 line
2.24.0