diff --git a/[refs] b/[refs] index ed0a669835b6..2b99918b75c4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d5bb306b42e39ffecaf85d1f9d04a3b5d9a97c86 +refs/heads/master: 2396a22e0989df6038996506bfbf7a57f116c299 diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c index f27d4ab181e6..4317c1be4d3f 100644 --- a/trunk/net/core/dev.c +++ b/trunk/net/core/dev.c @@ -2377,9 +2377,9 @@ static int __init dev_proc_init(void) out: return rc; out_softnet: - proc_net_remove("softnet_stat"); -out_dev2: proc_net_remove("ptype"); +out_dev2: + proc_net_remove("softnet_stat"); out_dev: proc_net_remove("dev"); goto out;