Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9b5b5cff authored by Arjan van de Ven's avatar Arjan van de Ven Committed by David S. Miller
Browse files

[NET]: Add const markers to various variables. 



the patch below marks various variables const in net/; the goal is to
move them to the .rodata section so that they can't false-share
cachelines with things that get written to, as well as potentially
helping gcc a bit with optimisations.  (these were found using a gcc
patch to warn about such variables)

Signed-off-by: default avatarArjan van de Ven <arjan@infradead.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fb296449

net/ipv4/fib_hash.c

+1 −1
Original line number Diff line number Diff line
@@ -975,7 +975,7 @@ static void fib_seq_stop(struct seq_file *seq, void *v) 


static unsigned fib_flag_trans(int type, u32 mask, struct fib_info *fi)

{

	static unsigned type2flags[RTN_MAX + 1] = {

	static const unsigned type2flags[RTN_MAX + 1] = {

		[7] = RTF_REJECT, [8] = RTF_REJECT,

	};

	unsigned flags = type2flags[type];

net/ipv4/fib_semantics.c

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ for (nhsel=0; nhsel < 1; nhsel++) 
#define endfor_nexthops(fi) }





static struct 

static const struct 

{

	int	error;

	u8	scope;

net/ipv4/icmp.c

+2 −2
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ struct icmp_control { 
	short   error;		/* This ICMP is classed as an error message */

};



static struct icmp_control icmp_pointers[NR_ICMP_TYPES+1];

static const struct icmp_control icmp_pointers[NR_ICMP_TYPES+1];



/*

 *	The ICMP socket(s). This is the most convenient way to flow control
@@ -994,7 +994,7 @@ int icmp_rcv(struct sk_buff *skb) 
/*

 *	This table is the definition of how we handle ICMP.

 */

static struct icmp_control icmp_pointers[NR_ICMP_TYPES + 1] = {

static const struct icmp_control icmp_pointers[NR_ICMP_TYPES + 1] = {

	[ICMP_ECHOREPLY] = {

		.output_entry = ICMP_MIB_OUTECHOREPS,

		.input_entry = ICMP_MIB_INECHOREPS,

net/ipv4/ipvs/ip_vs_conn.c

+1 −1
Original line number Diff line number Diff line
@@ -771,7 +771,7 @@ static inline int todrop_entry(struct ip_vs_conn *cp) 
	 * The drop rate array needs tuning for real environments.

	 * Called from timer bh only => no locking

	 */

	static char todrop_rate[9] = {0, 1, 2, 3, 4, 5, 6, 7, 8};

	static const char todrop_rate[9] = {0, 1, 2, 3, 4, 5, 6, 7, 8};

	static char todrop_counter[9] = {0};

	int i;

net/ipv4/ipvs/ip_vs_ctl.c

+2 −2
Original line number Diff line number Diff line
@@ -1909,7 +1909,7 @@ static int ip_vs_set_timeout(struct ip_vs_timeout_user *u) 
#define DAEMON_ARG_LEN		(sizeof(struct ip_vs_daemon_user))

#define MAX_ARG_LEN		SVCDEST_ARG_LEN



static unsigned char set_arglen[SET_CMDID(IP_VS_SO_SET_MAX)+1] = {

static const unsigned char set_arglen[SET_CMDID(IP_VS_SO_SET_MAX)+1] = {

	[SET_CMDID(IP_VS_SO_SET_ADD)]		= SERVICE_ARG_LEN,

	[SET_CMDID(IP_VS_SO_SET_EDIT)]		= SERVICE_ARG_LEN,

	[SET_CMDID(IP_VS_SO_SET_DEL)]		= SERVICE_ARG_LEN,
@@ -2180,7 +2180,7 @@ __ip_vs_get_timeouts(struct ip_vs_timeout_user *u) 
#define GET_TIMEOUT_ARG_LEN	(sizeof(struct ip_vs_timeout_user))

#define GET_DAEMON_ARG_LEN	(sizeof(struct ip_vs_daemon_user) * 2)



static unsigned char get_arglen[GET_CMDID(IP_VS_SO_GET_MAX)+1] = {

static const unsigned char get_arglen[GET_CMDID(IP_VS_SO_GET_MAX)+1] = {

	[GET_CMDID(IP_VS_SO_GET_VERSION)]	= 64,

	[GET_CMDID(IP_VS_SO_GET_INFO)]		= GET_INFO_ARG_LEN,

	[GET_CMDID(IP_VS_SO_GET_SERVICES)]	= GET_SERVICES_ARG_LEN,