Commit 5833929c authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by David S. Miller
Browse files

net: constify MIB name tables 



Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 81c1ebfc

include/net/snmp.h

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
 *  - name of entries.

 */

struct snmp_mib {

	char *name;

	const char *name;

	int entry;

};

net/ipv4/proc.c

+2 −2
Original line number Diff line number Diff line
@@ -127,8 +127,8 @@ static const struct snmp_mib snmp4_ipextstats_list[] = { 
	SNMP_MIB_SENTINEL

};



static struct {

	char *name;

static const struct {

	const char *name;

	int index;

} icmpmibmap[] = {

	{ "DestUnreachs", ICMP_DEST_UNREACH },

net/ipv6/proc.c

+6 −6
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ static const struct file_operations sockstat6_seq_fops = { 
	.release = single_release_net,

};



static struct snmp_mib snmp6_ipstats_list[] = {

static const struct snmp_mib snmp6_ipstats_list[] = {

/* ipv6 mib according to RFC 2465 */

	SNMP_MIB_ITEM("Ip6InReceives", IPSTATS_MIB_INPKTS),

	SNMP_MIB_ITEM("Ip6InHdrErrors", IPSTATS_MIB_INHDRERRORS),
@@ -92,7 +92,7 @@ static struct snmp_mib snmp6_ipstats_list[] = { 
	SNMP_MIB_SENTINEL

};



static struct snmp_mib snmp6_icmp6_list[] = {

static const struct snmp_mib snmp6_icmp6_list[] = {

/* icmpv6 mib according to RFC 2466 */

	SNMP_MIB_ITEM("Icmp6InMsgs", ICMP6_MIB_INMSGS),

	SNMP_MIB_ITEM("Icmp6InErrors", ICMP6_MIB_INERRORS),
@@ -120,7 +120,7 @@ static const char *const icmp6type2name[256] = { 
};





static struct snmp_mib snmp6_udp6_list[] = {

static const struct snmp_mib snmp6_udp6_list[] = {

	SNMP_MIB_ITEM("Udp6InDatagrams", UDP_MIB_INDATAGRAMS),

	SNMP_MIB_ITEM("Udp6NoPorts", UDP_MIB_NOPORTS),

	SNMP_MIB_ITEM("Udp6InErrors", UDP_MIB_INERRORS),
@@ -128,7 +128,7 @@ static struct snmp_mib snmp6_udp6_list[] = { 
	SNMP_MIB_SENTINEL

};



static struct snmp_mib snmp6_udplite6_list[] = {

static const struct snmp_mib snmp6_udplite6_list[] = {

	SNMP_MIB_ITEM("UdpLite6InDatagrams", UDP_MIB_INDATAGRAMS),

	SNMP_MIB_ITEM("UdpLite6NoPorts", UDP_MIB_NOPORTS),

	SNMP_MIB_ITEM("UdpLite6InErrors", UDP_MIB_INERRORS),
@@ -170,8 +170,8 @@ static void snmp6_seq_show_icmpv6msg(struct seq_file *seq, void **mib) 
	return;

}



static inline void

snmp6_seq_show_item(struct seq_file *seq, void **mib, struct snmp_mib *itemlist)

static void snmp6_seq_show_item(struct seq_file *seq, void **mib,

				const struct snmp_mib *itemlist)

{

	int i;

	for (i=0; itemlist[i].name; i++)

net/sctp/proc.c

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
#include <net/sctp/sctp.h>

#include <net/ip.h> /* for snmp_fold_field */



static struct snmp_mib sctp_snmp_list[] = {

static const struct snmp_mib sctp_snmp_list[] = {

	SNMP_MIB_ITEM("SctpCurrEstab", SCTP_MIB_CURRESTAB),

	SNMP_MIB_ITEM("SctpActiveEstabs", SCTP_MIB_ACTIVEESTABS),

	SNMP_MIB_ITEM("SctpPassiveEstabs", SCTP_MIB_PASSIVEESTABS),

net/xfrm/xfrm_proc.c

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
#include <net/snmp.h>

#include <net/xfrm.h>



static struct snmp_mib xfrm_mib_list[] = {

static const struct snmp_mib xfrm_mib_list[] = {

	SNMP_MIB_ITEM("XfrmInError", LINUX_MIB_XFRMINERROR),

	SNMP_MIB_ITEM("XfrmInBufferError", LINUX_MIB_XFRMINBUFFERERROR),

	SNMP_MIB_ITEM("XfrmInHdrError", LINUX_MIB_XFRMINHDRERROR),