Commit c0dbf37e authored by Jon Mason's avatar Jon Mason Committed by David S. Miller
Browse files

s2io: make strings at tables const 



Put immutable data in read/only section.

Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarJon Mason <jon.mason@exar.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1853e2e1

drivers/net/s2io.c

+4 −4
Original line number Diff line number Diff line
@@ -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)

{

drivers/net/s2io.h

+2 −2
Original line number Diff line number Diff line
@@ -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 {