From a83bdc726d85addf305aee7240594f44280ec0a4 Mon Sep 17 00:00:00 2001 From: "Denis V. Lunev" Date: Tue, 7 Oct 2008 14:47:37 -0700 Subject: [PATCH] --- yaml --- r: 112035 b: refs/heads/master c: 2b4209e4b7ba9c7d70910a665ae4b60d49b75fcd h: refs/heads/master i: 112033: 577803ad9e6e2d3ab945a4c31ce73337970d2577 112031: 68fc038581be9444053bbfad8fa0462676e1051d v: v3 --- [refs] | 2 +- trunk/net/ipv6/proc.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7abca28d4de8..52149ecf6aa6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7b43ccecc77480353a5657d993d671cae9e94efd +refs/heads/master: 2b4209e4b7ba9c7d70910a665ae4b60d49b75fcd diff --git a/trunk/net/ipv6/proc.c b/trunk/net/ipv6/proc.c index 7601f56ce915..c38c9e55406b 100644 --- a/trunk/net/ipv6/proc.c +++ b/trunk/net/ipv6/proc.c @@ -175,6 +175,8 @@ snmp6_seq_show_item(struct seq_file *seq, void **mib, struct snmp_mib *itemlist) static int snmp6_seq_show(struct seq_file *seq, void *v) { + struct net *net = (struct net *)seq->private; + snmp6_seq_show_item(seq, (void **)ipv6_statistics, snmp6_ipstats_list); snmp6_seq_show_item(seq, (void **)icmpv6_statistics, snmp6_icmp6_list); snmp6_seq_show_icmpv6msg(seq, (void **)icmpv6msg_statistics); @@ -185,7 +187,7 @@ static int snmp6_seq_show(struct seq_file *seq, void *v) static int snmp6_seq_open(struct inode *inode, struct file *file) { - return single_open(file, snmp6_seq_show, NULL); + return single_open_net(inode, file, snmp6_seq_show); } static const struct file_operations snmp6_seq_fops = { @@ -193,7 +195,7 @@ static const struct file_operations snmp6_seq_fops = { .open = snmp6_seq_open, .read = seq_read, .llseek = seq_lseek, - .release = single_release, + .release = single_release_net, }; static int snmp6_dev_seq_show(struct seq_file *seq, void *v)