[][mac80211][rebase patches][fix build error]
[Description]
Fix build error
[Release-log]
N/A
Change-Id: Ie3ddf56892a7fd33e56b01b9ee00241b39c5b396
Reviewed-on: https://gerrit.mediatek.inc/c/openwrt/feeds/mtk_openwrt_feeds/+/7378384
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/0003-wifi-mt76-mt7915-disable-wfdma-tx-rx-during-SER-reco.patch b/autobuild_mac80211_release/package/kernel/mt76/patches/0003-wifi-mt76-mt7915-disable-wfdma-tx-rx-during-SER-reco.patch
index 2891bd4..47741b9 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/0003-wifi-mt76-mt7915-disable-wfdma-tx-rx-during-SER-reco.patch
+++ b/autobuild_mac80211_release/package/kernel/mt76/patches/0003-wifi-mt76-mt7915-disable-wfdma-tx-rx-during-SER-reco.patch
@@ -1,16 +1,15 @@
-From 1d1fbe6a2af03b9bbeac82d36356fe6e4b8ae453 Mon Sep 17 00:00:00 2001
+From d0242b056d4e4f22dcdec8755798e5461cf131b5 Mon Sep 17 00:00:00 2001
From: Bo Jiao <Bo.Jiao@mediatek.com>
Date: Tue, 11 Apr 2023 10:56:17 +0800
-Subject: [PATCH 3/5] wifi: mt76: mt7915: disable wfdma tx/rx during SER
- recovery.
+Subject: [PATCH] wifi: mt76: mt7915: disable wfdma tx/rx during SER recovery.
Signed-off-by: Bo Jiao <Bo.Jiao@mediatek.com>
---
dma.c | 6 ++
- mt7915/dma.c | 144 +++++++++++++++++++++++++++---------------------
+ mt7915/dma.c | 148 +++++++++++++++++++++++++++---------------------
mt7915/mac.c | 17 +++++-
mt7915/mt7915.h | 1 +
- 4 files changed, 101 insertions(+), 67 deletions(-)
+ 4 files changed, 103 insertions(+), 69 deletions(-)
diff --git a/dma.c b/dma.c
index df2ca73..c22ea64 100644
@@ -37,15 +36,15 @@
if (!t)
goto free_skb;
diff --git a/mt7915/dma.c b/mt7915/dma.c
-index 43a5456..3b8a2ab 100644
+index 43a5456..9f19609 100644
--- a/mt7915/dma.c
+++ b/mt7915/dma.c
-@@ -250,12 +250,88 @@ static void mt7915_dma_disable(struct mt7915_dev *dev, bool rst)
+@@ -250,12 +250,90 @@ static void mt7915_dma_disable(struct mt7915_dev *dev, bool rst)
}
}
-static int mt7915_dma_enable(struct mt7915_dev *dev)
-+void __mt7915_dma_enable(struct mt7915_dev *dev, bool reset, bool wed_reset)
++int __mt7915_dma_enable(struct mt7915_dev *dev, bool reset, bool wed_reset)
{
struct mt76_dev *mdev = &dev->mt76;
u32 hif1_ofs = 0;
@@ -120,6 +119,8 @@
+
+ mt7915_irq_enable(dev, irq_mask);
+ mt7915_irq_disable(dev, 0);
++
++ return 0;
+}
+
+static int mt7915_dma_enable(struct mt7915_dev *dev, bool reset)
@@ -130,7 +131,7 @@
if (dev->hif2)
hif1_ofs = MT_WFDMA0_PCIE1(0) - MT_WFDMA0(0);
-@@ -322,67 +398,7 @@ static int mt7915_dma_enable(struct mt7915_dev *dev)
+@@ -322,69 +400,7 @@ static int mt7915_dma_enable(struct mt7915_dev *dev)
mt76_poll(dev, MT_WFDMA_EXT_CSR_HIF_MISC,
MT_WFDMA_EXT_CSR_HIF_MISC_BUSY, 0, 1000);
@@ -195,10 +196,12 @@
- }
-
- mt7915_irq_enable(dev, irq_mask);
-+ __mt7915_dma_enable(dev, reset, true);
-
- return 0;
+-
+- return 0;
++ return __mt7915_dma_enable(dev, reset, true);
}
+
+ int mt7915_dma_init(struct mt7915_dev *dev, struct mt7915_phy *phy2)
@@ -560,7 +576,7 @@ int mt7915_dma_init(struct mt7915_dev *dev, struct mt7915_phy *phy2)
mt7915_poll_tx);
napi_enable(&dev->mt76.tx_napi);
@@ -274,14 +277,14 @@
return;
diff --git a/mt7915/mt7915.h b/mt7915/mt7915.h
-index b66938b..376256d 100644
+index b66938b..6c40108 100644
--- a/mt7915/mt7915.h
+++ b/mt7915/mt7915.h
@@ -481,6 +481,7 @@ int mt7915_dma_init(struct mt7915_dev *dev, struct mt7915_phy *phy2);
void mt7915_dma_prefetch(struct mt7915_dev *dev);
void mt7915_dma_cleanup(struct mt7915_dev *dev);
int mt7915_dma_reset(struct mt7915_dev *dev, bool force);
-+void __mt7915_dma_enable(struct mt7915_dev *dev, bool reset, bool wed_reset);
++int __mt7915_dma_enable(struct mt7915_dev *dev, bool reset, bool wed_reset);
int mt7915_txbf_init(struct mt7915_dev *dev);
void mt7915_init_txpower(struct mt7915_dev *dev,
struct ieee80211_supported_band *sband);
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/1014-wifi-mt76-testmode-add-iBF-eBF-cal-and-cert-commands.patch b/autobuild_mac80211_release/package/kernel/mt76/patches/1014-wifi-mt76-testmode-add-iBF-eBF-cal-and-cert-commands.patch
index 26e535e..8661564 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/1014-wifi-mt76-testmode-add-iBF-eBF-cal-and-cert-commands.patch
+++ b/autobuild_mac80211_release/package/kernel/mt76/patches/1014-wifi-mt76-testmode-add-iBF-eBF-cal-and-cert-commands.patch
@@ -1,8 +1,8 @@
-From d0e371da84f403f2f983140f7f91765dfc191728 Mon Sep 17 00:00:00 2001
+From 0a6fa26a5c4c9f63a044cd098edf5ed4d36229f6 Mon Sep 17 00:00:00 2001
From: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
Date: Thu, 15 Dec 2022 19:45:18 +0800
-Subject: [PATCH 1014/1032] wifi: mt76: testmode: add iBF/eBF cal and cert
- commands with golden
+Subject: [PATCH] wifi: mt76: testmode: add iBF/eBF cal and cert commands with
+ golden
Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
---
@@ -468,7 +468,7 @@
[AGG_AALCR0] = 0x028,
[AGG_AWSCR0] = 0x030,
diff --git a/mt7915/mt7915.h b/mt7915/mt7915.h
-index 003ad3c..2e101a0 100644
+index 63cabe8..1a253a4 100644
--- a/mt7915/mt7915.h
+++ b/mt7915/mt7915.h
@@ -330,7 +330,6 @@ struct mt7915_phy {
@@ -490,7 +490,7 @@
void *txbf_pfmu_data;
@@ -574,6 +573,7 @@ void mt7915_dma_cleanup(struct mt7915_dev *dev);
int mt7915_dma_reset(struct mt7915_dev *dev, bool force);
- void __mt7915_dma_enable(struct mt7915_dev *dev, bool reset, bool wed_reset);
+ int __mt7915_dma_enable(struct mt7915_dev *dev, bool reset, bool wed_reset);
int mt7915_txbf_init(struct mt7915_dev *dev);
+int mt7915_init_vif(struct mt7915_phy *phy, struct ieee80211_vif *vif, bool bf_en);
void mt7915_init_txpower(struct mt7915_dev *dev,