summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Hemminger2010-09-02 03:17:21 +0200
committerJohn W. Linville2010-09-07 19:54:33 +0200
commit7a374d8eeb1140c08d215de7a181e595ca606196 (patch)
tree5695b0aa7089f4759066f9e47e2c6606982e48df
parentray_cs: make data const (diff)
downloadkernel-qcow2-linux-7a374d8eeb1140c08d215de7a181e595ca606196.tar.gz
kernel-qcow2-linux-7a374d8eeb1140c08d215de7a181e595ca606196.tar.xz
kernel-qcow2-linux-7a374d8eeb1140c08d215de7a181e595ca606196.zip
airo: make strings const
Make read/only data structures const. Compile tested only. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/airo.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
index 1d05445d4ba3..c7528e5794d1 100644
--- a/drivers/net/wireless/airo.c
+++ b/drivers/net/wireless/airo.c
@@ -105,7 +105,7 @@ static struct pci_driver airo_driver = {
of statistics in the /proc filesystem */
#define IGNLABEL(comment) NULL
-static char *statsLabels[] = {
+static const char *statsLabels[] = {
"RxOverrun",
IGNLABEL("RxPlcpCrcErr"),
IGNLABEL("RxPlcpFormatErr"),
@@ -932,7 +932,7 @@ typedef struct aironet_ioctl {
unsigned char __user *data; // d-data
} aironet_ioctl;
-static char swversion[] = "2.1";
+static const char swversion[] = "2.1";
#endif /* CISCO_EXT */
#define NUM_MODULES 2
@@ -1374,7 +1374,7 @@ static int micsetup(struct airo_info *ai) {
return SUCCESS;
}
-static char micsnap[] = {0xAA,0xAA,0x03,0x00,0x40,0x96,0x00,0x02};
+static const u8 micsnap[] = {0xAA,0xAA,0x03,0x00,0x40,0x96,0x00,0x02};
/*===========================================================================
* Description: Mic a packet
@@ -5024,7 +5024,7 @@ static void proc_config_on_close(struct inode *inode, struct file *file)
airo_config_commit(dev, NULL, NULL, NULL);
}
-static char *get_rmode(__le16 mode)
+static const char *get_rmode(__le16 mode)
{
switch(mode & RXMODE_MASK) {
case RXMODE_RFMON: return "rfmon";