Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[karo-tx-linux.git] / net / ipv6 / proc.c

diff --git a/net/ipv6/proc.c b/net/ipv6/proc.c
index 115cc58898f5ab2e500037408185db62308465f3..f3c1ff4357ff1ac91f5e69c704e03b1e83c0192d 100644 (file)
--- a/net/ipv6/proc.c
+++ b/net/ipv6/proc.c
@@ -251,7 +251,7 @@ static int snmp6_dev_seq_show(struct seq_file *seq, void *v)
 
 static int snmp6_dev_seq_open(struct inode *inode, struct file *file)
 {
-       return single_open(file, snmp6_dev_seq_show, PDE(inode)->data);
+       return single_open(file, snmp6_dev_seq_show, PDE_DATA(inode));
 }
 
 static const struct file_operations snmp6_dev_seq_fops = {
@@ -291,8 +291,7 @@ int snmp6_unregister_dev(struct inet6_dev *idev)
                return -ENOENT;
        if (!idev->stats.proc_dir_entry)
                return -EINVAL;
-       remove_proc_entry(idev->stats.proc_dir_entry->name,
-                         net->mib.proc_net_devsnmp6);
+       proc_remove(idev->stats.proc_dir_entry);
        idev->stats.proc_dir_entry = NULL;
        return 0;
 }