Merge branch 'oprofile-for-tip' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-omap-h63xx.git] / net / ipv6 / proc.c

diff --git a/net/ipv6/proc.c b/net/ipv6/proc.c
index 57640620c1659c0d8fc21c3ab7c310ec619347d4..07f0b76e74270317a747dbe8ee77e86b3a9b1838 100644 (file)
--- a/net/ipv6/proc.c
+++ b/net/ipv6/proc.c
@@ -46,6 +46,19 @@ static int sockstat6_seq_show(struct seq_file *seq, void *v)
        return 0;
 }
 
+static int sockstat6_seq_open(struct inode *inode, struct file *file)
+{
+       return single_open_net(inode, file, sockstat6_seq_show);
+}
+
+static const struct file_operations sockstat6_seq_fops = {
+       .owner   = THIS_MODULE,
+       .open    = sockstat6_seq_open,
+       .read    = seq_read,
+       .llseek  = seq_lseek,
+       .release = single_release_net,
+};
+
 static struct snmp_mib snmp6_ipstats_list[] = {
 /* ipv6 mib according to RFC 2465 */
        SNMP_MIB_ITEM("Ip6InReceives", IPSTATS_MIB_INRECEIVES),
@@ -162,44 +175,52 @@ 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 inet6_dev *idev = (struct inet6_dev *)seq->private;
-
-       if (idev) {
-               seq_printf(seq, "%-32s\t%u\n", "ifIndex", idev->dev->ifindex);
-               snmp6_seq_show_item(seq, (void **)idev->stats.ipv6, snmp6_ipstats_list);
-               snmp6_seq_show_item(seq, (void **)idev->stats.icmpv6, snmp6_icmp6_list);
-               snmp6_seq_show_icmpv6msg(seq, (void **)idev->stats.icmpv6msg);
-       } else {
-               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);
-               snmp6_seq_show_item(seq, (void **)udp_stats_in6, snmp6_udp6_list);
-               snmp6_seq_show_item(seq, (void **)udplite_stats_in6, snmp6_udplite6_list);
-       }
+       struct net *net = (struct net *)seq->private;
+
+       snmp6_seq_show_item(seq, (void **)net->mib.ipv6_statistics,
+                           snmp6_ipstats_list);
+       snmp6_seq_show_item(seq, (void **)net->mib.icmpv6_statistics,
+                           snmp6_icmp6_list);
+       snmp6_seq_show_icmpv6msg(seq, (void **)net->mib.icmpv6msg_statistics);
+       snmp6_seq_show_item(seq, (void **)net->mib.udp_stats_in6,
+                           snmp6_udp6_list);
+       snmp6_seq_show_item(seq, (void **)net->mib.udplite_stats_in6,
+                           snmp6_udplite6_list);
        return 0;
 }
 
-static int sockstat6_seq_open(struct inode *inode, struct file *file)
+static int snmp6_seq_open(struct inode *inode, struct file *file)
 {
-       return single_open_net(inode, file, sockstat6_seq_show);
+       return single_open_net(inode, file, snmp6_seq_show);
 }
 
-static const struct file_operations sockstat6_seq_fops = {
+static const struct file_operations snmp6_seq_fops = {
        .owner   = THIS_MODULE,
-       .open    = sockstat6_seq_open,
+       .open    = snmp6_seq_open,
        .read    = seq_read,
        .llseek  = seq_lseek,
        .release = single_release_net,
 };
 
-static int snmp6_seq_open(struct inode *inode, struct file *file)
+static int snmp6_dev_seq_show(struct seq_file *seq, void *v)
+{
+       struct inet6_dev *idev = (struct inet6_dev *)seq->private;
+
+       seq_printf(seq, "%-32s\t%u\n", "ifIndex", idev->dev->ifindex);
+       snmp6_seq_show_item(seq, (void **)idev->stats.ipv6, snmp6_ipstats_list);
+       snmp6_seq_show_item(seq, (void **)idev->stats.icmpv6, snmp6_icmp6_list);
+       snmp6_seq_show_icmpv6msg(seq, (void **)idev->stats.icmpv6msg);
+       return 0;
+}
+
+static int snmp6_dev_seq_open(struct inode *inode, struct file *file)
 {
-       return single_open(file, snmp6_seq_show, PDE(inode)->data);
+       return single_open(file, snmp6_dev_seq_show, PDE(inode)->data);
 }
 
-static const struct file_operations snmp6_seq_fops = {
+static const struct file_operations snmp6_dev_seq_fops = {
        .owner   = THIS_MODULE,
-       .open    = snmp6_seq_open,
+       .open    = snmp6_dev_seq_open,
        .read    = seq_read,
        .llseek  = seq_lseek,
        .release = single_release,
@@ -214,14 +235,12 @@ int snmp6_register_dev(struct inet6_dev *idev)
                return -EINVAL;
 
        net = dev_net(idev->dev);
-       if (!net_eq(net, &init_net))
-               return 0;
-
        if (!net->mib.proc_net_devsnmp6)
                return -ENOENT;
 
        p = proc_create_data(idev->dev->name, S_IRUGO,
-                            net->mib.proc_net_devsnmp6, &snmp6_seq_fops, idev);
+                            net->mib.proc_net_devsnmp6,
+                            &snmp6_dev_seq_fops, idev);
        if (!p)
                return -ENOMEM;