移去rt

hc

2023-12-08 01573e231f18eb2d99162747186f59511f56b64d

 kernel/drivers/net/wireless/rockchip_wlan/rtl8723cs/core/rtw_swcrypto.c
..
..
@@ -27,21 +27,20 @@
27
27
  * @frame: the frame including the mac header, pn and payload
28
28
  * @plen: payload length, i.e., length of the plain text, without PN and MIC
29
29
  */
30
-int _rtw_ccmp_encrypt(_adapter *padapter, u8 *key, u32 key_len, uint hdrlen, u8 *frame, uint plen)
31
-
30
+int _rtw_ccmp_encrypt(u8 *key, u32 key_len, uint hdrlen, u8 *frame, uint plen)
32
31
 {
33
32
 	u8 *enc = NULL;
34
33
 	size_t enc_len = 0;
35
34
 
36
35
 	if (key_len == 16) { /* 128 bits */
37
-		enc = ccmp_encrypt(padapter, key,
36
+		enc = ccmp_encrypt(key,
38
37
 			frame,
39
38
 			hdrlen + plen,
40
39
 			hdrlen,
41
40
 			(hdrlen == 26) ? (frame + hdrlen - 2) : NULL,
42
41
 			NULL, 0, &enc_len);
43
42
 	} else if (key_len == 32) { /* 256 bits */
44
-		enc = ccmp_256_encrypt(padapter, key,
43
+		enc = ccmp_256_encrypt(key,
45
44
 			frame,
46
45
 			hdrlen + plen,
47
46
 			hdrlen,
..
..
@@ -69,7 +68,7 @@
69
68
  * @frame: the raw frame (@hdrlen + PN + enc_data + MIC)
70
69
  * @plen: length of the frame (@hdrlen + PN + enc_data + MIC)
71
70
  */
72
-int _rtw_ccmp_decrypt(_adapter * padapter, u8 *key, u32 key_len, uint hdrlen, u8 *frame,
71
+int _rtw_ccmp_decrypt(u8 *key, u32 key_len, uint hdrlen, u8 *frame,
73
72
 	uint plen)
74
73
 {
75
74
 	u8 *plain = NULL;
..
..
@@ -79,13 +78,13 @@
79
78
 	hdr = (const struct ieee80211_hdr *)frame;
80
79
 
81
80
 	if (key_len == 16) { /* 128 bits */
82
-		plain = ccmp_decrypt(padapter, key,
81
+		plain = ccmp_decrypt(key,
83
82
 			hdr,
84
83
 			frame + hdrlen, /* PN + enc_data + MIC */
85
84
 			plen - hdrlen, /* PN + enc_data + MIC */
86
85
 			&plain_len);
87
86
 	} else if (key_len == 32) { /* 256 bits */
88
-		plain = ccmp_256_decrypt(padapter, key,
87
+		plain = ccmp_256_decrypt(key,
89
88
 			hdr,
90
89
 			frame + hdrlen, /* PN + enc_data + MIC */
91
90
 			plen - hdrlen, /* PN + enc_data + MIC */
..
..
@@ -132,12 +131,12 @@
132
131
  * @frame: the frame including the mac header, pn and payload
133
132
  * @plen: payload length, i.e., length of the plain text, without PN and MIC
134
133
  */
135
-int _rtw_gcmp_encrypt(_adapter * padapter, u8 *key, u32 key_len, uint hdrlen, u8 *frame, uint plen)
134
+int _rtw_gcmp_encrypt(u8 *key, u32 key_len, uint hdrlen, u8 *frame, uint plen)
136
135
 {
137
136
 	u8 *enc = NULL;
138
137
 	size_t enc_len = 0;
139
138
 
140
-	enc = gcmp_encrypt(padapter, key, key_len,
139
+	enc = gcmp_encrypt(key, key_len,
141
140
 		frame,
142
141
 		hdrlen + plen,
143
142
 		hdrlen,
..
..
@@ -163,7 +162,7 @@
163
162
  * @frame: the raw frame (@hdrlen + PN + enc_data + MIC)
164
163
  * @plen: length of the frame (@hdrlen + PN + enc_data + MIC)
165
164
  */
166
-int _rtw_gcmp_decrypt(_adapter *padapter, u8 *key, u32 key_len, uint hdrlen, u8 *frame, uint plen)
165
+int _rtw_gcmp_decrypt(u8 *key, u32 key_len, uint hdrlen, u8 *frame, uint plen)
167
166
 {
168
167
 	u8 *plain = NULL;
169
168
 	size_t plain_len = 0;
..
..
@@ -171,7 +170,7 @@
171
170
 
172
171
 	hdr = (const struct ieee80211_hdr *)frame;
173
172
 
174
-	plain = gcmp_decrypt(padapter, key, key_len,
173
+	plain = gcmp_decrypt(key, key_len,
175
174
 		hdr,
176
175
 		frame + hdrlen, /* PN + enc_data + MIC */
177
176
 		plen - hdrlen, /* PN + enc_data + MIC */