aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJon Mason <jon.mason@exar.com>2010-12-10 10:40:02 -0500
committerDavid S. Miller <davem@davemloft.net>2010-12-11 14:46:36 -0500
commitc0dbf37e78c5c1e3e6cfeb39de30518fdde33e83 (patch)
treebe7917ef93b65a2f0bd5b5b5efeca7caa6ccc095 /drivers
parent1853e2e15dc95ff3430530941b5856581251ef70 (diff)
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 @@
91#define DRV_VERSION "2.0.26.27" 91#define DRV_VERSION "2.0.26.27"
92 92
93/* S2io Driver name & version. */ 93/* S2io Driver name & version. */
94static char s2io_driver_name[] = "Neterion"; 94static const char s2io_driver_name[] = "Neterion";
95static char s2io_driver_version[] = DRV_VERSION; 95static const char s2io_driver_version[] = DRV_VERSION;
96 96
97static int rxd_size[2] = {32, 48}; 97static const int rxd_size[2] = {32, 48};
98static int rxd_count[2] = {127, 85}; 98static const int rxd_count[2] = {127, 85};
99 99
100static inline int RXD_IS_UP2DT(struct RxD_t *rxdp) 100static inline int RXD_IS_UP2DT(struct RxD_t *rxdp)
101{ 101{
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 {
360#define MAX_TX_DESC (MAX_AVAILABLE_TXDS) 360#define MAX_TX_DESC (MAX_AVAILABLE_TXDS)
361 361
362/* FIFO mappings for all possible number of fifos configured */ 362/* FIFO mappings for all possible number of fifos configured */
363static int fifo_map[][MAX_TX_FIFOS] = { 363static const int fifo_map[][MAX_TX_FIFOS] = {
364 {0, 0, 0, 0, 0, 0, 0, 0}, 364 {0, 0, 0, 0, 0, 0, 0, 0},
365 {0, 0, 0, 0, 1, 1, 1, 1}, 365 {0, 0, 0, 0, 1, 1, 1, 1},
366 {0, 0, 0, 1, 1, 1, 2, 2}, 366 {0, 0, 0, 1, 1, 1, 2, 2},
@@ -371,7 +371,7 @@ static int fifo_map[][MAX_TX_FIFOS] = {
371 {0, 1, 2, 3, 4, 5, 6, 7}, 371 {0, 1, 2, 3, 4, 5, 6, 7},
372}; 372};
373 373
374static u16 fifo_selector[MAX_TX_FIFOS] = {0, 1, 3, 3, 7, 7, 7, 7}; 374static const u16 fifo_selector[MAX_TX_FIFOS] = {0, 1, 3, 3, 7, 7, 7, 7};
375 375
376/* Maintains Per FIFO related information. */ 376/* Maintains Per FIFO related information. */
377struct tx_fifo_config { 377struct tx_fifo_config {