Message ID | 20201027195112.23921-1-ceggers@arri.de |
---|---|
State | Not Applicable |
Delegated to: | David Miller |
Headers | show |
Series | socket: don't clear SOCK_TSTAMP_NEW when SO_TIMESTAMPNS is disabled | expand |
Context | Check | Description |
---|---|---|
jkicinski/tree_selection | success | Guessing tree name failed - patch did not apply |
diff --git a/net/core/sock.c b/net/core/sock.c index 9a186d2ad36d..1eda7337b881 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -923,7 +923,6 @@ int sock_setsockopt(struct socket *sock, int level, int optname, } else { sock_reset_flag(sk, SOCK_RCVTSTAMP); sock_reset_flag(sk, SOCK_RCVTSTAMPNS); - sock_reset_flag(sk, SOCK_TSTAMP_NEW); } break;