diff options
| author | Mark Brown <broonie@kernel.org> | 2016-02-05 19:31:44 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-02-05 19:31:44 +0000 |
| commit | af1d34c770588a9ec6041292b7cd08e2fbc4f3a3 (patch) | |
| tree | f331af86ca3192aaf0a506fb4c55b05db07a1eb1 /include/net/sock.h | |
| parent | c228c8e94b9e56032d475abc8f5978a73ac3f699 (diff) | |
| parent | 757bcff73ad4726504a3f40d12a970a593249350 (diff) | |
Merge tag 'v3.14.60' into linux-linaro-lsk-v3.14lsk-v3.14-16.02
This is the 3.14.60 stable release
# gpg: Signature made Fri 29 Jan 2016 06:00:43 GMT using RSA key ID 6092693E
# gpg: Good signature from "Greg Kroah-Hartman (Linux kernel stable release signing key) <greg@kroah.com>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 647F 2865 4894 E3BD 4571 99BE 38DB BDC8 6092 693E
Diffstat (limited to 'include/net/sock.h')
| -rw-r--r-- | include/net/sock.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index ff4f825647a5..031717ab68cb 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -374,6 +374,7 @@ struct sock { sk_no_check : 2, sk_userlocks : 4, sk_protocol : 8, +#define SK_PROTOCOL_MAX U8_MAX sk_type : 16; kmemcheck_bitfield_end(flags); int sk_wmem_queued; @@ -700,6 +701,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; |