From: Michael Straube <straube.linux@gmail.com>
To: gregkh@linuxfoundation.org
Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk,
linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org,
Michael Straube <straube.linux@gmail.com>
Subject: [PATCH 18/47] staging: r8188eu: remove rtw_set_802_11_add_key()
Date: Wed, 22 Sep 2021 22:03:51 +0200 [thread overview]
Message-ID: <20210922200420.9693-19-straube.linux@gmail.com> (raw)
In-Reply-To: <20210922200420.9693-1-straube.linux@gmail.com>
Function rtw_set_802_11_add_key() is not used, remove it.
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/r8188eu/core/rtw_ioctl_set.c | 230 ------------------
.../staging/r8188eu/include/rtw_ioctl_set.h | 1 -
2 files changed, 231 deletions(-)
diff --git a/drivers/staging/r8188eu/core/rtw_ioctl_set.c b/drivers/staging/r8188eu/core/rtw_ioctl_set.c
index a0702bfaa549..afa72b21fc0b 100644
--- a/drivers/staging/r8188eu/core/rtw_ioctl_set.c
+++ b/drivers/staging/r8188eu/core/rtw_ioctl_set.c
@@ -492,236 +492,6 @@ u8 rtw_set_802_11_remove_wep(struct adapter *padapter, u32 keyindex)
return ret;
}
-u8 rtw_set_802_11_add_key(struct adapter *padapter, struct ndis_802_11_key *key)
-{
- uint encryptionalgo;
- u8 *pbssid;
- struct sta_info *stainfo;
- u8 bgroup = false;
- u8 bgrouptkey = false;/* can be removed later */
- u8 ret = _SUCCESS;
-
- if (((key->KeyIndex & 0x80000000) == 0) && ((key->KeyIndex & 0x40000000) > 0)) {
- /* It is invalid to clear bit 31 and set bit 30. If the miniport driver encounters this combination, */
- /* it must fail the request and return NDIS_STATUS_INVALID_DATA. */
- ret = _FAIL;
- goto exit;
- }
-
- if (key->KeyIndex & 0x40000000) {
- /* Pairwise key */
-
- pbssid = get_bssid(&padapter->mlmepriv);
- stainfo = rtw_get_stainfo(&padapter->stapriv, pbssid);
-
- if (stainfo && padapter->securitypriv.dot11AuthAlgrthm == dot11AuthAlgrthm_8021X)
- encryptionalgo = stainfo->dot118021XPrivacy;
- else
- encryptionalgo = padapter->securitypriv.dot11PrivacyAlgrthm;
-
- if (key->KeyIndex & 0x000000FF) {
- /* The key index is specified in the lower 8 bits by values of zero to 255. */
- /* The key index should be set to zero for a Pairwise key, and the driver should fail with */
- /* NDIS_STATUS_INVALID_DATA if the lower 8 bits is not zero */
- ret = _FAIL;
- goto exit;
- }
-
- /* check BSSID */
- if (is_broadcast_ether_addr(key->BSSID)) {
- ret = false;
- goto exit;
- }
-
- /* Check key length for TKIP. */
- if ((encryptionalgo == _TKIP_) && (key->KeyLength != 32)) {
- ret = _FAIL;
- goto exit;
- }
-
- /* Check key length for AES. */
- if ((encryptionalgo == _AES_) && (key->KeyLength != 16)) {
- /* For our supplicant, EAPPkt9x.vxd, cannot differentiate TKIP and AES case. */
- if (key->KeyLength == 32) {
- key->KeyLength = 16;
- } else {
- ret = _FAIL;
- goto exit;
- }
- }
-
- /* Check key length for WEP. For NDTEST, 2005.01.27, by rcnjko. */
- if ((encryptionalgo == _WEP40_ || encryptionalgo == _WEP104_) &&
- (key->KeyLength != 5 && key->KeyLength != 13)) {
- ret = _FAIL;
- goto exit;
- }
-
- bgroup = false;
- } else {
- /* Group key - KeyIndex(BIT(30) == 0) */
- /* when add wep key through add key and didn't assigned encryption type before */
- if ((padapter->securitypriv.ndisauthtype <= 3) &&
- (padapter->securitypriv.dot118021XGrpPrivacy == 0)) {
- switch (key->KeyLength) {
- case 5:
- padapter->securitypriv.dot11PrivacyAlgrthm = _WEP40_;
- break;
- case 13:
- padapter->securitypriv.dot11PrivacyAlgrthm = _WEP104_;
- break;
- default:
- padapter->securitypriv.dot11PrivacyAlgrthm = _NO_PRIVACY_;
- break;
- }
-
- encryptionalgo = padapter->securitypriv.dot11PrivacyAlgrthm;
- } else {
- encryptionalgo = padapter->securitypriv.dot118021XGrpPrivacy;
- }
-
- if (check_fwstate(&padapter->mlmepriv, WIFI_ADHOC_STATE) && !is_broadcast_ether_addr(key->BSSID)) {
- ret = _FAIL;
- goto exit;
- }
-
- /* Check key length for TKIP */
- if ((encryptionalgo == _TKIP_) && (key->KeyLength != 32)) {
- ret = _FAIL;
- goto exit;
- } else if (encryptionalgo == _AES_ && (key->KeyLength != 16 && key->KeyLength != 32)) {
- /* Check key length for AES */
- /* For NDTEST, we allow keylen = 32 in this case. 2005.01.27, by rcnjko. */
- ret = _FAIL;
- goto exit;
- }
-
- /* Change the key length for EAPPkt9x.vxd. Added by Annie, 2005-11-03. */
- if ((encryptionalgo == _AES_) && (key->KeyLength == 32))
- key->KeyLength = 16;
-
- if (key->KeyIndex & 0x8000000) {/* error ??? 0x8000_0000 */
- bgrouptkey = true;
- }
-
- if ((check_fwstate(&padapter->mlmepriv, WIFI_ADHOC_STATE)) &&
- (check_fwstate(&padapter->mlmepriv, _FW_LINKED)))
- bgrouptkey = true;
- bgroup = true;
- }
-
- /* If WEP encryption algorithm, just call rtw_set_802_11_add_wep(). */
- if ((padapter->securitypriv.dot11AuthAlgrthm != dot11AuthAlgrthm_8021X) &&
- (encryptionalgo == _WEP40_ || encryptionalgo == _WEP104_)) {
- u32 keyindex;
- u32 len = FIELD_OFFSET(struct ndis_802_11_key, KeyMaterial) + key->KeyLength;
- struct ndis_802_11_wep *wep = &padapter->securitypriv.ndiswep;
-
- wep->Length = len;
- keyindex = key->KeyIndex & 0x7fffffff;
- wep->KeyIndex = keyindex;
- wep->KeyLength = key->KeyLength;
-
- memcpy(wep->KeyMaterial, key->KeyMaterial, key->KeyLength);
- memcpy(&padapter->securitypriv.dot11DefKey[keyindex].skey[0], key->KeyMaterial, key->KeyLength);
-
- padapter->securitypriv.dot11DefKeylen[keyindex] = key->KeyLength;
- padapter->securitypriv.dot11PrivacyKeyIndex = keyindex;
-
- ret = rtw_set_802_11_add_wep(padapter, wep);
- goto exit;
- }
- if (key->KeyIndex & 0x20000000) {
- /* SetRSC */
- if (bgroup) {
- unsigned long long keysrc = key->KeyRSC & 0x00FFFFFFFFFFFFULL;
- memcpy(&padapter->securitypriv.dot11Grprxpn, &keysrc, 8);
- } else {
- unsigned long long keysrc = key->KeyRSC & 0x00FFFFFFFFFFFFULL;
- memcpy(&padapter->securitypriv.dot11Grptxpn, &keysrc, 8);
- }
- }
-
- /* Indicate this key idx is used for TX */
- /* Save the key in KeyMaterial */
- if (bgroup) { /* Group transmit key */
- int res;
-
- if (bgrouptkey)
- padapter->securitypriv.dot118021XGrpKeyid = (u8)key->KeyIndex;
- if ((key->KeyIndex & 0x3) == 0) {
- ret = _FAIL;
- goto exit;
- }
- memset(&padapter->securitypriv.dot118021XGrpKey[(u8)((key->KeyIndex) & 0x03)], 0, 16);
- memset(&padapter->securitypriv.dot118021XGrptxmickey[(u8)((key->KeyIndex) & 0x03)], 0, 16);
- memset(&padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex) & 0x03)], 0, 16);
-
- if ((key->KeyIndex & 0x10000000)) {
- memcpy(&padapter->securitypriv.dot118021XGrptxmickey[(u8)((key->KeyIndex) & 0x03)], key->KeyMaterial + 16, 8);
- memcpy(&padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex) & 0x03)], key->KeyMaterial + 24, 8);
- } else {
- memcpy(&padapter->securitypriv.dot118021XGrptxmickey[(u8)((key->KeyIndex) & 0x03)], key->KeyMaterial + 24, 8);
- memcpy(&padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex) & 0x03)], key->KeyMaterial + 16, 8);
- }
-
- /* set group key by index */
- memcpy(&padapter->securitypriv.dot118021XGrpKey[(u8)((key->KeyIndex) & 0x03)], key->KeyMaterial, key->KeyLength);
-
- key->KeyIndex = key->KeyIndex & 0x03;
-
- padapter->securitypriv.binstallGrpkey = true;
-
- padapter->securitypriv.bcheck_grpkey = false;
-
- res = rtw_set_key(padapter, &padapter->securitypriv, key->KeyIndex, 1);
-
- if (res == _FAIL)
- ret = _FAIL;
-
- goto exit;
-
- } else { /* Pairwise Key */
- u8 res;
-
- pbssid = get_bssid(&padapter->mlmepriv);
- stainfo = rtw_get_stainfo(&padapter->stapriv, pbssid);
-
- if (stainfo) {
- memset(&stainfo->dot118021x_UncstKey, 0, 16);/* clear keybuffer */
-
- memcpy(&stainfo->dot118021x_UncstKey, key->KeyMaterial, 16);
-
- if (encryptionalgo == _TKIP_) {
- padapter->securitypriv.busetkipkey = false;
-
- /* _set_timer(&padapter->securitypriv.tkip_timer, 50); */
-
- /* if TKIP, save the Receive/Transmit MIC key in KeyMaterial[128-255] */
- if ((key->KeyIndex & 0x10000000)) {
- memcpy(&stainfo->dot11tkiptxmickey, key->KeyMaterial + 16, 8);
- memcpy(&stainfo->dot11tkiprxmickey, key->KeyMaterial + 24, 8);
-
- } else {
- memcpy(&stainfo->dot11tkiptxmickey, key->KeyMaterial + 24, 8);
- memcpy(&stainfo->dot11tkiprxmickey, key->KeyMaterial + 16, 8);
- }
- }
-
- /* Set key to CAM through H2C command */
- if (bgrouptkey) /* never go to here */
- res = rtw_setstakey_cmd(padapter, (unsigned char *)stainfo, false);
- else
- res = rtw_setstakey_cmd(padapter, (unsigned char *)stainfo, true);
- if (!res)
- ret = _FAIL;
- }
- }
-exit:
-
- return ret;
-}
-
u8 rtw_set_802_11_remove_key(struct adapter *padapter, struct ndis_802_11_remove_key *key)
{
u8 *pbssid;
diff --git a/drivers/staging/r8188eu/include/rtw_ioctl_set.h b/drivers/staging/r8188eu/include/rtw_ioctl_set.h
index 6216b8ab3a79..3f4b4873eb98 100644
--- a/drivers/staging/r8188eu/include/rtw_ioctl_set.h
+++ b/drivers/staging/r8188eu/include/rtw_ioctl_set.h
@@ -8,7 +8,6 @@
typedef u8 NDIS_802_11_PMKID_VALUE[16];
-u8 rtw_set_802_11_add_key(struct adapter *adapt, struct ndis_802_11_key *key);
u8 rtw_set_802_11_authentication_mode(struct adapter *adapt,
enum ndis_802_11_auth_mode authmode);
u8 rtw_set_802_11_bssid(struct adapter*adapter, u8 *bssid);
--
2.33.0
next prev parent reply other threads:[~2021-09-22 20:05 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-22 20:03 [PATCH 00/47] staging: r8188eu: remove unused functions Michael Straube
2021-09-22 20:03 ` [PATCH 01/47] staging: r8188eu: remove EFUSE_ShadowRead() Michael Straube
2021-09-22 20:03 ` [PATCH 02/47] staging: r8188eu: remove efuse_GetCurrentSize() Michael Straube
2021-09-22 20:03 ` [PATCH 03/47] staging: r8188eu: remove efuse_GetMaxSize() Michael Straube
2021-09-22 20:03 ` [PATCH 04/47] staging: r8188eu: remove rtw_BT_efuse_map_write() Michael Straube
2021-09-22 20:03 ` [PATCH 05/47] staging: r8188eu: remove rtw_efuse_access() Michael Straube
2021-09-22 20:03 ` [PATCH 06/47] staging: r8188eu: remove rtw_efuse_map_write() Michael Straube
2021-09-22 20:03 ` [PATCH 07/47] staging: r8188eu: remove rtw_BT_efuse_map_read() Michael Straube
2021-09-22 20:03 ` [PATCH 08/47] staging: r8188eu: remove rtw_efuse_map_read() Michael Straube
2021-09-22 20:03 ` [PATCH 09/47] staging: r8188eu: remove _rtw_dequeue_network() Michael Straube
2021-09-22 20:03 ` [PATCH 10/47] staging: r8188eu: remove _rtw_enqueue_network() Michael Straube
2021-09-22 20:03 ` [PATCH 11/47] staging: r8188eu: remove rtw_get_timestampe_from_ie() Michael Straube
2021-09-22 20:03 ` [PATCH 12/47] staging: r8188eu: remove rtw_scan_abort() Michael Straube
2021-09-22 20:03 ` [PATCH 13/47] staging: r8188eu: remove issue_action_spct_ch_switch() Michael Straube
2021-09-22 20:03 ` [PATCH 14/47] staging: r8188eu: remove issue_probereq_p2p_ex() Michael Straube
2021-09-22 20:03 ` [PATCH 15/47] staging: r8188eu: remove sreset_get_wifi_status() Michael Straube
2021-09-22 20:03 ` [PATCH 16/47] staging: r8188eu: remove build_deauth_p2p_ie() Michael Straube
2021-09-22 20:03 ` [PATCH 17/47] staging: r8188eu: remove rtw_freq2ch() Michael Straube
2021-09-22 20:03 ` Michael Straube [this message]
2021-09-22 20:03 ` [PATCH 19/47] staging: r8188eu: remove rtw_set_802_11_remove_key() Michael Straube
2021-09-22 20:03 ` [PATCH 20/47] staging: r8188eu: remove rtw_set_802_11_remove_wep() Michael Straube
2021-09-22 20:03 ` [PATCH 21/47] staging: r8188eu: remove rtw_set_country() Michael Straube
2021-09-22 20:03 ` [PATCH 22/47] staging: r8188eu: remove rtw_set_scan_mode() Michael Straube
2021-09-22 20:03 ` [PATCH 23/47] staging: r8188eu: remove rtw_validate_ssid() Michael Straube
2021-09-22 20:03 ` [PATCH 24/47] staging: r8188eu: remove rtw_set_channel_plan() Michael Straube
2021-09-22 20:03 ` [PATCH 25/47] staging: r8188eu: remove rtw_atoi() Michael Straube
2021-09-22 20:03 ` [PATCH 26/47] staging: r8188eu: remove rtw_cbuf_push() Michael Straube
2021-09-22 20:04 ` [PATCH 27/47] staging: r8188eu: remove rtw_cbuf_full() Michael Straube
2021-09-22 20:04 ` [PATCH 28/47] staging: r8188eu: remove rtw_os_read_port() Michael Straube
2021-09-22 20:04 ` [PATCH 29/47] staging: r8188eu: remove rtw_IOL_cmd_buf_dump() Michael Straube
2021-09-22 20:04 ` [PATCH 30/47] staging: r8188eu: remove action_public_str() Michael Straube
2021-09-22 20:04 ` [PATCH 31/47] staging: r8188eu: remove dump_ies() Michael Straube
2021-09-22 20:04 ` [PATCH 32/47] staging: r8188eu: remove hal_ch_offset_to_secondary_ch_offset() Michael Straube
2021-09-22 20:04 ` [PATCH 33/47] staging: r8188eu: remove secondary_ch_offset_to_hal_ch_offset() Michael Straube
2021-09-22 20:04 ` [PATCH 34/47] staging: r8188eu: remove ieee80211_get_hdrlen() Michael Straube
2021-09-22 20:04 ` [PATCH 35/47] staging: r8188eu: remove ieee80211_is_empty_essid() Michael Straube
2021-09-22 20:04 ` [PATCH 36/47] staging: r8188eu: remove rtw_action_frame_parse() Michael Straube
2021-09-22 20:04 ` [PATCH 37/47] staging: r8188eu: remove rtw_ies_remove_ie() Michael Straube
2021-09-22 20:04 ` [PATCH 38/47] staging: r8188eu: remove rtw_set_ie_ch_switch() Michael Straube
2021-09-22 20:04 ` [PATCH 39/47] staging: r8188eu: remove rtw_set_ie_mesh_ch_switch_parm() Michael Straube
2021-09-22 20:04 ` [PATCH 40/47] staging: r8188eu: remove rtw_set_ie_secondary_ch_offset() Michael Straube
2021-09-22 20:04 ` [PATCH 41/47] staging: r8188eu: remove enum secondary_ch_offset Michael Straube
2021-09-22 20:04 ` [PATCH 42/47] staging: r8188eu: remove rtw_dequeue_recvbuf() Michael Straube
2021-09-22 20:04 ` [PATCH 43/47] staging: r8188eu: remove rtw_enqueue_recvbuf() Michael Straube
2021-09-22 20:04 ` [PATCH 44/47] staging: r8188eu: remove rtw_enqueue_recvbuf_to_head() Michael Straube
2021-09-22 20:04 ` [PATCH 45/47] staging: r8188eu: remove rtw_init_recvframe() Michael Straube
2021-09-22 20:04 ` [PATCH 46/47] staging: r8188eu: remove rtw_calculate_wlan_pkt_size_by_attribue() Michael Straube
2021-09-22 20:04 ` [PATCH 47/47] staging: r8188eu: remove rtw_sctx_done() Michael Straube
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210922200420.9693-19-straube.linux@gmail.com \
--to=straube.linux@gmail.com \
--cc=Larry.Finger@lwfinger.net \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=phil@philpotter.co.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.