Merge tag 'v3.10.95' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / net / core / sock.c

diff --git a/net/core/sock.c b/net/core/sock.c
index 8471951938623f553a86047048b548bc2fdacf79..66e2ab8888eece6be9ff5cba28c45f08f2889e21 100644 (file)
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -423,8 +423,6 @@ static void sock_warn_obsolete_bsdism(const char *name)
        }
 }
 
-#define SK_FLAGS_TIMESTAMP ((1UL << SOCK_TIMESTAMP) | (1UL << SOCK_TIMESTAMPING_RX_SOFTWARE))
-
 static void sock_disable_timestamp(struct sock *sk, unsigned long flags)
 {
        if (sk->sk_flags & flags) {