staging: rtl8723au: We don't support SMS4 or WEP+WPA mixed encryption

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723au/core/rtw_recv.c b/drivers/staging/rtl8723au/core/rtw_recv.c
index 84e6a1875cf4649ca2e5d0947b57c051fbc6241e..a2dc5d8187f9025902fdabbd945e0d4bff08b10d 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_recv.c
+++ b/drivers/staging/rtl8723au/core/rtw_recv.c
@@ -1421,10 +1421,6 @@ static int validate_recv_data_frame(struct rtw_adapter *adapter,
                        pattrib->iv_len = 8;
                        pattrib->icv_len = 8;
                        break;
-               case _SMS4_:
-                       pattrib->iv_len = 18;
-                       pattrib->icv_len = 16;
-                       break;
                default:
                        pattrib->iv_len = 0;
                        pattrib->icv_len = 0;

diff --git a/drivers/staging/rtl8723au/include/odm.h b/drivers/staging/rtl8723au/include/odm.h
index c851eda14a749ce419b0b42ed6a02c3e437ab3f4..5ad0a14082250827fd26204c285ffbacc5e819ff 100644 (file)
--- a/drivers/staging/rtl8723au/include/odm.h
+++ b/drivers/staging/rtl8723au/include/odm.h
@@ -524,8 +524,6 @@ enum odm_security {
        ODM_SEC_RESERVE         = 3,
        ODM_SEC_AESCCMP         = 4,
        ODM_SEC_WEP104          = 5,
-       ODM_WEP_WPA_MIXED       = 6, /*  WEP + WPA */
-       ODM_SEC_SMS4            = 7,
 };
 
 /*  ODM_CMNINFO_BW */

diff --git a/drivers/staging/rtl8723au/include/rtw_security.h b/drivers/staging/rtl8723au/include/rtw_security.h
index 7a707bcc599882172ddb5697785e55a354d3fe90..1a7fed8e25b7534214677ff914be6a39adc402a7 100644 (file)
--- a/drivers/staging/rtl8723au/include/rtw_security.h
+++ b/drivers/staging/rtl8723au/include/rtw_security.h
@@ -25,8 +25,6 @@
 #define _TKIP_WTMIC_           0x3
 #define _AES_                  0x4
 #define _WEP104_               0x5
-#define _WEP_WPA_MIXED_        0x07  /*  WEP + WPA */
-#define _SMS4_                 0x06
 
 #define is_wep_enc(alg) (((alg) == _WEP40_) || ((alg) == _WEP104_))