blob: 2d608c69396e9414504b8f8d8e5c27ec7024b7d9 [file] [log] [blame]
developer3f52c302024-04-08 14:36:46 +08001From 995dd81673e89e6b387d256e26a0cf07e2ccb0e5 Mon Sep 17 00:00:00 2001
developerebda9012024-02-22 13:42:45 +08002From: MeiChia Chiu <MeiChia.Chiu@mediatek.com>
3Date: Wed, 24 Jan 2024 15:04:33 +0800
developer43a264f2024-03-26 14:09:54 +08004Subject: [PATCH 09/14] wifi: mt76: mt7915: remove redundant argument in
developerebda9012024-02-22 13:42:45 +08005 add_beacon function
6
7Remove redundant argument "changed".
8
9Signed-off-by: MeiChia Chiu <meichia.chiu@mediatek.com>
10---
11 mt7915/mac.c | 3 +--
12 mt7915/main.c | 4 ++--
13 mt7915/mcu.c | 3 +--
14 mt7915/mt7915.h | 2 +-
15 4 files changed, 5 insertions(+), 7 deletions(-)
16
17diff --git a/mt7915/mac.c b/mt7915/mac.c
developer3f52c302024-04-08 14:36:46 +080018index 0f6b806..ada3a7f 100644
developerebda9012024-02-22 13:42:45 +080019--- a/mt7915/mac.c
20+++ b/mt7915/mac.c
developer43a264f2024-03-26 14:09:54 +080021@@ -1285,8 +1285,7 @@ mt7915_update_vif_beacon(void *priv, u8 *mac, struct ieee80211_vif *vif)
developerebda9012024-02-22 13:42:45 +080022 case NL80211_IFTYPE_MESH_POINT:
23 case NL80211_IFTYPE_ADHOC:
24 case NL80211_IFTYPE_AP:
25- mt7915_mcu_add_beacon(hw, vif, vif->bss_conf.enable_beacon,
26- BSS_CHANGED_BEACON_ENABLED);
27+ mt7915_mcu_add_beacon(hw, vif, vif->bss_conf.enable_beacon);
28 break;
29 default:
30 break;
31diff --git a/mt7915/main.c b/mt7915/main.c
developer3f52c302024-04-08 14:36:46 +080032index 5d31f5a..9eeca39 100644
developerebda9012024-02-22 13:42:45 +080033--- a/mt7915/main.c
34+++ b/mt7915/main.c
35@@ -659,7 +659,7 @@ static void mt7915_bss_info_changed(struct ieee80211_hw *hw,
36
37 if (changed & (BSS_CHANGED_BEACON |
38 BSS_CHANGED_BEACON_ENABLED))
39- mt7915_mcu_add_beacon(hw, vif, info->enable_beacon, changed);
40+ mt7915_mcu_add_beacon(hw, vif, info->enable_beacon);
41
42 if (changed & (BSS_CHANGED_UNSOL_BCAST_PROBE_RESP |
43 BSS_CHANGED_FILS_DISCOVERY))
44@@ -732,7 +732,7 @@ mt7915_channel_switch_beacon(struct ieee80211_hw *hw,
45 struct mt7915_dev *dev = mt7915_hw_dev(hw);
46
47 mutex_lock(&dev->mt76.mutex);
48- mt7915_mcu_add_beacon(hw, vif, true, BSS_CHANGED_BEACON);
49+ mt7915_mcu_add_beacon(hw, vif, true);
50 mutex_unlock(&dev->mt76.mutex);
51 }
52
53diff --git a/mt7915/mcu.c b/mt7915/mcu.c
developer3f52c302024-04-08 14:36:46 +080054index 6e9970c..84ffe07 100644
developerebda9012024-02-22 13:42:45 +080055--- a/mt7915/mcu.c
56+++ b/mt7915/mcu.c
developer43a264f2024-03-26 14:09:54 +080057@@ -1970,8 +1970,7 @@ mt7915_mcu_add_inband_discov(struct mt7915_dev *dev, struct ieee80211_vif *vif,
developerebda9012024-02-22 13:42:45 +080058 MCU_EXT_CMD(BSS_INFO_UPDATE), true);
59 }
60
61-int mt7915_mcu_add_beacon(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
62- int en, u32 changed)
63+int mt7915_mcu_add_beacon(struct ieee80211_hw *hw, struct ieee80211_vif *vif, int en)
64 {
65 struct mt7915_dev *dev = mt7915_hw_dev(hw);
66 struct mt7915_phy *phy = mt7915_hw_phy(hw);
67diff --git a/mt7915/mt7915.h b/mt7915/mt7915.h
developer3f52c302024-04-08 14:36:46 +080068index 5cd2b33..e1801d5 100644
developerebda9012024-02-22 13:42:45 +080069--- a/mt7915/mt7915.h
70+++ b/mt7915/mt7915.h
developer43a264f2024-03-26 14:09:54 +080071@@ -461,7 +461,7 @@ int mt7915_mcu_update_bss_color(struct mt7915_dev *dev, struct ieee80211_vif *vi
developerebda9012024-02-22 13:42:45 +080072 int mt7915_mcu_add_inband_discov(struct mt7915_dev *dev, struct ieee80211_vif *vif,
73 u32 changed);
74 int mt7915_mcu_add_beacon(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
75- int enable, u32 changed);
76+ int enable);
77 int mt7915_mcu_add_obss_spr(struct mt7915_phy *phy, struct ieee80211_vif *vif,
78 struct ieee80211_he_obss_pd *he_obss_pd);
79 int mt7915_mcu_add_rate_ctrl(struct mt7915_dev *dev, struct ieee80211_vif *vif,
80--
812.18.0
82