mt76: always use WTBL_MAX_SIZE for tlv allocation

Simplify WTBL defines.

Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.h b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.h
index 3874f45..411ebb5 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.h
@@ -362,30 +362,6 @@ enum {
        BSS_INFO_MAX_NUM
 };
 
-#define MT7615_WTBL_UPDATE_MAX_SIZE    (sizeof(struct wtbl_req_hdr) +  \
-                                        sizeof(struct wtbl_generic) +  \
-                                        sizeof(struct wtbl_rx) +       \
-                                        sizeof(struct wtbl_ht) +       \
-                                        sizeof(struct wtbl_vht) +      \
-                                        sizeof(struct wtbl_tx_ps) +    \
-                                        sizeof(struct wtbl_hdr_trans) +\
-                                        sizeof(struct wtbl_ba) +       \
-                                        sizeof(struct wtbl_bf) +       \
-                                        sizeof(struct wtbl_smps) +     \
-                                        sizeof(struct wtbl_pn) +       \
-                                        sizeof(struct wtbl_spe))
-
-#define MT7615_STA_UPDATE_MAX_SIZE     (sizeof(struct sta_req_hdr) +   \
-                                        sizeof(struct sta_rec_basic) + \
-                                        sizeof(struct sta_rec_ht) +    \
-                                        sizeof(struct sta_rec_vht) +   \
-                                        sizeof(struct sta_rec_uapsd) + \
-                                        sizeof(struct tlv) +   \
-                                        MT7615_WTBL_UPDATE_MAX_SIZE)
-
-#define MT7615_WTBL_UPDATE_BA_SIZE     (sizeof(struct wtbl_req_hdr) +  \
-                                        sizeof(struct wtbl_ba))
-
 enum {
        CH_SWITCH_NORMAL = 0,
        CH_SWITCH_SCAN = 3,

diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
index 6cbccfb..e6ad6cb 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
@@ -287,7 +287,7 @@ mt76_connac_mcu_alloc_wtbl_req(struct mt76_dev *dev, struct mt76_wcid *wcid,
                                     &hdr.wlan_idx_hi);
        if (!nskb) {
                nskb = mt76_mcu_msg_alloc(dev, NULL,
-                                         MT76_CONNAC_WTBL_UPDATE_BA_SIZE);
+                                         MT76_CONNAC_WTBL_UPDATE_MAX_SIZE);
                if (!nskb)
                        return ERR_PTR(-ENOMEM);
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
index c1e1df5..9c26b90 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
@@ -304,9 +304,6 @@ struct wtbl_raw {
                                         sizeof(struct tlv) +           \
                                         MT76_CONNAC_WTBL_UPDATE_MAX_SIZE)
 
-#define MT76_CONNAC_WTBL_UPDATE_BA_SIZE        (sizeof(struct wtbl_req_hdr) +  \
-                                        sizeof(struct wtbl_ba))
-
 enum {
        STA_REC_BASIC,
        STA_REC_RA,

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
index 6a8a1aa..a9c4a00 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
@@ -592,7 +592,7 @@ mt7915_mcu_alloc_wtbl_req(struct mt7915_dev *dev, struct mt7915_sta *msta,
 
        if (!nskb) {
                nskb = mt76_mcu_msg_alloc(&dev->mt76, NULL,
-                                         MT7915_WTBL_UPDATE_BA_SIZE);
+                                         MT7915_WTBL_UPDATE_MAX_SIZE);
                if (!nskb)
                        return ERR_PTR(-ENOMEM);
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.h b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.h
index 2d58414..2a2f7bf 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.h
@@ -1080,9 +1080,6 @@ enum {
                                         sizeof(struct tlv) +           \
                                         MT7915_WTBL_UPDATE_MAX_SIZE)
 
-#define MT7915_WTBL_UPDATE_BA_SIZE     (sizeof(struct wtbl_req_hdr) +  \
-                                        sizeof(struct wtbl_ba))
-
 #define MT7915_BSS_UPDATE_MAX_SIZE     (sizeof(struct sta_req_hdr) +   \
                                         sizeof(struct bss_info_omac) + \
                                         sizeof(struct bss_info_basic) +\