From ab2161a0a078e7c600b0b6434ec071b72d76608f Mon Sep 17 00:00:00 2001 From: Mike McCormack Date: Mon, 26 Jul 2010 22:57:24 +0900 Subject: [PATCH 451/524] staging: rtl8192e: Make some static structs const Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8192e/r8192E_core.c | 2 +- drivers/staging/rtl8192e/r8192E_dm.c | 12 ++++++------ drivers/staging/rtl8192e/r8192E_wx.c | 2 +- drivers/staging/rtl8192e/r819xE_phy.c | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/staging/rtl8192e/r8192E_core.c b/drivers/staging/rtl8192e/r8192E_core.c index ef0adad..c69fcc7 100644 --- a/drivers/staging/rtl8192e/r8192E_core.c +++ b/drivers/staging/rtl8192e/r8192E_core.c @@ -163,7 +163,7 @@ typedef struct _CHANNEL_LIST u8 Len; }CHANNEL_LIST, *PCHANNEL_LIST; -static CHANNEL_LIST ChannelPlan[] = { +static const CHANNEL_LIST ChannelPlan[] = { {{1,2,3,4,5,6,7,8,9,10,11,36,40,44,48,52,56,60,64,149,153,157,161,165},24}, //FCC {{1,2,3,4,5,6,7,8,9,10,11},11}, //IC {{1,2,3,4,5,6,7,8,9,10,11,12,13,36,40,44,48,52,56,60,64},21}, //ETSI diff --git a/drivers/staging/rtl8192e/r8192E_dm.c b/drivers/staging/rtl8192e/r8192E_dm.c index a249f00..05fe798 100644 --- a/drivers/staging/rtl8192e/r8192E_dm.c +++ b/drivers/staging/rtl8192e/r8192E_dm.c @@ -26,20 +26,20 @@ Major Change History: // Indicate different AP vendor for IOT issue. // #ifdef RTL8190P -static u32 edca_setting_DL[HT_IOT_PEER_MAX] = +static const u32 edca_setting_DL[HT_IOT_PEER_MAX] = { 0x5e4322, 0x5e4322, 0x5e4322, 0x604322, 0xa44f, 0x5e4322, 0x5e4322}; -static u32 edca_setting_UL[HT_IOT_PEER_MAX] = +static const u32 edca_setting_UL[HT_IOT_PEER_MAX] = { 0x5e4322, 0xa44f, 0x5e4322, 0x604322, 0x5e4322, 0x5e4322, 0x5e4322}; #else #ifdef RTL8192E -static u32 edca_setting_DL[HT_IOT_PEER_MAX] = +static const u32 edca_setting_DL[HT_IOT_PEER_MAX] = { 0x5e4322, 0x5e4322, 0x5e4322, 0x604322, 0xa44f, 0x5e4322, 0x5e4322}; -static u32 edca_setting_UL[HT_IOT_PEER_MAX] = +static const u32 edca_setting_UL[HT_IOT_PEER_MAX] = { 0x5e4322, 0xa44f, 0x5e4322, 0x604322, 0x5e4322, 0x5e4322, 0x5e4322}; #else -static u32 edca_setting_DL[HT_IOT_PEER_MAX] = +static const u32 edca_setting_DL[HT_IOT_PEER_MAX] = { 0x5e4322, 0x5e4322, 0x5e4322, 0x604322, 0xa44f, 0x5ea44f, 0x5e4322}; -static u32 edca_setting_UL[HT_IOT_PEER_MAX] = +static const u32 edca_setting_UL[HT_IOT_PEER_MAX] = { 0x5e4322, 0xa44f, 0x5e4322, 0x604322, 0x5ea44f, 0x5ea44f, 0x5e4322}; #endif #endif diff --git a/drivers/staging/rtl8192e/r8192E_wx.c b/drivers/staging/rtl8192e/r8192E_wx.c index 0b0f39c..235b686 100644 --- a/drivers/staging/rtl8192e/r8192E_wx.c +++ b/drivers/staging/rtl8192e/r8192E_wx.c @@ -26,7 +26,7 @@ #endif #define RATE_COUNT 12 -static u32 rtl8180_rates[] = {1000000,2000000,5500000,11000000, +static const u32 rtl8180_rates[] = {1000000,2000000,5500000,11000000, 6000000,9000000,12000000,18000000,24000000,36000000,48000000,54000000}; diff --git a/drivers/staging/rtl8192e/r819xE_phy.c b/drivers/staging/rtl8192e/r819xE_phy.c index 7bd4fae..ffd1e97 100644 --- a/drivers/staging/rtl8192e/r819xE_phy.c +++ b/drivers/staging/rtl8192e/r819xE_phy.c @@ -7,7 +7,7 @@ #ifdef ENABLE_DOT11D #include "ieee80211/dot11d.h" #endif -static u32 RF_CHANNEL_TABLE_ZEBRA[] = { +static const u32 RF_CHANNEL_TABLE_ZEBRA[] = { 0, 0x085c, //2412 1 0x08dc, //2417 2 -- 1.7.1