[][MAC80211][build][Fix patch fail]
[Description]
Fix patch fail
Add symbolic link of mt76-vendor for unified sigma support.
Remove unnecessary compiler flag in MT76 makefile
[Release-log]
N/A
Change-Id: Ia4e297c0648a77c4e500d926fb617cba6a1a85fb
Reviewed-on: https://gerrit.mediatek.inc/c/openwrt/feeds/mtk_openwrt_feeds/+/6140808
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/1006-mt76-mt7915-add-L0.5-system-error-recovery-support.patch b/autobuild_mac80211_release/package/kernel/mt76/patches/1006-mt76-mt7915-add-L0.5-system-error-recovery-support.patch
index 59af5bb..45c4f47 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/1006-mt76-mt7915-add-L0.5-system-error-recovery-support.patch
+++ b/autobuild_mac80211_release/package/kernel/mt76/patches/1006-mt76-mt7915-add-L0.5-system-error-recovery-support.patch
@@ -1,24 +1,24 @@
-From c27f0452975f76f67a53a67cf808ba49f8e3c51b Mon Sep 17 00:00:00 2001
+From e67f8f36aeefd28730ea21dc82b946c7fba4dc09 Mon Sep 17 00:00:00 2001
From: Bo Jiao <Bo.Jiao@mediatek.com>
Date: Wed, 22 Jun 2022 10:51:59 +0800
Subject: [PATCH 1006/1008] mt76: mt7915: add L0.5 system error recovery
support
---
- .../wireless/mediatek/mt76/mt7915/debugfs.c | 88 ++++--
- .../net/wireless/mediatek/mt76/mt7915/dma.c | 48 +++
- .../net/wireless/mediatek/mt76/mt7915/init.c | 8 +-
- .../net/wireless/mediatek/mt76/mt7915/mac.c | 284 ++++++++++++++----
- .../net/wireless/mediatek/mt76/mt7915/main.c | 19 +-
- .../net/wireless/mediatek/mt76/mt7915/mcu.c | 95 +++++-
- .../net/wireless/mediatek/mt76/mt7915/mcu.h | 3 +-
- .../net/wireless/mediatek/mt76/mt7915/mmio.c | 8 +-
- .../wireless/mediatek/mt76/mt7915/mt7915.h | 23 ++
- .../net/wireless/mediatek/mt76/mt7915/regs.h | 16 +
+ mt7915/debugfs.c | 88 ++++++++++++---
+ mt7915/dma.c | 48 ++++++++
+ mt7915/init.c | 8 +-
+ mt7915/mac.c | 284 +++++++++++++++++++++++++++++++++++++----------
+ mt7915/main.c | 19 +++-
+ mt7915/mcu.c | 95 ++++++++++++++--
+ mt7915/mcu.h | 3 +-
+ mt7915/mmio.c | 8 +-
+ mt7915/mt7915.h | 23 ++++
+ mt7915/regs.h | 16 +++
10 files changed, 493 insertions(+), 99 deletions(-)
diff --git a/mt7915/debugfs.c b/mt7915/debugfs.c
-index 0cfb6068..07de2eef 100644
+index 0cfb606..07de2ee 100644
--- a/mt7915/debugfs.c
+++ b/mt7915/debugfs.c
@@ -52,12 +52,17 @@ static ssize_t
@@ -142,7 +142,7 @@
kfree(buff);
return ret;
diff --git a/mt7915/dma.c b/mt7915/dma.c
-index c2d655cd..9e3d14db 100644
+index c2d655c..9e3d14d 100644
--- a/mt7915/dma.c
+++ b/mt7915/dma.c
@@ -486,6 +486,54 @@ int mt7915_dma_init(struct mt7915_dev *dev, struct mt7915_phy *phy2)
@@ -201,7 +201,7 @@
{
mt7915_dma_disable(dev, true);
diff --git a/mt7915/init.c b/mt7915/init.c
-index 02d1b6d8..0d5109a3 100644
+index 02d1b6d..0d5109a 100644
--- a/mt7915/init.c
+++ b/mt7915/init.c
@@ -262,7 +262,7 @@ static void mt7915_led_set_brightness(struct led_classdev *led_cdev,
@@ -241,7 +241,7 @@
unreg_thermal:
diff --git a/mt7915/mac.c b/mt7915/mac.c
-index 9058c750..05932707 100644
+index 9058c75..0593270 100644
--- a/mt7915/mac.c
+++ b/mt7915/mac.c
@@ -3,6 +3,7 @@
@@ -583,7 +583,7 @@
{
struct mt7915_dev *dev = phy->dev;
diff --git a/mt7915/main.c b/mt7915/main.c
-index 90543596..42a0ece7 100644
+index c2304db..dc5e4b0 100644
--- a/mt7915/main.c
+++ b/mt7915/main.c
@@ -20,17 +20,13 @@ static bool mt7915_dev_running(struct mt7915_dev *dev)
@@ -605,7 +605,7 @@
running = mt7915_dev_running(dev);
if (!running) {
-@@ -80,6 +76,18 @@ static int mt7915_start(struct ieee80211_hw *hw)
+@@ -84,6 +80,18 @@ static int mt7915_start(struct ieee80211_hw *hw)
mt7915_mac_reset_counters(phy);
out:
@@ -624,7 +624,7 @@
mutex_unlock(&dev->mt76.mutex);
return ret;
-@@ -91,6 +99,7 @@ static void mt7915_stop(struct ieee80211_hw *hw)
+@@ -95,6 +103,7 @@ static void mt7915_stop(struct ieee80211_hw *hw)
struct mt7915_phy *phy = mt7915_hw_phy(hw);
cancel_delayed_work_sync(&phy->mt76->mac_work);
@@ -633,7 +633,7 @@
mutex_lock(&dev->mt76.mutex);
diff --git a/mt7915/mcu.c b/mt7915/mcu.c
-index 6ae4d159..34409759 100644
+index 759d615..65d21ee 100644
--- a/mt7915/mcu.c
+++ b/mt7915/mcu.c
@@ -150,19 +150,90 @@ mt7915_mcu_set_sta_ht_mcs(struct ieee80211_sta *sta, u8 *ht_mcs,
@@ -769,7 +769,7 @@
{
__mt76_mcu_restart(&dev->mt76);
diff --git a/mt7915/mcu.h b/mt7915/mcu.h
-index 7418f78c..4c5482b2 100644
+index 7b1a521..464e771 100644
--- a/mt7915/mcu.h
+++ b/mt7915/mcu.h
@@ -452,8 +452,9 @@ enum {
@@ -784,7 +784,7 @@
SER_SET_RECOVER_L3_RX_ABORT,
SER_SET_RECOVER_L3_TX_ABORT,
diff --git a/mt7915/mmio.c b/mt7915/mmio.c
-index a8e3810e..bccb1084 100644
+index a8e3810..bccb108 100644
--- a/mt7915/mmio.c
+++ b/mt7915/mmio.c
@@ -24,6 +24,7 @@ static const u32 mt7915_reg[] = {
@@ -825,7 +825,7 @@
}
}
diff --git a/mt7915/mt7915.h b/mt7915/mt7915.h
-index 6c6c2424..20aeca77 100644
+index 11e92fe..9f5da64 100644
--- a/mt7915/mt7915.h
+++ b/mt7915/mt7915.h
@@ -352,6 +352,15 @@ struct mt7915_dev {
@@ -844,7 +844,7 @@
struct list_head sta_rc_list;
struct list_head sta_poll_list;
-@@ -415,6 +424,12 @@ enum {
+@@ -416,6 +425,12 @@ enum {
__MT_WFDMA_MAX,
};
@@ -857,7 +857,7 @@
enum {
MT_RX_SEL0,
MT_RX_SEL1,
-@@ -512,6 +527,14 @@ s8 mt7915_eeprom_get_power_delta(struct mt7915_dev *dev, int band);
+@@ -513,6 +528,14 @@ s8 mt7915_eeprom_get_power_delta(struct mt7915_dev *dev, int band);
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);
@@ -873,7 +873,7 @@
int mt7915_mcu_twt_agrt_update(struct mt7915_dev *dev,
struct mt7915_vif *mvif,
diff --git a/mt7915/regs.h b/mt7915/regs.h
-index c7c9e411..47bae86e 100644
+index c7c9e41..47bae86 100644
--- a/mt7915/regs.h
+++ b/mt7915/regs.h
@@ -32,6 +32,7 @@ enum reg_rev {
@@ -928,5 +928,5 @@
#define MT_LED_TOP_BASE 0x18013000
#define MT_LED_PHYS(_n) (MT_LED_TOP_BASE + (_n))
--
-2.25.1
+2.18.0