[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20181218183451.18692-12-straube.linux@gmail.com>
Date: Tue, 18 Dec 2018 19:34:46 +0100
From: Michael Straube <straube.linux@...il.com>
To: gregkh@...uxfoundation.org
Cc: devel@...verdev.osuosl.org, linux-kernel@...r.kernel.org,
Michael Straube <straube.linux@...il.com>
Subject: [PATCH v2 12/17] staging: rtl8188eu: make some arrays static in rtw_mlme_ext.c
Make some arrays that are only used in rtw_mlme_ext.c static and
remove the corresponding extern declarations from rtw_mlme_ext.h.
Signed-off-by: Michael Straube <straube.linux@...il.com>
---
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 6 +++---
drivers/staging/rtl8188eu/include/rtw_mlme_ext.h | 5 -----
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
index ade4045bab45..30ae42c17796 100644
--- a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
@@ -23,11 +23,11 @@ static u8 null_addr[ETH_ALEN] = {0, 0, 0, 0, 0, 0};
OUI definitions for the vendor specific IE
***************************************************/
const u8 RTW_WPA_OUI[] = {0x00, 0x50, 0xf2, 0x01};
-const u8 WMM_OUI[] = {0x00, 0x50, 0xf2, 0x02};
+static const u8 WMM_OUI[] = {0x00, 0x50, 0xf2, 0x02};
const u8 WPS_OUI[] = {0x00, 0x50, 0xf2, 0x04};
-const u8 P2P_OUI[] = {0x50, 0x6F, 0x9A, 0x09};
+static const u8 P2P_OUI[] = {0x50, 0x6F, 0x9A, 0x09};
-const u8 WMM_PARA_OUI[] = {0x00, 0x50, 0xf2, 0x02, 0x01, 0x01};
+static const u8 WMM_PARA_OUI[] = {0x00, 0x50, 0xf2, 0x02, 0x01, 0x01};
const u8 WPA_TKIP_CIPHER[4] = {0x00, 0x50, 0xf2, 0x02};
const u8 RSN_TKIP_CIPHER[4] = {0x00, 0x0f, 0xac, 0x02};
diff --git a/drivers/staging/rtl8188eu/include/rtw_mlme_ext.h b/drivers/staging/rtl8188eu/include/rtw_mlme_ext.h
index 08151a175d6e..1fb2349bd0a0 100644
--- a/drivers/staging/rtl8188eu/include/rtw_mlme_ext.h
+++ b/drivers/staging/rtl8188eu/include/rtw_mlme_ext.h
@@ -80,13 +80,8 @@
#define _48M_RATE_ 10
#define _54M_RATE_ 11
-
extern const u8 RTW_WPA_OUI[];
-extern const u8 WMM_OUI[];
extern const u8 WPS_OUI[];
-extern const u8 P2P_OUI[];
-
-extern const u8 WMM_PARA_OUI[];
/* Channel Plan Type. */
/* Note: */
--
2.20.1
Powered by blists - more mailing lists