[][MAC80211][misc][Fix mt7986 mac80211 git01 build fail]
[Description]
Fix external build fail. Sync build script
Rework mt76 patches for 'git am'
[Release-log]
N/A
Change-Id: I5a67cefd3054183922fb3f5043b4385f1155b01b
Reviewed-on: https://gerrit.mediatek.inc/c/openwrt/feeds/mtk_openwrt_feeds/+/6937805
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/1123-mt76-mt7915-implement-bin-file-mode.patch b/autobuild_mac80211_release/package/kernel/mt76/patches/1123-mt76-mt7915-implement-bin-file-mode.patch
index 31dd52c..c45c696 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/1123-mt76-mt7915-implement-bin-file-mode.patch
+++ b/autobuild_mac80211_release/package/kernel/mt76/patches/1123-mt76-mt7915-implement-bin-file-mode.patch
@@ -1,4 +1,4 @@
-From 7433c3168e62610de221d377490c4e0e0a267d40 Mon Sep 17 00:00:00 2001
+From e1076c547c69fa1424341b87c1e14abed29cab07 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 1123/1131] mt76: mt7915: implement bin file mode
@@ -15,7 +15,7 @@
6 files changed, 110 insertions(+), 6 deletions(-)
diff --git a/eeprom.c b/eeprom.c
-index cb6ff17a..05b6dfaa 100644
+index cb6ff17..05b6dfa 100644
--- a/eeprom.c
+++ b/eeprom.c
@@ -104,6 +104,26 @@ out_put_node:
@@ -46,7 +46,7 @@
mt76_eeprom_override(struct mt76_phy *phy)
{
diff --git a/mt76.h b/mt76.h
-index c6aefbf0..9b6e8064 100644
+index c6aefbf..9b6e806 100644
--- a/mt76.h
+++ b/mt76.h
@@ -894,9 +894,11 @@ struct mt76_dev {
@@ -70,7 +70,7 @@
struct mt76_queue *
mt76_init_queue(struct mt76_dev *dev, int qid, int idx, int n_desc,
diff --git a/mt7915/eeprom.c b/mt7915/eeprom.c
-index 55ba90ac..54803e8e 100644
+index 55ba90a..54803e8 100644
--- a/mt7915/eeprom.c
+++ b/mt7915/eeprom.c
@@ -45,8 +45,11 @@ static int mt7915_check_eeprom(struct mt7915_dev *dev)
@@ -151,7 +151,7 @@
if (ret)
return ret;
diff --git a/mt7915/eeprom.h b/mt7915/eeprom.h
-index fdae347e..9056d786 100644
+index fdae347..9056d78 100644
--- a/mt7915/eeprom.h
+++ b/mt7915/eeprom.h
@@ -108,6 +108,13 @@ enum mt7915_sku_rate_group {
@@ -169,7 +169,7 @@
mt7915_get_channel_group_5g(int channel, bool is_7976)
{
diff --git a/mt7915/mt7915.h b/mt7915/mt7915.h
-index 4c370bbd..e5cfc775 100644
+index 4c370bb..e5cfc77 100644
--- a/mt7915/mt7915.h
+++ b/mt7915/mt7915.h
@@ -42,9 +42,9 @@
@@ -203,7 +203,7 @@
#define PKT_BIN_DEBUG_MAGIC 0xc8763123
enum {
diff --git a/mt7915/mtk_debugfs.c b/mt7915/mtk_debugfs.c
-index a2ceb6f9..7567666c 100644
+index a2ceb6f..7567666 100644
--- a/mt7915/mtk_debugfs.c
+++ b/mt7915/mtk_debugfs.c
@@ -3,6 +3,7 @@
@@ -269,5 +269,5 @@
}
#endif
--
-2.25.1
+2.36.1