[][mac80211][Rebase Patches][mt76 build fail]

[Description]
Fix MT76 WiFi-6 Build Fail
mt76-2023-07-14-bb3937d5

[Release-log]
N/A

Change-Id: I59e57443a08f7c37913ccf696f34d6454e3298db
Reviewed-on: https://gerrit.mediatek.inc/c/openwrt/feeds/mtk_openwrt_feeds/+/7754734
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/0006-wifi-mt76-mt7915-update-mpdu-density-in-2-5g-capabil.patch b/autobuild_mac80211_release/package/kernel/mt76/patches/0006-wifi-mt76-mt7915-update-mpdu-density-in-2-5g-capabil.patch
index fe833e5..5af4002 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/0006-wifi-mt76-mt7915-update-mpdu-density-in-2-5g-capabil.patch
+++ b/autobuild_mac80211_release/package/kernel/mt76/patches/0006-wifi-mt76-mt7915-update-mpdu-density-in-2-5g-capabil.patch
@@ -1,8 +1,7 @@
-From 50f77fea3f310a623f0fc3656f1a28a7e769c598 Mon Sep 17 00:00:00 2001
+From 676c2c7677ee75ee7a041711cc00f0360071f371 Mon Sep 17 00:00:00 2001
 From: Peter Chiu <chui-hao.chiu@mediatek.com>
 Date: Wed, 24 May 2023 10:17:38 +0800
-Subject: [PATCH 6/7] wifi: mt76: mt7915: update mpdu density in 2/5g
- capability
+Subject: [PATCH] wifi: mt76: mt7915: update mpdu density in 2/5g capability
 
 Set mpdu density to 2 usec to meet hardware capability
 and also update enhance throughput.
@@ -13,7 +12,7 @@
  1 file changed, 12 insertions(+), 4 deletions(-)
 
 diff --git a/mt7915/init.c b/mt7915/init.c
-index a47a980..75f8d96 100644
+index 5baa571..2eec451 100644
 --- a/mt7915/init.c
 +++ b/mt7915/init.c
 @@ -398,8 +398,12 @@ mt7915_init_wiphy(struct mt7915_phy *phy)
@@ -45,8 +44,8 @@
  			vht_cap->cap |=
  				IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_7991 |
  				IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK;
-@@ -423,6 +428,9 @@ mt7915_init_wiphy(struct mt7915_phy *phy)
- 					IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160MHZ |
+@@ -422,6 +427,9 @@ mt7915_init_wiphy(struct mt7915_phy *phy)
+ 					IEEE80211_VHT_CAP_SHORT_GI_160 |
  					FIELD_PREP(IEEE80211_VHT_CAP_EXT_NSS_BW_MASK, 1);
  		} else {
 +			phy->mt76->sband_5g.sband.ht_cap.ampdu_density =