diff options
| author | David S. Miller <davem@davemloft.net> | 2015-12-05 22:23:23 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-12-05 22:23:23 -0500 |
| commit | ef3f9569e9de3b1c523c401c8291c5a0ed2a3f55 (patch) | |
| tree | ad426ebf6b714b6cffa20281d789ef488b812d7c /include | |
| parent | c5fb8caaf91ea6a92920cf24db10cfc94d58de0f (diff) | |
| parent | 50a5ffb1ef535e3c6989711c51b5d61b543a3b45 (diff) | |
Merge branch 'sctp-timestamp-fixes'
Marcelo Ricardo Leitner says:
====================
sctp: packet timestamp fixes
These a couple of fixes regarding sctp/packet timestamps.
Dmitry Vyukov <dvyukov@google.com> reported the counter leak on missing
net_enable_timestamp() (2nd patch) and further testing here revealed the
other two issues.
Please consider these to -stable.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/sock.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index 52d27ee924f4..b1d475b5db68 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -740,6 +740,8 @@ enum sock_flags { SOCK_SELECT_ERR_QUEUE, /* Wake select on error queue */ }; +#define SK_FLAGS_TIMESTAMP ((1UL << SOCK_TIMESTAMP) | (1UL << SOCK_TIMESTAMPING_RX_SOFTWARE)) + static inline void sock_copy_flags(struct sock *nsk, struct sock *osk) { nsk->sk_flags = osk->sk_flags; |