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: 637f5d60c86b ("mt76: adjust wcid size to support new 802.11ax generation")
Reported-by: kbuild test robot <lkp@intel.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/mac.c b/drivers/net/wireless/mediatek/mt76/mt7603/mac.c
index f8c0c957ca01d28de4eaccd458e5551c8872a9a0..0f205ffe4905ece96e1b2baaa05a9f3f9fc69781 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7603/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7603/mac.c
@@ -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();

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mac.c b/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
index 6b5c38ab9f5dd5c22971c9edaf022d11399b9c18..f1009c92ec1ba2f490e80be5337b77192f98ce27 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
@@ -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();

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02.h b/drivers/net/wireless/mediatek/mt76/mt76x02.h
index 6ea210bd3f07071d7268ce66b09af3b61b7a4be8..4c9bbc7ce023a89e3f2f4f791c99bab22c67839a 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02.h
@@ -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]);

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c b/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c
index a5a3bcd30d6f80f987c4fc5cd19761ae6c8c6f08..e4e03beabe43e44f911541c3d783871a5ca45d9a 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c
@@ -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) {

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c b/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c
index 7e389dbccfeb8b3dc755a7d9722c552cf83620ed..18adedfbbb8e3abdee9f77eeb11bedd2d09bcbe0 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c
@@ -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;

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_util.c b/drivers/net/wireless/mediatek/mt76/mt76x02_util.c
index 9a2c9afa2fb5ec48d688b1731e1f8f176f194d87..44822a849eb1d179cededa49e75153443a7bf15d 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_util.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_util.c
@@ -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;