mirror of
				git://git.openwrt.org/openwrt/openwrt.git
				synced 2025-11-04 06:54:27 -05:00 
			
		
		
		
	mac80211: add missing patch chunk for mac80211_hwsim
Fixes build error Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
		
							parent
							
								
									192c41001a
								
							
						
					
					
						commit
						a889dcd3f2
					
				@ -73,3 +73,41 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
 | 
			
		||||
 
 | 
			
		||||
 	PRINT("MULTI-TID-AGG-TX-QOS-%d", ((cap[5] << 1) | (cap[4] >> 7)) & 0x7);
 | 
			
		||||
 
 | 
			
		||||
--- a/drivers/net/wireless/mac80211_hwsim.c
 | 
			
		||||
+++ b/drivers/net/wireless/mac80211_hwsim.c
 | 
			
		||||
@@ -2818,7 +2818,7 @@ static const struct ieee80211_sband_ifty
 | 
			
		||||
 				.mac_cap_info[3] =
 | 
			
		||||
 					IEEE80211_HE_MAC_CAP3_OMI_CONTROL |
 | 
			
		||||
 					IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_VHT_2,
 | 
			
		||||
-				.mac_cap_info[4] = IEEE80211_HE_MAC_CAP4_AMDSU_IN_AMPDU,
 | 
			
		||||
+				.mac_cap_info[4] = IEEE80211_HE_MAC_CAP4_AMSDU_IN_AMPDU,
 | 
			
		||||
 				.phy_cap_info[1] =
 | 
			
		||||
 					IEEE80211_HE_PHY_CAP1_PREAMBLE_PUNC_RX_MASK |
 | 
			
		||||
 					IEEE80211_HE_PHY_CAP1_DEVICE_CLASS_A |
 | 
			
		||||
@@ -2862,7 +2862,7 @@ static const struct ieee80211_sband_ifty
 | 
			
		||||
 				.mac_cap_info[3] =
 | 
			
		||||
 					IEEE80211_HE_MAC_CAP3_OMI_CONTROL |
 | 
			
		||||
 					IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_VHT_2,
 | 
			
		||||
-				.mac_cap_info[4] = IEEE80211_HE_MAC_CAP4_AMDSU_IN_AMPDU,
 | 
			
		||||
+				.mac_cap_info[4] = IEEE80211_HE_MAC_CAP4_AMSDU_IN_AMPDU,
 | 
			
		||||
 				.phy_cap_info[1] =
 | 
			
		||||
 					IEEE80211_HE_PHY_CAP1_PREAMBLE_PUNC_RX_MASK |
 | 
			
		||||
 					IEEE80211_HE_PHY_CAP1_DEVICE_CLASS_A |
 | 
			
		||||
@@ -2908,7 +2908,7 @@ static const struct ieee80211_sband_ifty
 | 
			
		||||
 				.mac_cap_info[3] =
 | 
			
		||||
 					IEEE80211_HE_MAC_CAP3_OMI_CONTROL |
 | 
			
		||||
 					IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_VHT_2,
 | 
			
		||||
-				.mac_cap_info[4] = IEEE80211_HE_MAC_CAP4_AMDSU_IN_AMPDU,
 | 
			
		||||
+				.mac_cap_info[4] = IEEE80211_HE_MAC_CAP4_AMSDU_IN_AMPDU,
 | 
			
		||||
 				.phy_cap_info[0] =
 | 
			
		||||
 					IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_80MHZ_IN_5G |
 | 
			
		||||
 					IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G |
 | 
			
		||||
@@ -2956,7 +2956,7 @@ static const struct ieee80211_sband_ifty
 | 
			
		||||
 				.mac_cap_info[3] =
 | 
			
		||||
 					IEEE80211_HE_MAC_CAP3_OMI_CONTROL |
 | 
			
		||||
 					IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_VHT_2,
 | 
			
		||||
-				.mac_cap_info[4] = IEEE80211_HE_MAC_CAP4_AMDSU_IN_AMPDU,
 | 
			
		||||
+				.mac_cap_info[4] = IEEE80211_HE_MAC_CAP4_AMSDU_IN_AMPDU,
 | 
			
		||||
 				.phy_cap_info[0] =
 | 
			
		||||
 					IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_80MHZ_IN_5G |
 | 
			
		||||
 					IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G |
 | 
			
		||||
 | 
			
		||||
@ -53,7 +53,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
 | 
			
		||||
 					IEEE80211_HE_MAC_CAP3_OMI_CONTROL |
 | 
			
		||||
-					IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_VHT_2,
 | 
			
		||||
+					IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_EXT_3,
 | 
			
		||||
 				.mac_cap_info[4] = IEEE80211_HE_MAC_CAP4_AMDSU_IN_AMPDU,
 | 
			
		||||
 				.mac_cap_info[4] = IEEE80211_HE_MAC_CAP4_AMSDU_IN_AMPDU,
 | 
			
		||||
 				.phy_cap_info[1] =
 | 
			
		||||
 					IEEE80211_HE_PHY_CAP1_PREAMBLE_PUNC_RX_MASK |
 | 
			
		||||
@@ -2861,7 +2861,7 @@ static const struct ieee80211_sband_ifty
 | 
			
		||||
@ -62,7 +62,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
 | 
			
		||||
 					IEEE80211_HE_MAC_CAP3_OMI_CONTROL |
 | 
			
		||||
-					IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_VHT_2,
 | 
			
		||||
+					IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_EXT_3,
 | 
			
		||||
 				.mac_cap_info[4] = IEEE80211_HE_MAC_CAP4_AMDSU_IN_AMPDU,
 | 
			
		||||
 				.mac_cap_info[4] = IEEE80211_HE_MAC_CAP4_AMSDU_IN_AMPDU,
 | 
			
		||||
 				.phy_cap_info[1] =
 | 
			
		||||
 					IEEE80211_HE_PHY_CAP1_PREAMBLE_PUNC_RX_MASK |
 | 
			
		||||
@@ -2907,7 +2907,7 @@ static const struct ieee80211_sband_ifty
 | 
			
		||||
@ -71,7 +71,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
 | 
			
		||||
 					IEEE80211_HE_MAC_CAP3_OMI_CONTROL |
 | 
			
		||||
-					IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_VHT_2,
 | 
			
		||||
+					IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_EXT_3,
 | 
			
		||||
 				.mac_cap_info[4] = IEEE80211_HE_MAC_CAP4_AMDSU_IN_AMPDU,
 | 
			
		||||
 				.mac_cap_info[4] = IEEE80211_HE_MAC_CAP4_AMSDU_IN_AMPDU,
 | 
			
		||||
 				.phy_cap_info[0] =
 | 
			
		||||
 					IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_80MHZ_IN_5G |
 | 
			
		||||
@@ -2955,7 +2955,7 @@ static const struct ieee80211_sband_ifty
 | 
			
		||||
@ -80,7 +80,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
 | 
			
		||||
 					IEEE80211_HE_MAC_CAP3_OMI_CONTROL |
 | 
			
		||||
-					IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_VHT_2,
 | 
			
		||||
+					IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_EXT_3,
 | 
			
		||||
 				.mac_cap_info[4] = IEEE80211_HE_MAC_CAP4_AMDSU_IN_AMPDU,
 | 
			
		||||
 				.mac_cap_info[4] = IEEE80211_HE_MAC_CAP4_AMSDU_IN_AMPDU,
 | 
			
		||||
 				.phy_cap_info[0] =
 | 
			
		||||
 					IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_80MHZ_IN_5G |
 | 
			
		||||
--- a/drivers/net/wireless/mediatek/mt76/mt7915/init.c
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user