diff --git a/[refs] b/[refs] index eb5da9c5c135..276046989da2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1ca518b64b4b5865b677f292322e893fa89997d4 +refs/heads/master: 704da560c0a0120d8869187f511491a00951a1d3 diff --git a/trunk/net/core/sock.c b/trunk/net/core/sock.c index 76ff58d43e26..e1f6f225f012 100644 --- a/trunk/net/core/sock.c +++ b/trunk/net/core/sock.c @@ -1205,6 +1205,10 @@ struct sock *sk_clone(const struct sock *sk, const gfp_t priority) if (newsk->sk_prot->sockets_allocated) percpu_counter_inc(newsk->sk_prot->sockets_allocated); + + if (sock_flag(newsk, SOCK_TIMESTAMP) || + sock_flag(newsk, SOCK_TIMESTAMPING_RX_SOFTWARE)) + net_enable_timestamp(); } out: return newsk;