Merge branch 'work.aio-1' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux] / net / ipv6 / raw.c

diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
index 4a73ea1..ce6f0d1 100644 (file)
--- a/net/ipv6/raw.c
+++ b/net/ipv6/raw.c
@@ -1304,21 +1304,10 @@ static const struct seq_operations raw6_seq_ops = {
        .show =         raw6_seq_show,
 };
 
-static int raw6_seq_open(struct inode *inode, struct file *file)
-{
-       return raw_seq_open(inode, file, &raw_v6_hashinfo, &raw6_seq_ops);
-}
-
-static const struct file_operations raw6_seq_fops = {
-       .open =         raw6_seq_open,
-       .read =         seq_read,
-       .llseek =       seq_lseek,
-       .release =      seq_release_net,
-};
-
 static int __net_init raw6_init_net(struct net *net)
 {
-       if (!proc_create("raw6", 0444, net->proc_net, &raw6_seq_fops))
+       if (!proc_create_net_data("raw6", 0444, net->proc_net, &raw6_seq_ops,
+                       sizeof(struct raw_iter_state), &raw_v6_hashinfo))
                return -ENOMEM;
 
        return 0;