Commit 8188b1cb authored by Jes Sorensen's avatar Jes Sorensen Committed by Greg Kroah-Hartman

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

Use key_params->cipher to determine WEP/TKIP
Signed-off-by: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d0dc2666
...@@ -835,7 +835,8 @@ static int rtw_cfg80211_set_encryption(struct net_device *dev, ...@@ -835,7 +835,8 @@ static int rtw_cfg80211_set_encryption(struct net_device *dev,
goto exit; 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_, RT_TRACE(_module_rtl871x_ioctl_os_c, _drv_err_,
("wpa_set_encryption, crypt.alg = WEP\n")); ("wpa_set_encryption, crypt.alg = WEP\n"));
DBG_8723A("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, ...@@ -912,8 +913,8 @@ static int rtw_cfg80211_set_encryption(struct net_device *dev,
param->u.crypt.key, param->u.crypt.key,
(key_len > 16 ? 16 : key_len)); (key_len > 16 ? 16 : key_len));
if (strcmp(param->u.crypt.alg, if (keyparms->cipher ==
"TKIP") == 0) { WLAN_CIPHER_SUITE_TKIP) {
memcpy(psta->dot11tkiptxmickey. memcpy(psta->dot11tkiptxmickey.
skey, skey,
&param->u.crypt.key[16], &param->u.crypt.key[16],
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment