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

Commit c9f2dba6 authored by WANG Cong's avatar WANG Cong Committed by David S. Miller
Browse files

snmp: fix some left over of snmp stats 



Fengguang reported the following sparse warning:

>> net/ipv6/proc.c:198:41: sparse: incorrect type in argument 1 (different address spaces)
   net/ipv6/proc.c:198:41:    expected void [noderef] <asn:3>*mib
   net/ipv6/proc.c:198:41:    got void [noderef] <asn:3>**pcpumib

Fixes: commit 698365fa (net: clean up snmp stats code)
Reported-by: default avatarFengguang Wu <fengguang.wu@intel.com>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: default avatarCong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 122ff243

net/ipv6/proc.c

+4 −4
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ static void snmp6_seq_show_icmpv6msg(struct seq_file *seq, atomic_long_t *smib) 
/* can be called either with percpu mib (pcpumib != NULL),

 * or shared one (smib != NULL)

 */

static void snmp6_seq_show_item(struct seq_file *seq, void __percpu **pcpumib,

static void snmp6_seq_show_item(struct seq_file *seq, void __percpu *pcpumib,

				atomic_long_t *smib,

				const struct snmp_mib *itemlist)

{
@@ -217,12 +217,12 @@ static int snmp6_seq_show(struct seq_file *seq, void *v) 


	snmp6_seq_show_item64(seq, net->mib.ipv6_statistics,

			    snmp6_ipstats_list, offsetof(struct ipstats_mib, syncp));

	snmp6_seq_show_item(seq, (void __percpu **)net->mib.icmpv6_statistics,

	snmp6_seq_show_item(seq, net->mib.icmpv6_statistics,

			    NULL, snmp6_icmp6_list);

	snmp6_seq_show_icmpv6msg(seq, net->mib.icmpv6msg_statistics->mibs);

	snmp6_seq_show_item(seq, (void __percpu **)net->mib.udp_stats_in6,

	snmp6_seq_show_item(seq, net->mib.udp_stats_in6,

			    NULL, snmp6_udp6_list);

	snmp6_seq_show_item(seq, (void __percpu **)net->mib.udplite_stats_in6,

	snmp6_seq_show_item(seq, net->mib.udplite_stats_in6,

			    NULL, snmp6_udplite6_list);

	return 0;

}

net/sctp/proc.c

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


	for (i = 0; sctp_snmp_list[i].name != NULL; i++)

		seq_printf(seq, "%-32s\t%ld\n", sctp_snmp_list[i].name,

			   snmp_fold_field((void __percpu **)net->sctp.sctp_statistics,

			   snmp_fold_field(net->sctp.sctp_statistics,

				      sctp_snmp_list[i].entry));



	return 0;