diff --git a/[refs] b/[refs] index d8483ef7138b..448d29df0a9f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 160f17e345f5b50484d6cdc985b8686a05bf015d +refs/heads/master: 4436f4cbfac15acea139863e322ed2f9efb118d3 diff --git a/trunk/net/ipv6/proc.c b/trunk/net/ipv6/proc.c index 35e502a72495..199ef379e501 100644 --- a/trunk/net/ipv6/proc.c +++ b/trunk/net/ipv6/proc.c @@ -217,12 +217,12 @@ int snmp6_register_dev(struct inet6_dev *idev) if (!proc_net_devsnmp6) return -ENOENT; - p = create_proc_entry(idev->dev->name, S_IRUGO, proc_net_devsnmp6); + p = proc_create(idev->dev->name, S_IRUGO, + proc_net_devsnmp6, &snmp6_seq_fops); if (!p) return -ENOMEM; p->data = idev; - p->proc_fops = &snmp6_seq_fops; idev->stats.proc_dir_entry = p; return 0;