diff --git a/[refs] b/[refs] index e9b1feca3d0b..75de615b7b48 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7bd86cc282a458b66c41e3f6676de6656c99b8db +refs/heads/master: 4855d6f3116e891b66198838b683dce3dcf6e874 diff --git a/trunk/net/ipv6/proc.c b/trunk/net/ipv6/proc.c index da2e92d05c15..745a32042950 100644 --- a/trunk/net/ipv6/proc.c +++ b/trunk/net/ipv6/proc.c @@ -307,10 +307,10 @@ static int __net_init ipv6_proc_init_net(struct net *net) goto proc_dev_snmp6_fail; return 0; +proc_dev_snmp6_fail: + proc_net_remove(net, "snmp6"); proc_snmp6_fail: proc_net_remove(net, "sockstat6"); -proc_dev_snmp6_fail: - proc_net_remove(net, "dev_snmp6"); return -ENOMEM; }