From 881a975b6daeedb9a7962fd7b6ceccca422fe51b Mon Sep 17 00:00:00 2001 From: Mike McCormack Date: Mon, 26 Jul 2010 22:58:03 +0900 Subject: [PATCH 454/524] staging: rtl8192e: Make structs const, move prototypes to top Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8192e/r8192E.h | 3 +-- drivers/staging/rtl8192e/r8192E_core.c | 17 +++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/staging/rtl8192e/r8192E.h b/drivers/staging/rtl8192e/r8192E.h index 2d28eec..865cdc0 100644 --- a/drivers/staging/rtl8192e/r8192E.h +++ b/drivers/staging/rtl8192e/r8192E.h @@ -1468,7 +1468,6 @@ typedef union _AC_PARAM{ #endif bool init_firmware(struct net_device *dev); -void rtl819xE_tx_cmd(struct net_device *dev, struct sk_buff *skb); short rtl8192_tx(struct net_device *dev, struct sk_buff* skb); u32 read_cam(struct net_device *dev, u8 addr); void write_cam(struct net_device *dev, u8 addr, u32 data); @@ -1505,7 +1504,7 @@ void rtl8187_set_rxconf(struct net_device *dev); //short check_nic_enough_desc(struct net_device *dev, priority_t priority); void CamResetAllEntry(struct net_device* dev); void EnableHWSecurityConfig8192(struct net_device *dev); -void setKey(struct net_device *dev, u8 EntryNo, u8 KeyIndex, u16 KeyType, u8 *MacAddr, u8 DefaultKey, u32 *KeyContent ); +void setKey(struct net_device *dev, u8 EntryNo, u8 KeyIndex, u16 KeyType, const u8 *MacAddr, u8 DefaultKey, u32 *KeyContent ); void CamPrintDbgReg(struct net_device* dev); extern void dm_cck_txpower_adjust(struct net_device *dev,bool binch14); extern void firmware_init_param(struct net_device *dev); diff --git a/drivers/staging/rtl8192e/r8192E_core.c b/drivers/staging/rtl8192e/r8192E_core.c index 7da6000..f1248fb 100644 --- a/drivers/staging/rtl8192e/r8192E_core.c +++ b/drivers/staging/rtl8192e/r8192E_core.c @@ -97,7 +97,7 @@ u32 rt_global_debug_component = \ .vendor=(vend),.device=(dev),\ .subvendor=PCI_ANY_ID,.subdevice=PCI_ANY_ID #endif -static struct pci_device_id rtl8192_pci_id_tbl[] __devinitdata = { +static const struct pci_device_id rtl8192_pci_id_tbl[] __devinitdata = { #ifdef RTL8190P /* Realtek */ /* Dlink */ @@ -163,6 +163,7 @@ static void rtl8192_irq_tx_tasklet(struct r8192_priv *priv); static void rtl8192_prepare_beacon(struct r8192_priv *priv); static irqreturn_t rtl8192_interrupt(int irq, void *netdev); static void rtl8192_try_wake_queue(struct net_device *dev, int pri); +static void rtl819xE_tx_cmd(struct net_device *dev, struct sk_buff *skb); #ifdef ENABLE_DOT11D @@ -947,7 +948,7 @@ void rtl8192_rx_enable(struct net_device *dev) * HIGH_QUEUE ===> 7 * BEACON_QUEUE ===> 8 * */ -static u32 TX_DESC_BASE[] = {BKQDA, BEQDA, VIQDA, VOQDA, HCCAQDA, CQDA, MQDA, HQDA, BQDA}; +static const u32 TX_DESC_BASE[] = {BKQDA, BEQDA, VIQDA, VOQDA, HCCAQDA, CQDA, MQDA, HQDA, BQDA}; void rtl8192_tx_enable(struct net_device *dev) { struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev); @@ -1123,7 +1124,7 @@ static void rtl8192_reset(struct net_device *dev) } #endif -static u16 rtl_rate[] = {10,20,55,110,60,90,120,180,240,360,480,540}; +static const u16 rtl_rate[] = {10,20,55,110,60,90,120,180,240,360,480,540}; inline u16 rtl8192_rate2rate(short rate) { if (rate >11) return 0; @@ -1993,7 +1994,7 @@ static void rtl8192_update_beacon(struct work_struct * work) /* * background support to run QoS activate functionality */ -static int WDCAPARA_ADD[] = {EDCAPARA_BE,EDCAPARA_BK,EDCAPARA_VI,EDCAPARA_VO}; +static const int WDCAPARA_ADD[] = {EDCAPARA_BE,EDCAPARA_BK,EDCAPARA_VI,EDCAPARA_VO}; static void rtl8192_qos_activate(struct work_struct * work) { struct r8192_priv *priv = container_of(work, struct r8192_priv, qos_activate); @@ -4124,14 +4125,14 @@ static void CamRestoreAllEntry(struct net_device *dev) { u8 EntryId = 0; struct r8192_priv *priv = ieee80211_priv(dev); - u8* MacAddr = priv->ieee80211->current_network.bssid; + const u8* MacAddr = priv->ieee80211->current_network.bssid; - static u8 CAM_CONST_ADDR[4][6] = { + static const u8 CAM_CONST_ADDR[4][6] = { {0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, {0x00, 0x00, 0x00, 0x00, 0x00, 0x01}, {0x00, 0x00, 0x00, 0x00, 0x00, 0x02}, {0x00, 0x00, 0x00, 0x00, 0x00, 0x03}}; - static u8 CAM_CONST_BROAD[] = + static const u8 CAM_CONST_BROAD[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; RT_TRACE(COMP_SEC, "CamRestoreAllEntry: \n"); @@ -6846,7 +6847,7 @@ void setKey( struct net_device *dev, u8 EntryNo, u8 KeyIndex, u16 KeyType, - u8 *MacAddr, + const u8 *MacAddr, u8 DefaultKey, u32 *KeyContent ) { -- 1.7.1