[][MAC80211][core][Remove wrong assignment on the variable "changed" when changing beacon]
[Description]
Remove wrong assignment on the variable "changed" when changing beacon
[Release-log]
N/A
Change-Id: I9a2088d7321fd4277753401bea3f86124f9a5473
Reviewed-on: https://gerrit.mediatek.inc/c/openwrt/feeds/mtk_openwrt_feeds/+/8031098
diff --git a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0005-mac80211-mtk-add-support-for-runtime-set-inband-disc.patch b/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0005-mac80211-mtk-add-support-for-runtime-set-inband-disc.patch
index 0b9a066..66a784d 100644
--- a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0005-mac80211-mtk-add-support-for-runtime-set-inband-disc.patch
+++ b/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0005-mac80211-mtk-add-support-for-runtime-set-inband-disc.patch
@@ -1,23 +1,22 @@
-From ba1bea91d88b2e8fb3c429e8811f7422348bed55 Mon Sep 17 00:00:00 2001
+From f6907ff7ff3669e73f64f802de10346bfd1d24d8 Mon Sep 17 00:00:00 2001
From: MeiChia Chiu <meichia.chiu@mediatek.com>
Date: Wed, 19 Oct 2022 13:45:42 +0800
-Subject: [PATCH 05/21] mac80211: mtk: add support for runtime set inband
- discovery
+Subject: [PATCH] mac80211: mtk: add support for runtime set inband discovery
Signed-off-by: MeiChia Chiu <meichia.chiu@mediatek.com>
---
include/net/cfg80211.h | 1 +
include/net/mac80211.h | 1 +
include/uapi/linux/nl80211.h | 1 +
- net/mac80211/cfg.c | 32 +++++++++++++++++++++++++++++++-
+ net/mac80211/cfg.c | 30 +++++++++++++++++++++++++++++-
net/wireless/nl80211.c | 33 ++++++++++++++++++++++++++++-----
- 5 files changed, 62 insertions(+), 6 deletions(-)
+ 5 files changed, 60 insertions(+), 6 deletions(-)
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
-index 32df498..7ba5fe9 100644
+index 072a787..02e342e 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
-@@ -1306,6 +1306,7 @@ struct cfg80211_fils_discovery {
+@@ -1309,6 +1309,7 @@ struct cfg80211_fils_discovery {
u32 max_interval;
size_t tmpl_len;
const u8 *tmpl;
@@ -50,7 +49,7 @@
/* keep last */
__NL80211_FILS_DISCOVERY_ATTR_LAST,
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
-index d1b6d5c..a78ee52 100644
+index f4649d1..baff0e6 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -990,6 +990,7 @@ static int ieee80211_set_fils_discovery(struct ieee80211_sub_if_data *sdata,
@@ -74,12 +73,10 @@
sdata_assert_lock(sdata);
-@@ -1546,6 +1549,33 @@ static int ieee80211_change_beacon(struct wiphy *wiphy, struct net_device *dev,
+@@ -1546,6 +1549,31 @@ static int ieee80211_change_beacon(struct wiphy *wiphy, struct net_device *dev,
changed |= BSS_CHANGED_HE_BSS_COLOR;
}
-+ changed = err;
-+
+ sband = ieee80211_get_sband(sdata);
+ if (!sband)
+ return -EINVAL;
@@ -181,5 +178,5 @@
}
--
-2.39.2
+2.25.1