summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJon Mason <jon.mason@exar.com>2010-12-10 16:40:02 +0100
committerDavid S. Miller <davem@davemloft.net>2010-12-11 20:46:36 +0100
commitc0dbf37e78c5c1e3e6cfeb39de30518fdde33e83 (patch)
treebe7917ef93b65a2f0bd5b5b5efeca7caa6ccc095 /drivers
parents2io: rx_ring_sz bounds checking (diff)
downloadlinux-c0dbf37e78c5c1e3e6cfeb39de30518fdde33e83.tar.xz
linux-c0dbf37e78c5c1e3e6cfeb39de30518fdde33e83.zip
s2io: make strings at tables const
Put immutable data in read/only section. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: Jon Mason <jon.mason@exar.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/s2io.c8
-rw-r--r--drivers/net/s2io.h4
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index a6d3eaf44863..6a87b8c69b78 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -91,11 +91,11 @@
#define DRV_VERSION "2.0.26.27"
/* S2io Driver name & version. */
-static char s2io_driver_name[] = "Neterion";
-static char s2io_driver_version[] = DRV_VERSION;
+static const char s2io_driver_name[] = "Neterion";
+static const char s2io_driver_version[] = DRV_VERSION;
-static int rxd_size[2] = {32, 48};
-static int rxd_count[2] = {127, 85};
+static const int rxd_size[2] = {32, 48};
+static const int rxd_count[2] = {127, 85};
static inline int RXD_IS_UP2DT(struct RxD_t *rxdp)
{
diff --git a/drivers/net/s2io.h b/drivers/net/s2io.h
index 1671443b3c0e..7d160306b651 100644
--- a/drivers/net/s2io.h
+++ b/drivers/net/s2io.h
@@ -360,7 +360,7 @@ struct stat_block {
#define MAX_TX_DESC (MAX_AVAILABLE_TXDS)
/* FIFO mappings for all possible number of fifos configured */
-static int fifo_map[][MAX_TX_FIFOS] = {
+static const int fifo_map[][MAX_TX_FIFOS] = {
{0, 0, 0, 0, 0, 0, 0, 0},
{0, 0, 0, 0, 1, 1, 1, 1},
{0, 0, 0, 1, 1, 1, 2, 2},
@@ -371,7 +371,7 @@ static int fifo_map[][MAX_TX_FIFOS] = {
{0, 1, 2, 3, 4, 5, 6, 7},
};
-static u16 fifo_selector[MAX_TX_FIFOS] = {0, 1, 3, 3, 7, 7, 7, 7};
+static const u16 fifo_selector[MAX_TX_FIFOS] = {0, 1, 3, 3, 7, 7, 7, 7};
/* Maintains Per FIFO related information. */
struct tx_fifo_config {