From b22da3d8526a935aa31e086e63f60ff3246cb61c Mon Sep 17 00:00:00 2001 From: hc <hc@nodka.com> Date: Sat, 09 Dec 2023 07:24:11 +0000 Subject: [PATCH] add stmac read mac form eeprom --- kernel/drivers/net/wireless/rockchip_wlan/rtl8723cs/core/rtw_swcrypto.c | 21 ++++++++++----------- 1 files changed, 10 insertions(+), 11 deletions(-) diff --git a/kernel/drivers/net/wireless/rockchip_wlan/rtl8723cs/core/rtw_swcrypto.c b/kernel/drivers/net/wireless/rockchip_wlan/rtl8723cs/core/rtw_swcrypto.c index 19b5312..3659b35 100644 --- a/kernel/drivers/net/wireless/rockchip_wlan/rtl8723cs/core/rtw_swcrypto.c +++ b/kernel/drivers/net/wireless/rockchip_wlan/rtl8723cs/core/rtw_swcrypto.c @@ -27,21 +27,20 @@ * @frame: the frame including the mac header, pn and payload * @plen: payload length, i.e., length of the plain text, without PN and MIC */ -int _rtw_ccmp_encrypt(_adapter *padapter, u8 *key, u32 key_len, uint hdrlen, u8 *frame, uint plen) - +int _rtw_ccmp_encrypt(u8 *key, u32 key_len, uint hdrlen, u8 *frame, uint plen) { u8 *enc = NULL; size_t enc_len = 0; if (key_len == 16) { /* 128 bits */ - enc = ccmp_encrypt(padapter, key, + enc = ccmp_encrypt(key, frame, hdrlen + plen, hdrlen, (hdrlen == 26) ? (frame + hdrlen - 2) : NULL, NULL, 0, &enc_len); } else if (key_len == 32) { /* 256 bits */ - enc = ccmp_256_encrypt(padapter, key, + enc = ccmp_256_encrypt(key, frame, hdrlen + plen, hdrlen, @@ -69,7 +68,7 @@ * @frame: the raw frame (@hdrlen + PN + enc_data + MIC) * @plen: length of the frame (@hdrlen + PN + enc_data + MIC) */ -int _rtw_ccmp_decrypt(_adapter * padapter, u8 *key, u32 key_len, uint hdrlen, u8 *frame, +int _rtw_ccmp_decrypt(u8 *key, u32 key_len, uint hdrlen, u8 *frame, uint plen) { u8 *plain = NULL; @@ -79,13 +78,13 @@ hdr = (const struct ieee80211_hdr *)frame; if (key_len == 16) { /* 128 bits */ - plain = ccmp_decrypt(padapter, key, + plain = ccmp_decrypt(key, hdr, frame + hdrlen, /* PN + enc_data + MIC */ plen - hdrlen, /* PN + enc_data + MIC */ &plain_len); } else if (key_len == 32) { /* 256 bits */ - plain = ccmp_256_decrypt(padapter, key, + plain = ccmp_256_decrypt(key, hdr, frame + hdrlen, /* PN + enc_data + MIC */ plen - hdrlen, /* PN + enc_data + MIC */ @@ -132,12 +131,12 @@ * @frame: the frame including the mac header, pn and payload * @plen: payload length, i.e., length of the plain text, without PN and MIC */ -int _rtw_gcmp_encrypt(_adapter * padapter, u8 *key, u32 key_len, uint hdrlen, u8 *frame, uint plen) +int _rtw_gcmp_encrypt(u8 *key, u32 key_len, uint hdrlen, u8 *frame, uint plen) { u8 *enc = NULL; size_t enc_len = 0; - enc = gcmp_encrypt(padapter, key, key_len, + enc = gcmp_encrypt(key, key_len, frame, hdrlen + plen, hdrlen, @@ -163,7 +162,7 @@ * @frame: the raw frame (@hdrlen + PN + enc_data + MIC) * @plen: length of the frame (@hdrlen + PN + enc_data + MIC) */ -int _rtw_gcmp_decrypt(_adapter *padapter, u8 *key, u32 key_len, uint hdrlen, u8 *frame, uint plen) +int _rtw_gcmp_decrypt(u8 *key, u32 key_len, uint hdrlen, u8 *frame, uint plen) { u8 *plain = NULL; size_t plain_len = 0; @@ -171,7 +170,7 @@ hdr = (const struct ieee80211_hdr *)frame; - plain = gcmp_decrypt(padapter, key, key_len, + plain = gcmp_decrypt(key, key_len, hdr, frame + hdrlen, /* PN + enc_data + MIC */ plen - hdrlen, /* PN + enc_data + MIC */ -- Gitblit v1.6.2