diff options
Diffstat (limited to 'net/ipv4/proc.c')
| -rw-r--r-- | net/ipv4/proc.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/net/ipv4/proc.c b/net/ipv4/proc.c index 3dc9914c1dce..4ae1f203f7cb 100644 --- a/net/ipv4/proc.c +++ b/net/ipv4/proc.c | |||
| @@ -252,6 +252,7 @@ static const struct snmp_mib snmp4_net_list[] = { | |||
| 252 | SNMP_MIB_ITEM("TCPBacklogDrop", LINUX_MIB_TCPBACKLOGDROP), | 252 | SNMP_MIB_ITEM("TCPBacklogDrop", LINUX_MIB_TCPBACKLOGDROP), |
| 253 | SNMP_MIB_ITEM("TCPMinTTLDrop", LINUX_MIB_TCPMINTTLDROP), | 253 | SNMP_MIB_ITEM("TCPMinTTLDrop", LINUX_MIB_TCPMINTTLDROP), |
| 254 | SNMP_MIB_ITEM("TCPDeferAcceptDrop", LINUX_MIB_TCPDEFERACCEPTDROP), | 254 | SNMP_MIB_ITEM("TCPDeferAcceptDrop", LINUX_MIB_TCPDEFERACCEPTDROP), |
| 255 | SNMP_MIB_ITEM("IPReversePathFilter", LINUX_MIB_IPRPFILTER), | ||
| 255 | SNMP_MIB_SENTINEL | 256 | SNMP_MIB_SENTINEL |
| 256 | }; | 257 | }; |
| 257 | 258 | ||
| @@ -342,10 +343,12 @@ static int snmp_seq_show(struct seq_file *seq, void *v) | |||
| 342 | IPV4_DEVCONF_ALL(net, FORWARDING) ? 1 : 2, | 343 | IPV4_DEVCONF_ALL(net, FORWARDING) ? 1 : 2, |
| 343 | sysctl_ip_default_ttl); | 344 | sysctl_ip_default_ttl); |
| 344 | 345 | ||
| 346 | BUILD_BUG_ON(offsetof(struct ipstats_mib, mibs) != 0); | ||
| 345 | for (i = 0; snmp4_ipstats_list[i].name != NULL; i++) | 347 | for (i = 0; snmp4_ipstats_list[i].name != NULL; i++) |
| 346 | seq_printf(seq, " %lu", | 348 | seq_printf(seq, " %llu", |
| 347 | snmp_fold_field((void __percpu **)net->mib.ip_statistics, | 349 | snmp_fold_field64((void __percpu **)net->mib.ip_statistics, |
| 348 | snmp4_ipstats_list[i].entry)); | 350 | snmp4_ipstats_list[i].entry, |
| 351 | offsetof(struct ipstats_mib, syncp))); | ||
| 349 | 352 | ||
| 350 | icmp_put(seq); /* RFC 2011 compatibility */ | 353 | icmp_put(seq); /* RFC 2011 compatibility */ |
| 351 | icmpmsg_put(seq); | 354 | icmpmsg_put(seq); |
| @@ -431,9 +434,10 @@ static int netstat_seq_show(struct seq_file *seq, void *v) | |||
| 431 | 434 | ||
| 432 | seq_puts(seq, "\nIpExt:"); | 435 | seq_puts(seq, "\nIpExt:"); |
| 433 | for (i = 0; snmp4_ipextstats_list[i].name != NULL; i++) | 436 | for (i = 0; snmp4_ipextstats_list[i].name != NULL; i++) |
| 434 | seq_printf(seq, " %lu", | 437 | seq_printf(seq, " %llu", |
| 435 | snmp_fold_field((void __percpu **)net->mib.ip_statistics, | 438 | snmp_fold_field64((void __percpu **)net->mib.ip_statistics, |
| 436 | snmp4_ipextstats_list[i].entry)); | 439 | snmp4_ipextstats_list[i].entry, |
| 440 | offsetof(struct ipstats_mib, syncp))); | ||
| 437 | 441 | ||
| 438 | seq_putc(seq, '\n'); | 442 | seq_putc(seq, '\n'); |
| 439 | return 0; | 443 | return 0; |
