From cde9070d9970eef1f7ec2360586c802a16230ad8 Mon Sep 17 00:00:00 2001 From: hc <hc@nodka.com> Date: Fri, 10 May 2024 07:43:50 +0000 Subject: [PATCH] rtl88x2CE_WiFi_linux driver --- kernel/drivers/net/wireless/rockchip_wlan/rtl8723cs/core/rtw_rm.c | 30 +++++++----------------------- 1 files changed, 7 insertions(+), 23 deletions(-) diff --git a/kernel/drivers/net/wireless/rockchip_wlan/rtl8723cs/core/rtw_rm.c b/kernel/drivers/net/wireless/rockchip_wlan/rtl8723cs/core/rtw_rm.c index 9517f81..38ceb2e 100644 --- a/kernel/drivers/net/wireless/rockchip_wlan/rtl8723cs/core/rtw_rm.c +++ b/kernel/drivers/net/wireless/rockchip_wlan/rtl8723cs/core/rtw_rm.c @@ -36,20 +36,6 @@ return H2C_SUCCESS; } -void rm_update_cap(u8 *frame_head, _adapter *pa, u32 pktlen, int offset) -{ -#ifdef CONFIG_RTW_80211K - u8 *res; - sint len; - - res = rtw_get_ie(frame_head + offset, _EID_RRM_EN_CAP_IE_, &len, - pktlen - offset); - if (res != NULL) - _rtw_memcpy((void *)pa->rmpriv.rm_en_cap_def, (res + 2), - MIN(len, sizeof(pa->rmpriv.rm_en_cap_def))); -#endif -} - #ifdef CONFIG_RTW_80211K struct cmd_meas_type_ { u8 id; @@ -542,13 +528,13 @@ RTW_INFO("DBG set ssid to %s\n",DBG_BCN_REQ_SSID_NAME); i = strlen(DBG_BCN_REQ_SSID_NAME); prm->q.opt.bcn.ssid.SsidLength = i; - _rtw_memcpy(&(prm->q.opt.bcn.ssid.Ssid), DBG_BCN_REQ_SSID_NAME, - MIN(i, sizeof(prm->q.opt.bcn.ssid.Ssid)-1)); + _rtw_memcpy(&(prm->q.opt.bcn.ssid.Ssid), + DBG_BCN_REQ_SSID_NAME, i); #else /* original */ prm->q.opt.bcn.ssid.SsidLength = pbody[p+1]; - _rtw_memcpy(&(prm->q.opt.bcn.ssid.Ssid), &pbody[p+2], - MIN(pbody[p+1], sizeof(prm->q.opt.bcn.ssid.Ssid)-1)); + _rtw_memcpy(&(prm->q.opt.bcn.ssid.Ssid), + &pbody[p+2], pbody[p+1]); #endif #endif RTW_INFO("RM: bcn_req_ssid=%s\n", @@ -2208,9 +2194,8 @@ if (elem->rm_en_cap) { RTW_INFO("assoc.rm_en_cap="RM_CAP_FMT"\n", RM_CAP_ARG(elem->rm_en_cap)); - - _rtw_memcpy(psta->rm_en_cap, (elem->rm_en_cap), - MIN(elem->rm_en_cap_len, sizeof(psta->rm_en_cap))); + _rtw_memcpy(psta->rm_en_cap, + (elem->rm_en_cap), elem->rm_en_cap_len); } } @@ -2218,8 +2203,7 @@ { int i; - _rtw_memcpy(&padapter->rmpriv.rm_en_cap_assoc, pIE->data, - MIN(pIE->Length, sizeof(padapter->rmpriv.rm_en_cap_assoc))); + _rtw_memcpy(&padapter->rmpriv.rm_en_cap_assoc, pIE->data, pIE->Length); RTW_INFO("assoc.rm_en_cap="RM_CAP_FMT"\n", RM_CAP_ARG(pIE->data)); } -- Gitblit v1.6.2