vti6: Don't unregister pernet ops twice on init errors

[deliverable/linux.git] / net / socket.c

diff --git a/net/socket.c b/net/socket.c
index f25eaa30b6907dd9d8c332c54a05cc38c843f7ff..1b1e7e6a960faae2bf7e4aa2625a2cebc2d49a20 100644 (file)
--- a/net/socket.c
+++ b/net/socket.c
@@ -72,6 +72,7 @@
 #include <linux/if_bridge.h>
 #include <linux/if_frad.h>
 #include <linux/if_vlan.h>
+#include <linux/ptp_classify.h>
 #include <linux/init.h>
 #include <linux/poll.h>
 #include <linux/cache.h>
@@ -2685,9 +2686,7 @@ static int __init sock_init(void)
                goto out;
 #endif
 
-#ifdef CONFIG_NETWORK_PHY_TIMESTAMPING
-       skb_timestamping_init();
-#endif
+       ptp_classifier_init();
 
 out:
        return err;