From: Jes Sorensen <Jes.Sorensen@xxxxxxxxxx>
Signed-off-by: Jes Sorensen <Jes.Sorensen@xxxxxxxxxx>
---
drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c b/drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c
index 0925d56..ac13df1 100644
--- a/drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c
+++ b/drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c
@@ -530,6 +530,17 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev,
ret = -EINVAL;
goto exit;
}
+ switch (keyparms->cipher) {
+ case WLAN_CIPHER_SUITE_WEP40:
+ case WLAN_CIPHER_SUITE_WEP104:
+ case WLAN_CIPHER_SUITE_TKIP:
+ case WLAN_CIPHER_SUITE_CCMP:
+ break;
+ default:
+ ret = -EINVAL;
+ goto exit;
+ }
+
} else {
psta = rtw_get_stainfo23a(pstapriv, param->sta_addr);
if (!psta) {
@@ -540,15 +551,6 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev,
}
}
- if (strcmp(param->u.crypt.alg, "none") == 0 && (psta == NULL)) {
- /* todo:clear default encryption keys */
-
- DBG_8723A("clear default encryption keys, keyid =%d\n",
- param->u.crypt.idx);
-
- goto exit;
- }
-
key_len = keyparms->key_len;
if (!psta && (keyparms->cipher == WLAN_CIPHER_SUITE_WEP40 ||
--
1.9.3
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
