From: Jes Sorensen Date: Tue, 24 Jun 2014 13:03:42 +0000 (+0200) Subject: staging: rtl8723au: rtw_cfg80211_set_encryption(): Use key_params->cipher X-Git-Tag: firefly_0821_release~176^2~3491^2~1577 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8188b1cb6165655d087edf89b6619e62021762d8;p=firefly-linux-kernel-4.4.55.git staging: rtl8723au: rtw_cfg80211_set_encryption(): Use key_params->cipher Use key_params->cipher to determine WEP/TKIP Signed-off-by: Jes Sorensen Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c b/drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c index 5ea0fa102eb4..2e21223b15be 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],