usb: musb: gadget: kill unreachable code in musb_g_rx()

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

diff --git a/net/socket.c b/net/socket.c
index acfa1738663d66faf7f273164ad130a089d1fc9a..2270b941bcc76ec0e52cc0d1321d8572164299e1 100644 (file)
--- a/net/socket.c
+++ b/net/socket.c
@@ -170,15 +170,6 @@ static DEFINE_PER_CPU(int, sockets_in_use);
  * divide and look after the messy bits.
  */
 
-#define MAX_SOCK_ADDR  128             /* 108 for Unix domain -
-                                          16 for IP, 16 for IPX,
-                                          24 for IPv6,
-                                          about 80 for AX.25
-                                          must be at least one bigger than
-                                          the AF_UNIX size (see net/unix/af_unix.c
-                                          :unix_mkname()).
-                                        */
-
 /**
  *     move_addr_to_kernel     -       copy a socket address into kernel space
  *     @uaddr: Address in user space
@@ -2403,6 +2394,10 @@ static int __init sock_init(void)
        netfilter_init();
 #endif
 
+#ifdef CONFIG_NETWORK_PHY_TIMESTAMPING
+       skb_timestamping_init();
+#endif
+
        return 0;
 }