From 7871778259b1255738a0b5dd337e57144e06b5d2 Mon Sep 17 00:00:00 2001
From: Jes Sorensen <Jes.Sorensen@redhat.com>
Date: Fri, 9 May 2014 15:04:07 +0200
Subject: [PATCH] staging: rtl8723au: Move {WPA,RSN}_TKIP_CIPHER23A to
rtw_wlan_util.c and mark them static
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/staging/rtl8723au/core/rtw_mlme_ext.c | 3 ---
drivers/staging/rtl8723au/core/rtw_wlan_util.c | 8 +++++---
drivers/staging/rtl8723au/include/osdep_service.h | 2 --
3 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/rtl8723au/core/rtw_mlme_ext.c b/drivers/staging/rtl8723au/core/rtw_mlme_ext.c
index 9e296fdb3f267..6106b6a9e87fd 100644
--- a/drivers/staging/rtl8723au/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8723au/core/rtw_mlme_ext.c
@@ -95,9 +95,6 @@ unsigned char WFD_OUI23A[] = {0x50, 0x6F, 0x9A, 0x0A};
unsigned char WMM_INFO_OUI23A[] = {0x00, 0x50, 0xf2, 0x02, 0x00, 0x01};
unsigned char WMM_PARA_OUI23A[] = {0x00, 0x50, 0xf2, 0x02, 0x01, 0x01};
-unsigned char WPA_TKIP_CIPHER23A[4] = {0x00, 0x50, 0xf2, 0x02};
-unsigned char RSN_TKIP_CIPHER23A[4] = {0x00, 0x0f, 0xac, 0x02};
-
static unsigned char REALTEK_96B_IE[] = {0x00, 0xe0, 0x4c, 0x02, 0x01, 0x20};
/********************************************************
diff --git a/drivers/staging/rtl8723au/core/rtw_wlan_util.c b/drivers/staging/rtl8723au/core/rtw_wlan_util.c
index e6a905f054edb..e7c67c396981b 100644
--- a/drivers/staging/rtl8723au/core/rtw_wlan_util.c
+++ b/drivers/staging/rtl8723au/core/rtw_wlan_util.c
@@ -32,6 +32,9 @@ static unsigned char REALTEK_OUI[] = {0x00, 0xe0, 0x4c};
static unsigned char AIRGOCAP_OUI[] = {0x00, 0x0a, 0xf5};
static unsigned char EPIGRAM_OUI[] = {0x00, 0x90, 0x4c};
+static unsigned char WPA_TKIP_CIPHER[4] = {0x00, 0x50, 0xf2, 0x02};
+static unsigned char RSN_TKIP_CIPHER[4] = {0x00, 0x0f, 0xac, 0x02};
+
#define R2T_PHY_DELAY 0
/* define WAIT_FOR_BCN_TO_MIN 3000 */
@@ -1181,12 +1184,11 @@ unsigned int is_ap_in_tkip23a(struct rtw_adapter *padapter)
case WLAN_EID_VENDOR_SPECIFIC:
if (!memcmp(pIE->data, RTW_WPA_OUI23A_TYPE, 4)&&
!memcmp((pIE->data + 12),
- WPA_TKIP_CIPHER23A, 4))
+ WPA_TKIP_CIPHER, 4))
return true;
break;
case WLAN_EID_RSN:
- if (!memcmp(pIE->data + 8, RSN_TKIP_CIPHER23A,
- 4))
+ if (!memcmp(pIE->data + 8, RSN_TKIP_CIPHER, 4))
return true;
break;
default:
diff --git a/drivers/staging/rtl8723au/include/osdep_service.h b/drivers/staging/rtl8723au/include/osdep_service.h
index 8ecf230c7c551..be9329f14f7a3 100644
--- a/drivers/staging/rtl8723au/include/osdep_service.h
+++ b/drivers/staging/rtl8723au/include/osdep_service.h
@@ -127,8 +127,6 @@ static inline u32 CHKBIT(u32 x)
#define BIT36 0x1000000000
extern unsigned char MCS_rate_2R23A[16];
-extern unsigned char WPA_TKIP_CIPHER23A[4];
-extern unsigned char RSN_TKIP_CIPHER23A[4];
extern unsigned char MCS_rate_2R23A[16];
extern unsigned char MCS_rate_1R23A[16];
--
2.30.2