mt76: mt7915: allocate proper size for tlv tags

Allocating proper memory size according to tlv usage.

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/mt7915/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
index 52e349b..f00ad2b 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
@@ -997,7 +997,7 @@ int mt7915_mcu_add_bss_info(struct mt7915_phy *phy,
        struct sk_buff *skb;
 
        skb = mt7915_mcu_alloc_sta_req(phy->dev, mvif, NULL,
-                                      MT7915_STA_UPDATE_MAX_SIZE);
+                                      MT7915_BSS_UPDATE_MAX_SIZE);
        if (IS_ERR(skb))
                return PTR_ERR(skb);
 
@@ -1092,10 +1092,10 @@ int mt7915_mcu_add_key(struct mt7915_dev *dev, struct ieee80211_vif *vif,
 {
        struct mt7915_vif *mvif = (struct mt7915_vif *)vif->drv_priv;
        struct sk_buff *skb;
+       int len = sizeof(struct sta_req_hdr) + sizeof(struct sta_rec_sec);
        int ret;
 
-       skb = mt7915_mcu_alloc_sta_req(dev, mvif, msta,
-                                      MT7915_STA_UPDATE_MAX_SIZE);
+       skb = mt7915_mcu_alloc_sta_req(dev, mvif, msta, len);
        if (IS_ERR(skb))
                return PTR_ERR(skb);
 
@@ -2056,9 +2056,9 @@ int mt7915_mcu_add_rate_ctrl(struct mt7915_dev *dev, struct ieee80211_vif *vif,
        struct mt7915_vif *mvif = (struct mt7915_vif *)vif->drv_priv;
        struct mt7915_sta *msta = (struct mt7915_sta *)sta->drv_priv;
        struct sk_buff *skb;
+       int len = sizeof(struct sta_req_hdr) + sizeof(struct sta_rec_ra);
 
-       skb = mt7915_mcu_alloc_sta_req(dev, mvif, msta,
-                                      MT7915_STA_UPDATE_MAX_SIZE);
+       skb = mt7915_mcu_alloc_sta_req(dev, mvif, msta, len);
        if (IS_ERR(skb))
                return PTR_ERR(skb);
 
@@ -2129,9 +2129,9 @@ int mt7915_mcu_set_fixed_rate(struct mt7915_dev *dev,
        struct sta_rec_ra_fixed *ra;
        struct sk_buff *skb;
        struct tlv *tlv;
+       int len = sizeof(struct sta_req_hdr) + sizeof(*ra);
 
-       skb = mt7915_mcu_alloc_sta_req(dev, mvif, msta,
-                                      MT7915_STA_UPDATE_MAX_SIZE);
+       skb = mt7915_mcu_alloc_sta_req(dev, mvif, msta, len);
        if (IS_ERR(skb))
                return PTR_ERR(skb);
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.h b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.h
index cdeba5a..34ace6e 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.h
@@ -951,13 +951,21 @@ enum {
                                         sizeof(struct sta_rec_vht) +   \
                                         sizeof(struct tlv) +           \
                                         sizeof(struct sta_rec_muru) +  \
-                                        sizeof(struct sta_rec_sec) +   \
-                                        sizeof(struct sta_rec_ra) +    \
                                         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) +\
+                                        sizeof(struct bss_info_rf_ch) +\
+                                        sizeof(struct bss_info_ra) +   \
+                                        sizeof(struct bss_info_he) +   \
+                                        sizeof(struct bss_info_bmc_rate) +\
+                                        sizeof(struct bss_info_ext_bss) +\
+                                        sizeof(struct bss_info_sync_mode))
+
 #define MT7915_BEACON_UPDATE_SIZE      (sizeof(struct sta_req_hdr) +   \
                                         sizeof(struct bss_info_bcn_csa) + \
                                         sizeof(struct bss_info_bcn_bcc) + \