openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: rtl8723au: rtw_cfg80211_set_encryption(): Use key_params->cipher 

Use key_params->cipher to determine WEP/TKIP

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jes Sorensen 2014-06-24 15:03:42 +02:00 committed by Greg Kroah-Hartman
parent d0dc266692
commit 8188b1cb61
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c
View File

@ -835,7 +835,8 @@ static int rtw_cfg80211_set_encryption(struct net_device *dev,
goto exit;
}
if (strcmp(param->u.crypt.alg, "WEP") == 0) {
if (keyparms->cipher == WLAN_CIPHER_SUITE_WEP40 ||
keyparms->cipher == WLAN_CIPHER_SUITE_WEP104) {
RT_TRACE(_module_rtl871x_ioctl_os_c, _drv_err_,
("wpa_set_encryption, crypt.alg = WEP\n"));
DBG_8723A("wpa_set_encryption, crypt.alg = WEP\n");
@ -912,8 +913,8 @@ static int rtw_cfg80211_set_encryption(struct net_device *dev,
param->u.crypt.key,
(key_len > 16 ? 16 : key_len));
if (strcmp(param->u.crypt.alg,
"TKIP") == 0) {
if (keyparms->cipher ==
WLAN_CIPHER_SUITE_TKIP) {
memcpy(psta->dot11tkiptxmickey.
skey,
&param->u.crypt.key[16],