Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-27 22:51:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

staging: rtl8188eu: constify some arrays

Browse Source 
The values of these arrays in rtw_mlme_ext.c and rtw_wlan_util.c
are never changed, so make them const.

Signed-off-by: Michael Straube <straube.linux@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Michael Straube 2018-12-18 19:34:45 +01:00 committed by Greg Kroah-Hartman
parent 0ef9f86b93
commit 03449acb77
4 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
View File

@ -22,15 +22,15 @@ static u8 null_addr[ETH_ALEN] = {0, 0, 0, 0, 0, 0};
/************************************************** /**************************************************
OUI definitions for the vendor specific IE OUI definitions for the vendor specific IE
***************************************************/ ***************************************************/
u8 RTW_WPA_OUI[] = {0x00, 0x50, 0xf2, 0x01}; const u8 RTW_WPA_OUI[] = {0x00, 0x50, 0xf2, 0x01};
u8 WMM_OUI[] = {0x00, 0x50, 0xf2, 0x02}; const u8 WMM_OUI[] = {0x00, 0x50, 0xf2, 0x02};
u8 WPS_OUI[] = {0x00, 0x50, 0xf2, 0x04}; const u8 WPS_OUI[] = {0x00, 0x50, 0xf2, 0x04};
u8 P2P_OUI[] = {0x50, 0x6F, 0x9A, 0x09}; const u8 P2P_OUI[] = {0x50, 0x6F, 0x9A, 0x09};
u8 WMM_PARA_OUI[] = {0x00, 0x50, 0xf2, 0x02, 0x01, 0x01}; const u8 WMM_PARA_OUI[] = {0x00, 0x50, 0xf2, 0x02, 0x01, 0x01};
u8 WPA_TKIP_CIPHER[4] = {0x00, 0x50, 0xf2, 0x02}; const u8 WPA_TKIP_CIPHER[4] = {0x00, 0x50, 0xf2, 0x02};
u8 RSN_TKIP_CIPHER[4] = {0x00, 0x0f, 0xac, 0x02}; const u8 RSN_TKIP_CIPHER[4] = {0x00, 0x0f, 0xac, 0x02};
/******************************************************** /********************************************************
MCS rate definitions MCS rate definitions

26
drivers/staging/rtl8188eu/core/rtw_wlan_util.c
View File

@ -12,18 +12,18 @@
#include <drv_types.h> #include <drv_types.h>
#include <wifi.h> #include <wifi.h>
static u8 ARTHEROS_OUI1[] = {0x00, 0x03, 0x7f}; static const u8 ARTHEROS_OUI1[] = {0x00, 0x03, 0x7f};
static u8 ARTHEROS_OUI2[] = {0x00, 0x13, 0x74}; static const u8 ARTHEROS_OUI2[] = {0x00, 0x13, 0x74};
static u8 BROADCOM_OUI1[] = {0x00, 0x10, 0x18}; static const u8 BROADCOM_OUI1[] = {0x00, 0x10, 0x18};
static u8 BROADCOM_OUI2[] = {0x00, 0x0a, 0xf7}; static const u8 BROADCOM_OUI2[] = {0x00, 0x0a, 0xf7};
static u8 CISCO_OUI[] = {0x00, 0x40, 0x96}; static const u8 CISCO_OUI[] = {0x00, 0x40, 0x96};
static u8 MARVELL_OUI[] = {0x00, 0x50, 0x43}; static const u8 MARVELL_OUI[] = {0x00, 0x50, 0x43};
static u8 RALINK_OUI[] = {0x00, 0x0c, 0x43}; static const u8 RALINK_OUI[] = {0x00, 0x0c, 0x43};
static u8 REALTEK_OUI[] = {0x00, 0xe0, 0x4c}; static const u8 REALTEK_OUI[] = {0x00, 0xe0, 0x4c};
static u8 AIRGOCAP_OUI[] = {0x00, 0x0a, 0xf5}; static const u8 AIRGOCAP_OUI[] = {0x00, 0x0a, 0xf5};
static u8 EPIGRAM_OUI[] = {0x00, 0x90, 0x4c}; static const u8 EPIGRAM_OUI[] = {0x00, 0x90, 0x4c};
u8 REALTEK_96B_IE[] = {0x00, 0xe0, 0x4c, 0x02, 0x01, 0x20}; u8 REALTEK_96B_IE[] = {0x00, 0xe0, 0x4c, 0x02, 0x01, 0x20};
@ -33,20 +33,20 @@ u8 REALTEK_96B_IE[] = {0x00, 0xe0, 0x4c, 0x02, 0x01, 0x20};
#define WAIT_FOR_BCN_TO_MIN (6000) #define WAIT_FOR_BCN_TO_MIN (6000)
#define WAIT_FOR_BCN_TO_MAX (20000) #define WAIT_FOR_BCN_TO_MAX (20000)
static u8 rtw_basic_rate_cck[4] = { static const u8 rtw_basic_rate_cck[4] = {
IEEE80211_CCK_RATE_1MB | IEEE80211_BASIC_RATE_MASK, IEEE80211_CCK_RATE_1MB | IEEE80211_BASIC_RATE_MASK,
IEEE80211_CCK_RATE_2MB | IEEE80211_BASIC_RATE_MASK, IEEE80211_CCK_RATE_2MB | IEEE80211_BASIC_RATE_MASK,
IEEE80211_CCK_RATE_5MB | IEEE80211_BASIC_RATE_MASK, IEEE80211_CCK_RATE_5MB | IEEE80211_BASIC_RATE_MASK,
IEEE80211_CCK_RATE_11MB | IEEE80211_BASIC_RATE_MASK IEEE80211_CCK_RATE_11MB | IEEE80211_BASIC_RATE_MASK
}; };
static u8 rtw_basic_rate_ofdm[3] = { static const u8 rtw_basic_rate_ofdm[3] = {
IEEE80211_OFDM_RATE_6MB | IEEE80211_BASIC_RATE_MASK, IEEE80211_OFDM_RATE_6MB | IEEE80211_BASIC_RATE_MASK,
IEEE80211_OFDM_RATE_12MB | IEEE80211_BASIC_RATE_MASK, IEEE80211_OFDM_RATE_12MB | IEEE80211_BASIC_RATE_MASK,
IEEE80211_OFDM_RATE_24MB | IEEE80211_BASIC_RATE_MASK IEEE80211_OFDM_RATE_24MB | IEEE80211_BASIC_RATE_MASK
}; };
static u8 rtw_basic_rate_mix[7] = { static const u8 rtw_basic_rate_mix[7] = {
IEEE80211_CCK_RATE_1MB | IEEE80211_BASIC_RATE_MASK, IEEE80211_CCK_RATE_1MB | IEEE80211_BASIC_RATE_MASK,
IEEE80211_CCK_RATE_2MB | IEEE80211_BASIC_RATE_MASK, IEEE80211_CCK_RATE_2MB | IEEE80211_BASIC_RATE_MASK,
IEEE80211_CCK_RATE_5MB | IEEE80211_BASIC_RATE_MASK, IEEE80211_CCK_RATE_5MB | IEEE80211_BASIC_RATE_MASK,

4
drivers/staging/rtl8188eu/include/rtw_mlme.h
View File

@ -211,8 +211,8 @@ int hostapd_mode_init(struct adapter *padapter);
void hostapd_mode_unload(struct adapter *padapter); void hostapd_mode_unload(struct adapter *padapter);
#endif #endif
extern u8 WPA_TKIP_CIPHER[4]; extern const u8 WPA_TKIP_CIPHER[4];
extern u8 RSN_TKIP_CIPHER[4]; extern const u8 RSN_TKIP_CIPHER[4];
extern u8 REALTEK_96B_IE[]; extern u8 REALTEK_96B_IE[];
extern const u8 MCS_rate_1R[16]; extern const u8 MCS_rate_1R[16];

10
drivers/staging/rtl8188eu/include/rtw_mlme_ext.h
View File

@ -81,12 +81,12 @@
#define _54M_RATE_ 11 #define _54M_RATE_ 11
extern u8 RTW_WPA_OUI[]; extern const u8 RTW_WPA_OUI[];
extern u8 WMM_OUI[]; extern const u8 WMM_OUI[];
extern u8 WPS_OUI[]; extern const u8 WPS_OUI[];
extern u8 P2P_OUI[]; extern const u8 P2P_OUI[];
extern u8 WMM_PARA_OUI[]; extern const u8 WMM_PARA_OUI[];
/* Channel Plan Type. */ /* Channel Plan Type. */
/* Note: */ /* Note: */