AX88772C_eeprom and ax8872c build together

hc

2024-05-16 8d2a02b24d66aa359e83eebc1ed3c0f85367a1cb

 kernel/drivers/net/wireless/rockchip_wlan/rtl8723cs/core/rtw_rm.c
..
..
@@ -36,20 +36,6 @@
36
36
 	return H2C_SUCCESS;
37
37
 }
38
38
 
39
-void rm_update_cap(u8 *frame_head, _adapter *pa, u32 pktlen, int offset)
40
-{
41
-#ifdef CONFIG_RTW_80211K
42
-	u8 *res;
43
-	sint len;
44
-
45
-	res = rtw_get_ie(frame_head + offset, _EID_RRM_EN_CAP_IE_, &len,
46
-			 pktlen - offset);
47
-	if (res != NULL)
48
-		_rtw_memcpy((void *)pa->rmpriv.rm_en_cap_def, (res + 2),
49
-			    MIN(len, sizeof(pa->rmpriv.rm_en_cap_def)));
50
-#endif
51
-}
52
-
53
39
 #ifdef CONFIG_RTW_80211K
54
40
 struct cmd_meas_type_ {
55
41
 	u8 id;
..
..
@@ -542,13 +528,13 @@
542
528
 			RTW_INFO("DBG set ssid to %s\n",DBG_BCN_REQ_SSID_NAME);
543
529
 			i = strlen(DBG_BCN_REQ_SSID_NAME);
544
530
 			prm->q.opt.bcn.ssid.SsidLength = i;
545
-			_rtw_memcpy(&(prm->q.opt.bcn.ssid.Ssid), DBG_BCN_REQ_SSID_NAME,
546
-				MIN(i, sizeof(prm->q.opt.bcn.ssid.Ssid)-1));
531
+			_rtw_memcpy(&(prm->q.opt.bcn.ssid.Ssid),
532
+				DBG_BCN_REQ_SSID_NAME, i);
547
533
 
548
534
 #else /* original */
549
535
 			prm->q.opt.bcn.ssid.SsidLength = pbody[p+1];
550
-			_rtw_memcpy(&(prm->q.opt.bcn.ssid.Ssid), &pbody[p+2],
551
-				MIN(pbody[p+1], sizeof(prm->q.opt.bcn.ssid.Ssid)-1));
536
+			_rtw_memcpy(&(prm->q.opt.bcn.ssid.Ssid),
537
+				&pbody[p+2], pbody[p+1]);
552
538
 #endif
553
539
 #endif
554
540
 			RTW_INFO("RM: bcn_req_ssid=%s\n",
..
..
@@ -2208,9 +2194,8 @@
2208
2194
 	if (elem->rm_en_cap) {
2209
2195
 		RTW_INFO("assoc.rm_en_cap="RM_CAP_FMT"\n",
2210
2196
 			RM_CAP_ARG(elem->rm_en_cap));
2211
-
2212
-		_rtw_memcpy(psta->rm_en_cap, (elem->rm_en_cap),
2213
-			MIN(elem->rm_en_cap_len, sizeof(psta->rm_en_cap)));
2197
+		_rtw_memcpy(psta->rm_en_cap,
2198
+			(elem->rm_en_cap), elem->rm_en_cap_len);
2214
2199
 	}
2215
2200
 }
2216
2201
 
..
..
@@ -2218,8 +2203,7 @@
2218
2203
 {
2219
2204
 	int i;
2220
2205
 
2221
-	_rtw_memcpy(&padapter->rmpriv.rm_en_cap_assoc, pIE->data,
2222
-		    MIN(pIE->Length, sizeof(padapter->rmpriv.rm_en_cap_assoc)));
2206
+	_rtw_memcpy(&padapter->rmpriv.rm_en_cap_assoc, pIE->data, pIE->Length);
2223
2207
 	RTW_INFO("assoc.rm_en_cap="RM_CAP_FMT"\n", RM_CAP_ARG(pIE->data));
2224
2208
 }
2225
2209