diff mbox series

[2/3] mt76: mt7915: remove unused mt7915_mcu_bss_sync_tlv()

Message ID 4e10985307260de60fea3fae0b6f41985136082c.1603988327.git.ryder.lee@mediatek.com
State New
Headers show
Series None | expand

Commit Message

Ryder Lee Oct. 29, 2020, 5:11 p.m. UTC 
mt7915_mcu_bss_sync_tlv() is no longer used, so remove it.

Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>

---
 .../net/wireless/mediatek/mt76/mt7915/mcu.c   | 19 ++-----------------
 .../net/wireless/mediatek/mt76/mt7915/mcu.h   | 11 +----------
 2 files changed, 3 insertions(+), 27 deletions(-)

-- 
2.18.0

Comments

Felix Fietkau Nov. 13, 2020, 9:13 a.m. UTC | #1 
On 2020-10-29 18:11, Ryder Lee wrote:
> mt7915_mcu_bss_sync_tlv() is no longer used, so remove it.

> 

> Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>

> ---

>  .../net/wireless/mediatek/mt76/mt7915/mcu.c   | 19 ++-----------------

>  .../net/wireless/mediatek/mt76/mt7915/mcu.h   | 11 +----------

>  2 files changed, 3 insertions(+), 27 deletions(-)

> 

> diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c

> index 18383dcdaf35..ed767b28aa86 100644

> --- a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c

> +++ b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c

This patch was missing a chunk to remove
sizeof(struct bss_info_sync_mode) from MT7915_BSS_UPDATE_MAX_SIZE.
I've fixed it up locally.

- Felix
diff mbox series

Patch

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
index 18383dcdaf35..ed767b28aa86 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
@@ -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);
 	}
 
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.h b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.h
index 57446cd11c40..3e04a1f986cc 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.h
@@ -387,15 +387,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;
@@ -513,7 +504,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,