mt76: mt7915: remove unused mt7915_mcu_bss_sync_tlv()
authorRyder Lee <ryder.lee@mediatek.com>
Thu, 29 Oct 2020 17:11:16 +0000 (01:11 +0800)
committerFelix Fietkau <nbd@nbd.name>
Fri, 4 Dec 2020 13:31:13 +0000 (14:31 +0100)
mt7915_mcu_bss_sync_tlv() is no longer used, so remove it.

Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
drivers/net/wireless/mediatek/mt76/mt7915/mcu.h

index 82f80df..364ffa3 100644 (file)
@@ -938,20 +938,6 @@ mt7915_mcu_bss_bmc_tlv(struct sk_buff *skb, struct mt7915_phy *phy)
        }
 }
 
-static void
-mt7915_mcu_bss_sync_tlv(struct sk_buff *skb, struct ieee80211_vif *vif)
-{
-       struct bss_info_sync_mode *sync;
-       struct tlv *tlv;
-
-       tlv = mt7915_mcu_add_tlv(skb, BSS_INFO_SYNC_MODE, sizeof(*sync));
-
-       sync = (struct bss_info_sync_mode *)tlv;
-       sync->bcn_interval = cpu_to_le16(vif->bss_conf.beacon_int);
-       sync->dtim_period = vif->bss_conf.dtim_period;
-       sync->enable = true;
-}
-
 static int
 mt7915_mcu_muar_config(struct mt7915_phy *phy, struct ieee80211_vif *vif,
                       bool bssid, bool enable)
@@ -1019,9 +1005,8 @@ int mt7915_mcu_add_bss_info(struct mt7915_phy *phy,
                if (vif->bss_conf.he_support)
                        mt7915_mcu_bss_he_tlv(skb, vif, phy);
 
-               if (mvif->omac_idx < EXT_BSSID_START)
-                       mt7915_mcu_bss_sync_tlv(skb, vif);
-               else if (mvif->omac_idx < REPEATER_BSSID_START)
+               if (mvif->omac_idx >= EXT_BSSID_START &&
+                   mvif->omac_idx < REPEATER_BSSID_START)
                        mt7915_mcu_bss_ext_tlv(skb, mvif);
        }
 
index ff5ed09..cd1a425 100644 (file)
@@ -384,15 +384,6 @@ struct bss_info_ext_bss {
        u8 rsv[8];
 } __packed;
 
-struct bss_info_sync_mode {
-       __le16 tag;
-       __le16 len;
-       __le16 bcn_interval;
-       u8 enable;
-       u8 dtim_period;
-       u8 rsv[8];
-} __packed;
-
 struct bss_info_bmc_rate {
        __le16 tag;
        __le16 len;
@@ -510,7 +501,7 @@ enum {
        BSS_INFO_LQ_RM,         /* obsoleted */
        BSS_INFO_EXT_BSS,
        BSS_INFO_BMC_RATE,      /* for bmc rate control in CR4 */
-       BSS_INFO_SYNC_MODE,
+       BSS_INFO_SYNC_MODE,     /* obsoleted */
        BSS_INFO_RA,
        BSS_INFO_HW_AMSDU,
        BSS_INFO_BSS_COLOR,
@@ -1037,8 +1028,7 @@ enum {
                                         sizeof(struct bss_info_hw_amsdu) +\
                                         sizeof(struct bss_info_he) +   \
                                         sizeof(struct bss_info_bmc_rate) +\
-                                        sizeof(struct bss_info_ext_bss) +\
-                                        sizeof(struct bss_info_sync_mode))
+                                        sizeof(struct bss_info_ext_bss))
 
 #define MT7915_BEACON_UPDATE_SIZE      (sizeof(struct sta_req_hdr) +   \
                                         sizeof(struct bss_info_bcn_csa) + \