| developer | 6bcdd6c | 2024-03-21 16:26:34 +0800 | [diff] [blame^] | 1 | From 5c80225b98ec17a975f7a6f5916f38795e059167 Mon Sep 17 00:00:00 2001 |
| 2 | From: Shayne Chen <shayne.chen@mediatek.com> |
| 3 | Date: Thu, 21 Mar 2024 12:14:20 +0800 |
| 4 | Subject: [PATCH 002/120] bp: sync upstream changes |
| 5 | |
| 6 | Signed-off-by: Shayne Chen <shayne.chen@mediatek.com> |
| 7 | --- |
| 8 | mac80211.c | 6 +++--- |
| 9 | mt7615/mcu.c | 2 +- |
| 10 | mt7915/mcu.c | 2 +- |
| 11 | mt7996/mcu.c | 2 +- |
| 12 | 4 files changed, 6 insertions(+), 6 deletions(-) |
| 13 | |
| 14 | diff --git a/mac80211.c b/mac80211.c |
| 15 | index b603d40c2..6f8b85d85 100644 |
| 16 | --- a/mac80211.c |
| 17 | +++ b/mac80211.c |
| 18 | @@ -1614,8 +1614,8 @@ EXPORT_SYMBOL_GPL(mt76_get_sar_power); |
| 19 | static void |
| 20 | __mt76_csa_finish(void *priv, u8 *mac, struct ieee80211_vif *vif) |
| 21 | { |
| 22 | - if (vif->bss_conf.csa_active && ieee80211_beacon_cntdwn_is_complete(vif)) |
| 23 | - ieee80211_csa_finish(vif); |
| 24 | + if (vif->bss_conf.csa_active && ieee80211_beacon_cntdwn_is_complete(vif, 0)) |
| 25 | + ieee80211_csa_finish(vif, 0); |
| 26 | } |
| 27 | |
| 28 | void mt76_csa_finish(struct mt76_dev *dev) |
| 29 | @@ -1639,7 +1639,7 @@ __mt76_csa_check(void *priv, u8 *mac, struct ieee80211_vif *vif) |
| 30 | if (!vif->bss_conf.csa_active) |
| 31 | return; |
| 32 | |
| 33 | - dev->csa_complete |= ieee80211_beacon_cntdwn_is_complete(vif); |
| 34 | + dev->csa_complete |= ieee80211_beacon_cntdwn_is_complete(vif, 0); |
| 35 | } |
| 36 | |
| 37 | void mt76_csa_check(struct mt76_dev *dev) |
| 38 | diff --git a/mt7615/mcu.c b/mt7615/mcu.c |
| 39 | index ae34d019e..c807bd8d9 100644 |
| 40 | --- a/mt7615/mcu.c |
| 41 | +++ b/mt7615/mcu.c |
| 42 | @@ -353,7 +353,7 @@ static void |
| 43 | mt7615_mcu_csa_finish(void *priv, u8 *mac, struct ieee80211_vif *vif) |
| 44 | { |
| 45 | if (vif->bss_conf.csa_active) |
| 46 | - ieee80211_csa_finish(vif); |
| 47 | + ieee80211_csa_finish(vif, 0); |
| 48 | } |
| 49 | |
| 50 | static void |
| 51 | diff --git a/mt7915/mcu.c b/mt7915/mcu.c |
| 52 | index fe54a2f40..24daa0835 100644 |
| 53 | --- a/mt7915/mcu.c |
| 54 | +++ b/mt7915/mcu.c |
| 55 | @@ -228,7 +228,7 @@ mt7915_mcu_csa_finish(void *priv, u8 *mac, struct ieee80211_vif *vif) |
| 56 | if (!vif->bss_conf.csa_active || vif->type == NL80211_IFTYPE_STATION) |
| 57 | return; |
| 58 | |
| 59 | - ieee80211_csa_finish(vif); |
| 60 | + ieee80211_csa_finish(vif, 0); |
| 61 | } |
| 62 | |
| 63 | static void |
| 64 | diff --git a/mt7996/mcu.c b/mt7996/mcu.c |
| 65 | index 1356ac14b..b44abe2ac 100644 |
| 66 | --- a/mt7996/mcu.c |
| 67 | +++ b/mt7996/mcu.c |
| 68 | @@ -341,7 +341,7 @@ mt7996_mcu_csa_finish(void *priv, u8 *mac, struct ieee80211_vif *vif) |
| 69 | if (!vif->bss_conf.csa_active || vif->type == NL80211_IFTYPE_STATION) |
| 70 | return; |
| 71 | |
| 72 | - ieee80211_csa_finish(vif); |
| 73 | + ieee80211_csa_finish(vif, 0); |
| 74 | } |
| 75 | |
| 76 | static void |
| 77 | -- |
| 78 | 2.39.2 |
| 79 | |