[][MAC80211][mt76][Fix build error when CONFIG_NL80211_TESTMODE is off]
[Description]
Fix build error when CONFIG_NL80211_TESTMODE is off
[Release-log]
N/A
Change-Id: Id345aa634a674448c222146801e902714e0b50de
Reviewed-on: https://gerrit.mediatek.inc/c/openwrt/feeds/mtk_openwrt_feeds/+/6796107
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/1121-mt76-mt7915-implement-bin-file-mode.patch b/autobuild_mac80211_release/package/kernel/mt76/patches/1121-mt76-mt7915-implement-bin-file-mode.patch
index db53404..5dc8a54 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/1121-mt76-mt7915-implement-bin-file-mode.patch
+++ b/autobuild_mac80211_release/package/kernel/mt76/patches/1121-mt76-mt7915-implement-bin-file-mode.patch
@@ -1,9 +1,8 @@
-From f7cb9b3ad2c0207db231a16d04beea22be1ef798 Mon Sep 17 00:00:00 2001
+From ee7302c84173d00af165f8aa2330e8f11607e5d7 Mon Sep 17 00:00:00 2001
From: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
Date: Thu, 7 Jul 2022 11:09:59 +0800
-Subject: [PATCH 1121/1128] mt76: mt7915: implement bin file mode
+Subject: [PATCH] mt76: mt7915: implement bin file mode
-Change-Id: I2a726341541a11cbecdb210b33a8e79aefbd6cf3
Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
---
eeprom.c | 18 +++++++++++++++
@@ -11,8 +10,8 @@
mt7915/eeprom.c | 52 ++++++++++++++++++++------------------------
mt7915/eeprom.h | 44 +++++++++++++++++++++++++++++++++++++
mt7915/mt7915.h | 17 ++++++++++++---
- mt7915/mtk_debugfs.c | 36 ++++++++++++++++++++++++++++++
- 6 files changed, 136 insertions(+), 32 deletions(-)
+ mt7915/mtk_debugfs.c | 41 ++++++++++++++++++++++++++++++++++
+ 6 files changed, 141 insertions(+), 32 deletions(-)
diff --git a/eeprom.c b/eeprom.c
index e083964..5b9faf7 100644
@@ -255,7 +254,7 @@
bool ibf;
diff --git a/mt7915/mtk_debugfs.c b/mt7915/mtk_debugfs.c
-index 9de5b0f..36cb6f0 100644
+index 9de5b0f..e14b52c 100644
--- a/mt7915/mtk_debugfs.c
+++ b/mt7915/mtk_debugfs.c
@@ -3,6 +3,7 @@
@@ -266,7 +265,7 @@
#ifdef MTK_DEBUG
#define LWTBL_IDX2BASE_ID GENMASK(14, 8)
-@@ -2893,6 +2894,39 @@ mt7915_wa_debug(void *data, u64 val)
+@@ -2893,6 +2894,44 @@ mt7915_wa_debug(void *data, u64 val)
DEFINE_DEBUGFS_ATTRIBUTE(fops_wa_debug, NULL, mt7915_wa_debug,
"0x%llx\n");
@@ -274,8 +273,13 @@
+{
+ struct mt7915_dev *dev = dev_get_drvdata(s->private);
+ struct mt76_dev *mdev = &dev->mt76;
++#ifdef CONFIG_NL80211_TESTMODE
+ char *mtd_name = mdev->test_mtd.name;
+ u32 mtd_offset = mdev->test_mtd.offset;
++#else
++ char *mtd_name;
++ u32 mtd_offset;
++#endif
+
+ seq_printf(s, "Current eeprom mode:\n");
+
@@ -306,7 +310,7 @@
int mt7915_mtk_init_debugfs(struct mt7915_phy *phy, struct dentry *dir)
{
struct mt7915_dev *dev = phy->dev;
-@@ -2973,6 +3007,8 @@ int mt7915_mtk_init_debugfs(struct mt7915_phy *phy, struct dentry *dir)
+@@ -2973,6 +3012,8 @@ int mt7915_mtk_init_debugfs(struct mt7915_phy *phy, struct dentry *dir)
debugfs_create_devm_seqfile(dev->mt76.dev, "fw_version", dir,
mt7915_dump_version);