[PATCH 27/43] staging: rtl8723au: rtw_cfg80211_set_encryption(): Use key_params->cipher
Jes.Sorensen at redhat.com
Jes.Sorensen at redhat.com
Tue Jun 24 13:03:42 UTC 2014
From: Jes Sorensen <Jes.Sorensen at redhat.com>
Use key_params->cipher to determine WEP/TKIP
Signed-off-by: Jes Sorensen <Jes.Sorensen at redhat.com>
---
drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c b/drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c
index 5ea0fa1..2e21223 100644
--- a/drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c
+++ b/drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c
@@ -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,
¶m->u.crypt.key[16],
--
1.9.3
More information about the devel
mailing list