From 23fa18eaa71266feff7ba8d83022d9e1cc83c65a Mon Sep 17 00:00:00 2001
From: hc <hc@nodka.com>
Date: Fri, 10 May 2024 07:42:03 +0000
Subject: [PATCH] disable pwm7
---
kernel/drivers/net/wireless/rockchip_wlan/rtl8723cs/core/rtw_mlme_ext.c | 48 +-----------------------------------------------
1 files changed, 1 insertions(+), 47 deletions(-)
diff --git a/kernel/drivers/net/wireless/rockchip_wlan/rtl8723cs/core/rtw_mlme_ext.c b/kernel/drivers/net/wireless/rockchip_wlan/rtl8723cs/core/rtw_mlme_ext.c
index 100cc2a..07aab07 100644
--- a/kernel/drivers/net/wireless/rockchip_wlan/rtl8723cs/core/rtw_mlme_ext.c
+++ b/kernel/drivers/net/wireless/rockchip_wlan/rtl8723cs/core/rtw_mlme_ext.c
@@ -2781,10 +2781,6 @@
goto authclnt_fail;
}
- if (len > sizeof(pmlmeinfo->chg_txt)) {
- goto authclnt_fail;
- }
-
_rtw_memcpy((void *)(pmlmeinfo->chg_txt), (void *)(p + 2), len);
pmlmeinfo->auth_seq = 3;
issue_auth(padapter, NULL, 0);
@@ -4686,7 +4682,6 @@
/* Try to get the device password ID from the WPS IE of group negotiation request frame */
/* WiFi Direct test plan 5.1.15 */
rtw_get_wps_ie(frame_body + _PUBLIC_ACTION_IE_OFFSET_, len - _PUBLIC_ACTION_IE_OFFSET_, wpsie, &wpsielen);
- wps_devicepassword_id_len = sizeof(wps_devicepassword_id);
rtw_get_wps_attr_content(wpsie, wpsielen, WPS_ATTR_DEVICE_PWID, (u8 *) &wps_devicepassword_id, &wps_devicepassword_id_len);
wps_devicepassword_id = be16_to_cpu(wps_devicepassword_id);
@@ -6788,11 +6783,9 @@
merged_p2p_ielen = rtw_p2p_merge_ies(frame_body + _PUBLIC_ACTION_IE_OFFSET_, len - _PUBLIC_ACTION_IE_OFFSET_, merged_p2pie);
- attr_contentlen = sizeof(invitation_flag);
rtw_get_p2p_attr_content(merged_p2pie, merged_p2p_ielen, P2P_ATTR_INVITATION_FLAGS, &invitation_flag, &attr_contentlen);
if (attr_contentlen) {
- attr_contentlen = sizeof(pwdinfo->p2p_peer_interface_addr);
rtw_get_p2p_attr_content(merged_p2pie, merged_p2p_ielen, P2P_ATTR_GROUP_BSSID, pwdinfo->p2p_peer_interface_addr, &attr_contentlen);
/* Commented by Albert 20120510 */
/* Copy to the pwdinfo->p2p_peer_interface_addr. */
@@ -6811,7 +6804,6 @@
/* Re-invoke the persistent group. */
_rtw_memset(&group_id, 0x00, sizeof(struct group_id_info));
- attr_contentlen = sizeof(struct group_id_info);
rtw_get_p2p_attr_content(merged_p2pie, merged_p2p_ielen, P2P_ATTR_GROUP_ID, (u8 *) &group_id, &attr_contentlen);
if (attr_contentlen) {
if (_rtw_memcmp(group_id.go_device_addr, adapter_mac_addr(padapter), ETH_ALEN)) {
@@ -6823,7 +6815,6 @@
/* The p2p device sending this p2p invitation request wants to be the persistent GO. */
if (is_matched_in_profilelist(pwdinfo->p2p_peer_interface_addr, &pwdinfo->profileinfo[0])) {
u8 operatingch_info[5] = { 0x00 };
- attr_contentlen = sizeof(operatingch_info);
if (rtw_get_p2p_attr_content(merged_p2pie, merged_p2p_ielen, P2P_ATTR_OPERATING_CH, operatingch_info,
&attr_contentlen)) {
if (rtw_chset_search_ch(adapter_to_chset(padapter), (u32)operatingch_info[4]) >= 0) {
@@ -6867,7 +6858,6 @@
/* Received the invitation to join a P2P group. */
_rtw_memset(&group_id, 0x00, sizeof(struct group_id_info));
- attr_contentlen = sizeof(struct group_id_info);
rtw_get_p2p_attr_content(merged_p2pie, merged_p2p_ielen, P2P_ATTR_GROUP_ID, (u8 *) &group_id, &attr_contentlen);
if (attr_contentlen) {
if (_rtw_memcmp(group_id.go_device_addr, adapter_mac_addr(padapter), ETH_ALEN)) {
@@ -6912,7 +6902,6 @@
_cancel_timer_ex(&pwdinfo->restore_p2p_state_timer);
p2p_ie = rtw_get_p2p_ie(frame_body + _PUBLIC_ACTION_IE_OFFSET_, len - _PUBLIC_ACTION_IE_OFFSET_, NULL, &p2p_ielen);
if (p2p_ie) {
- attr_contentlen = sizeof(attr_content);
rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_STATUS, &attr_content, &attr_contentlen);
if (attr_contentlen == 1) {
@@ -9402,8 +9391,6 @@
#endif /* CONFIG_IOCTL_CFG80211 */
pframe = rtw_set_ie(pframe, EID_WPA2, pIE->Length, pIE->data, &(pattrib->pktlen));
- /* tmp: update rsn's spp related opt. */
- rtw_set_spp_amsdu_mode(padapter->registrypriv.amsdu_mode, pframe - (pIE->Length + 2), pIE->Length +2);
}
break;
#ifdef CONFIG_80211N_HT
@@ -10331,12 +10318,6 @@
else /* TX AMSDU disabled */
BA_para_set &= ~BIT(0);
#endif
- psta = rtw_get_stainfo(pstapriv, raddr);
- if (psta != NULL) {
- if (psta->flags & WLAN_STA_AMSDU_DISABLE)
- BA_para_set &= ~BIT(0);
- }
-
BA_para_set = cpu_to_le16(BA_para_set);
pframe = rtw_set_fixed_ie(pframe, 2, (unsigned char *)(&(BA_para_set)), &(pattrib->pktlen));
@@ -10379,11 +10360,6 @@
BA_para_set &= ~BIT(0);
else if (pregpriv->rx_ampdu_amsdu == 1) /* enabled */
BA_para_set |= BIT(0);
- }
- psta = rtw_get_stainfo(pstapriv, raddr);
- if (psta != NULL) {
- if (psta->flags & WLAN_STA_AMSDU_DISABLE)
- BA_para_set &= ~BIT(0);
}
BA_para_set = cpu_to_le16(BA_para_set);
@@ -11265,7 +11241,6 @@
u32 attr_contentlen = 0;
u8 listen_ch[5] = { 0x00 };
- attr_contentlen = sizeof(listen_ch);
rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_LISTEN_CH, listen_ch, &attr_contentlen);
bssid->Configuration.DSConfig = listen_ch[4];
} else {
@@ -11397,8 +11372,7 @@
#ifdef CONFIG_RTW_80211K
p = rtw_get_ie(bssid->IEs + ie_offset, _EID_RRM_EN_CAP_IE_, &len, bssid->IELength - ie_offset);
if (p)
- _rtw_memcpy(bssid->PhyInfo.rm_en_cap, (p + 2), MIN(*(p + 1),
- sizeof(bssid->PhyInfo.rm_en_cap)));
+ _rtw_memcpy(bssid->PhyInfo.rm_en_cap, (p + 2), *(p + 1));
/* save freerun counter */
bssid->PhyInfo.free_cnt = precv_frame->u.hdr.attrib.free_cnt;
@@ -15123,20 +15097,6 @@
return H2C_SUCCESS;
}
-static u8 amsdu_spp_enable(_adapter *pdapter, enum security_type type)
-{
- u8 ret = _FALSE;
-
- if (pdapter->registrypriv.amsdu_mode == RTW_AMSDU_MODE_SPP) {
- if ( type == _AES_ || type == _CCMP_256_
- || type == _GCMP_ || type == _GCMP_256_ )
- ret = _SUCCESS;
- }
-
- return ret;
-}
-
-
/*
SEC CAM Entry format (32 bytes)
DW0 - MAC_ADDR[15:0] | Valid[15] | MFB[14:8] | RSVD[7] | GK[6] | MIC_KEY[5] | SEC_TYPE[4:2] | KID[1:0]
@@ -15229,8 +15189,6 @@
RTW_INFO_DUMP("GTK : ", pparm->key, sizeof(pparm->key));
ctrl |= BIT(9);
}
- if (amsdu_spp_enable(padapter, pparm->algorithm) == _SUCCESS)
- ctrl |= BIT(7);
write_cam(padapter, cam_id, ctrl, addr, pparm->key);
@@ -15378,12 +15336,8 @@
RTW_INFO_DUMP("PTK : ", pparm->key, sizeof(pparm->key));
ctrl |= BIT(9);
}
- if (amsdu_spp_enable(padapter, pparm->algorithm) == _SUCCESS)
- ctrl |= BIT(7);
write_cam(padapter, cam_id, ctrl, pparm->addr, pparm->key);
- if (!(pparm->gk))
- ATOMIC_INC(&psta->keytrack); /*CVE-2020-24587*/
}
ret = H2C_SUCCESS_RSP;
--
Gitblit v1.6.2