From: Michael Straube <straube.linux@gmail.com>
To: gregkh@linuxfoundation.org
Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org,
Michael Straube <straube.linux@gmail.com>
Subject: [PATCH v2 12/17] staging: rtl8188eu: make some arrays static in rtw_mlme_ext.c
Date: Tue, 18 Dec 2018 19:34:46 +0100 [thread overview]
Message-ID: <20181218183451.18692-12-straube.linux@gmail.com> (raw)
In-Reply-To: <20181218183451.18692-1-straube.linux@gmail.com>
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@gmail.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
next prev parent reply other threads:[~2018-12-18 18:35 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-18 18:34 [PATCH v2 01/17] staging: rtl8188eu: cleanup declarations in rtw_mlme_ext.c Michael Straube
2018-12-18 18:34 ` [PATCH v2 02/17] staging: rtl8188eu: replace tabs with spaces " Michael Straube
2018-12-18 18:34 ` [PATCH v2 03/17] staging: rtl8188eu: remove commented declarations " Michael Straube
2018-12-18 18:34 ` [PATCH v2 04/17] staging: rtl8188eu: remove blank lines between declarations Michael Straube
2018-12-18 18:34 ` [PATCH v2 05/17] staging: rtl8188eu: add blank line after declarations Michael Straube
2018-12-18 18:34 ` [PATCH v2 06/17] staging: rtl8188eu: remove unnecessary comments in rtw_mlme_ext.c Michael Straube
2018-12-18 18:34 ` [PATCH v2 07/17] staging: rtl8188eu: remove unnecessary parentheses " Michael Straube
2018-12-18 18:34 ` [PATCH v2 08/17] staging: rtl8188eu: remove unused arrays WFD_OUI and WMM_INFO_OUI Michael Straube
2018-12-18 18:34 ` [PATCH v2 09/17] staging: rtl8188eu: remove redundant declaration in rtw_mlme_ext.c Michael Straube
2018-12-18 18:34 ` [PATCH v2 10/17] staging: rtl8188eu: convert unsigned char arrays to u8 Michael Straube
2018-12-18 18:34 ` [PATCH v2 11/17] staging: rtl8188eu: constify some arrays Michael Straube
2018-12-18 18:34 ` Michael Straube [this message]
2018-12-18 18:34 ` [PATCH v2 13/17] staging: rtl8188eu: change order of declarations to improve readability Michael Straube
2018-12-18 18:34 ` [PATCH v2 14/17] staging: rtl8188eu: simplify null array initializations Michael Straube
2018-12-19 7:32 ` Greg KH
2018-12-18 18:34 ` [PATCH v2 15/17] staging: rtl8188eu: change return type of is_basicrate() to bool Michael Straube
2018-12-18 18:34 ` [PATCH v2 16/17] staging: rtl8188eu: add spaces around '&' in rtw_mlme_ext.c Michael Straube
2018-12-18 18:34 ` [PATCH v2 17/17] staging: rtl8188eu: cleanup brace coding style issues Michael Straube
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181218183451.18692-12-straube.linux@gmail.com \
--to=straube.linux@gmail.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).