aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Dumazet <eric.dumazet@gmail.com>2012-01-17 07:45:36 -0500
committerDavid S. Miller <davem@davemloft.net>2012-01-17 23:56:18 -0500
commit766e9f1be128bcdc15aa7d07084d0d51e873b5ed (patch)
tree4b6098567a7f522792333d4bf30dc5676a507b9c
parent10ec1bb7e9eb462548f14dd53c73e927a3ddf31c (diff)
ipv6: fix per device IP snmp counters
In commit 4ce3c183fca (snmp: 64bit ipstats_mib for all arches), I forgot to change the /proc/net/dev_snmp6/xxx output for IP counters. percpu array is 64bit per counter but the folding still used the 'long' variant, and output garbage on 32bit arches. Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/ipv6/proc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/proc.c b/net/ipv6/proc.c
index fdeb6d03da81..da2e92d05c15 100644
--- a/net/ipv6/proc.c
+++ b/net/ipv6/proc.c
@@ -237,8 +237,8 @@ static int snmp6_dev_seq_show(struct seq_file *seq, void *v)
237 struct inet6_dev *idev = (struct inet6_dev *)seq->private; 237 struct inet6_dev *idev = (struct inet6_dev *)seq->private;
238 238
239 seq_printf(seq, "%-32s\t%u\n", "ifIndex", idev->dev->ifindex); 239 seq_printf(seq, "%-32s\t%u\n", "ifIndex", idev->dev->ifindex);
240 snmp6_seq_show_item(seq, (void __percpu **)idev->stats.ipv6, NULL, 240 snmp6_seq_show_item64(seq, (void __percpu **)idev->stats.ipv6,
241 snmp6_ipstats_list); 241 snmp6_ipstats_list, offsetof(struct ipstats_mib, syncp));
242 snmp6_seq_show_item(seq, NULL, idev->stats.icmpv6dev->mibs, 242 snmp6_seq_show_item(seq, NULL, idev->stats.icmpv6dev->mibs,
243 snmp6_icmp6_list); 243 snmp6_icmp6_list);
244 snmp6_seq_show_icmpv6msg(seq, idev->stats.icmpv6msgdev->mibs); 244 snmp6_seq_show_icmpv6msg(seq, idev->stats.icmpv6msgdev->mibs);