From: Jes Sorensen <Jes.Sorensen@redhat.com>
Date: Wed, 21 May 2014 07:37:32 +0000 (+0200)
Subject: staging: rtl8723au: We don't support SMS4 or WEP+WPA mixed encryption
X-Git-Tag: v4.14-rc1~7083^2~39^2~638
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1de36ec31680acd2cd06c3c5204e2ed1dee8f59b;p=platform%2Fkernel%2Flinux-rpi.git

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 84e6a18..a2dc5d8 100644
--- 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 c851eda..5ad0a14 100644
--- 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 7a707bc..1a7fed8 100644
--- 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_))