sync upstream

2026-05-24 03:03:48 +00:00 · 2023-02-21 22:36:56 +01:00
parent 4e98a68d1c
commit a7bad08621
3 changed files with 30 additions and 23 deletions
--- a/drivers/net/wireless/realtek/rtl8812au/core/mesh/rtw_mesh.c
+++ b/drivers/net/wireless/realtek/rtl8812au/core/mesh/rtw_mesh.c
@@ -206,7 +206,7 @@ int rtw_bss_is_candidate_mesh_peer(_adapter *adapter, WLAN_BSSID_EX *target, u8
 	/* BSSBasicRateSet */
 	for (i = 0; i < NDIS_802_11_LENGTH_RATES_EX; i++) {
 		if (target->SupportedRates[i] == 0)
-			break;	
+			break;
 		if (target->SupportedRates[i] & 0x80) {
 			u8 match = 0;

@@ -216,7 +216,7 @@ int rtw_bss_is_candidate_mesh_peer(_adapter *adapter, WLAN_BSSID_EX *target, u8
 					match = rtw_is_basic_rate_ofdm(target->SupportedRates[i]);
 				else
 					match = rtw_is_basic_rate_mix(target->SupportedRates[i]);
-			} else { 
+			} else {
 				for (j = 0; j < NDIS_802_11_LENGTH_RATES_EX; j++) {
 					if (self->SupportedRates[j] == 0)
 						break;
@@ -832,7 +832,7 @@ void rtw_mesh_peer_status_chk(_adapter *adapter)
 					if (rtw_mesh_cto_mgate_required(adapter)) {
 						flush = 1;
 						goto flush_add;
-					}	
+					}
 				}
 			} else {
 				SET_CTO_MGATE_CONF_DISABLED(plink);
@@ -993,7 +993,7 @@ exit:
 }

 /*
- * this function is called under off channel candidate is required 
+ * this function is called under off channel candidate is required
 * the channel with maximum candidate count is selected
 */
 u8 rtw_mesh_select_operating_ch(_adapter *adapter)
@@ -1295,7 +1295,7 @@ void rtw_mesh_sae_check_frames(_adapter *adapter, const u8 *buf, u32 len, u8 tx,
 #ifdef CONFIG_RTW_MESH_AEK
 static int rtw_mpm_ampe_dec(_adapter *adapter, struct mesh_plink_ent *plink
 	, u8 *fhead, size_t flen, u8* fbody, u8 *mic_ie, u8 *ampe_buf)
-{	
+{
 	int ret = _FAIL, verify_ret;
 	const u8 *aad[] = {adapter_mac_addr(adapter), plink->addr, fbody};
 	const size_t aad_len[] = {ETH_ALEN, ETH_ALEN, mic_ie - fbody};
@@ -1421,7 +1421,7 @@ static int rtw_mpm_tx_ies_sync_bss(_adapter *adapter, struct mesh_plink_ent *pli
 	pos = BSS_EX_TLV_IES(network);
 	while (left >= 2) {
 		u8 id, elen;
-	
+
 		id = *pos++;
 		elen = *pos++;
 		left -= 2;
@@ -1463,7 +1463,7 @@ static int rtw_mpm_tx_ies_sync_bss(_adapter *adapter, struct mesh_plink_ent *pli
 	pos = BSS_EX_TLV_IES(network);
 	while (left >= 2) {
 		u8 id, elen;
-	
+
 		id = *pos++;
 		elen = *pos++;
 		left -= 2;
@@ -1767,7 +1767,7 @@ bypass_sync_bss:
 						#ifdef CONFIG_RTW_TOKEN_BASED_XMIT
 						if (sac->tbtx_enable)
 							stapriv->tbtx_asoc_list_cnt--;
-						#endif			
+						#endif
 						STA_SET_MESH_PLINK(sac, NULL);
 					}
 					_exit_critical_bh(&stapriv->asoc_list_lock, &irqL);
@@ -1837,7 +1837,7 @@ bypass_sync_bss:
 				plink->rx_conf_ies = ies;
 				plink->rx_conf_ies_len = ies_len;
 			}
-			#ifdef CONFIG_RTW_MESH_DRIVER_AID	
+			#ifdef CONFIG_RTW_MESH_DRIVER_AID
 			else {
 				plink->tx_conf_ies = ies;
 				plink->tx_conf_ies_len = ies_len;
@@ -3367,11 +3367,11 @@ void rtw_mesh_init_mesh_info(_adapter *adapter)
 	_rtw_memset(minfo, 0, sizeof(struct rtw_mesh_info));

 	rtw_mesh_plink_ctl_init(adapter);
-	
+
 	minfo->last_preq = rtw_get_current_time();
 	/* minfo->last_sn_update = rtw_get_current_time(); */
 	minfo->next_perr = rtw_get_current_time();
-	
+
 	ATOMIC_SET(&minfo->mpaths, 0);
 	rtw_mesh_pathtbl_init(adapter);

@@ -3384,7 +3384,7 @@ void rtw_mesh_init_mesh_info(_adapter *adapter)

 	_rtw_init_listhead(&minfo->preq_queue.list);
 	_rtw_spinlock_init(&minfo->mesh_preq_queue_lock);
-	
+
 	rtw_init_timer(&adapter->mesh_path_timer, adapter, rtw_ieee80211_mesh_path_timer, adapter);
 	rtw_init_timer(&adapter->mesh_path_root_timer, adapter, rtw_ieee80211_mesh_path_root_timer, adapter);
 	rtw_init_timer(&adapter->mesh_atlm_param_req_timer, adapter, rtw_mesh_atlm_param_req_timer, adapter);
@@ -3568,7 +3568,7 @@ static bool rtw_mesh_data_bmc_to_uc(_adapter *adapter

 		sta = LIST_CONTAINOR(list, struct sta_info, asoc_list);
 		list = get_next(list);
-	
+
 		stainfo_offset = rtw_stainfo_offset(stapriv, sta);
 		if (stainfo_offset_valid(stainfo_offset))
 			b2u_sta_id[b2u_sta_num++] = stainfo_offset;
@@ -3650,7 +3650,7 @@ int rtw_mesh_addr_resolve(_adapter *adapter, u16 os_qid, struct xmit_frame *xfra
 		res = _FAIL;
 		goto exit;
 	}
-	
+
 	xframe->pkt = pkt;
 #if CONFIG_RTW_MESH_DATA_BMC_TO_UC
 	_rtw_init_listhead(b2u_list);
@@ -3658,9 +3658,9 @@ int rtw_mesh_addr_resolve(_adapter *adapter, u16 os_qid, struct xmit_frame *xfra

 	is_da_mcast = IS_MCAST(etherhdr.h_dest);
 	if (!is_da_mcast) {
-		struct sta_info *next_hop; 
+		struct sta_info *next_hop;
 		bool mpp_lookup = 1;
-	
+
 		mpath = rtw_mesh_path_lookup(adapter, etherhdr.h_dest);
 		if (mpath) {
 			mpp_lookup = 0;
@@ -3760,7 +3760,7 @@ s8 rtw_mesh_tx_set_whdr_mctrl_len(u8 mesh_frame_mode, struct pkt_attrib *attrib)
 		RTW_WARN("Invalid mesh frame mode:%u\n", mesh_frame_mode);
 		ret = -1;
 		break;
-	}				
+	}

 	return ret;
 }
@@ -3846,7 +3846,7 @@ u8 rtw_mesh_tx_build_whdr(_adapter *adapter, struct pkt_attrib *attrib
 		RTW_WARN("Invalid mesh frame mode\n");
 		break;
 	}
-	
+
 	return 0;
 }

@@ -3989,7 +3989,7 @@ int rtw_mesh_rx_data_validate_mctrl(_adapter *adapter, union recv_frame *rframe
 	} else
 		*mctrl_len = mlen;

-	return ret;	
+	return ret;
 }

 inline int rtw_mesh_rx_validate_mctrl_non_amsdu(_adapter *adapter, union recv_frame *rframe)
@@ -4075,7 +4075,7 @@ int rtw_mesh_rx_msdu_act_check(union recv_frame *rframe
 	struct rtw_mesh_info *minfo = &adapter->mesh_info;
 	struct rx_pkt_attrib *rattrib = &rframe->u.hdr.attrib;
 	struct rtw_mesh_path *mppath;
-	u8 is_mda_bmc = IS_MCAST(mda); 
+	u8 is_mda_bmc = IS_MCAST(mda);
 	u8 is_mda_self = !is_mda_bmc && _rtw_memcmp(mda, adapter_mac_addr(adapter), ETH_ALEN);
 	u16 os_qid;
 	struct xmit_frame *xframe;
--- a/drivers/net/wireless/realtek/rtl8821cu/Makefile
+++ b/drivers/net/wireless/realtek/rtl8821cu/Makefile
@@ -18,6 +18,7 @@ EXTRA_CFLAGS += -Wno-unused-function
 EXTRA_CFLAGS += -Wno-misleading-indentation
 EXTRA_CFLAGS += -Wno-implicit-fallthrough
 #EXTRA_CFLAGS += -Wno-return-type
+#EXTRA_CFLAGS += -Wno-discarded-qualifiers

 # Activates Concurrent Mode if uncommented
 #EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE
@@ -89,11 +90,10 @@ CONFIG_RTW_CHPLAN = 0xFF
 CONFIG_RTW_ADAPTIVITY_EN = disable
 CONFIG_RTW_ADAPTIVITY_MODE = normal
 CONFIG_SIGNAL_SCALE_MAPPING = n
-# necessary for WPA3 support
 CONFIG_80211W = y
 CONFIG_REDUCE_TX_CPU_LOADING = n
 CONFIG_BR_EXT = y
-CONFIG_TDLS = y
+CONFIG_TDLS = n
 CONFIG_WIFI_MONITOR = y
 CONFIG_MCC_MODE = n
 CONFIG_APPEND_VENDOR_IE_ENABLE = n
@@ -2511,6 +2511,13 @@ uninstall:
 	rm -f $(MODDESTDIR)$(MODULE_NAME).ko
 	/sbin/depmod -a ${KVER}

+sign:
+	@openssl req -new -x509 -newkey rsa:2048 -keyout MOK.priv -outform DER -out MOK.der -nodes -days 36500 -subj "/CN=Custom MOK/"
+	@mokutil --import MOK.der
+	@$(KSRC)/scripts/sign-file sha256 MOK.priv MOK.der 8821cu.ko
+
+sign-install: all sign install
+
 backup_rtlwifi:
 	@echo "Making backup rtlwifi drivers"
 ifneq (,$(wildcard $(STAGINGMODDIR)/rtl*))
--- a/drivers/net/wireless/realtek/rtl8821cu/hal/hal_dm_acs.c
+++ b/drivers/net/wireless/realtek/rtl8821cu/hal/hal_dm_acs.c
@@ -289,12 +289,12 @@ void rtw_acs_info_dump(void *sel, _adapter *adapter)
 	u8 max_chan_nums = rfctl->max_chan_nums;
 	u8 ch_idx, ch_num;

+	#ifdef CONFIG_RTW_ACS_DBG
 	_RTW_PRINT_SEL(sel, "========== ACS (VER-%d) ==========\n", RTK_ACS_VERSION);
 	_RTW_PRINT_SEL(sel, "Best 24G Channel:%d\n", hal_data->acs.best_chan_24g);
 	_RTW_PRINT_SEL(sel, "Best 5G Channel:%d\n", hal_data->acs.best_chan_5g);
 	_RTW_PRINT_SEL(sel, "==================================\n");

-	#ifdef CONFIG_RTW_ACS_DBG
 	_RTW_PRINT_SEL(sel, "Advanced setting - scan_type:%c, ch_ms:%d(ms), igi:0x%02x, bw:%d\n",
 		hal_data->acs.scan_type ? 'A' : 'P', hal_data->acs.scan_time, hal_data->acs.igi, hal_data->acs.bw);