diff options
| author | Hannes Frederic Sowa <hannes@stressinduktion.org> | 2015-12-14 23:30:43 +0100 |
|---|---|---|
| committer | Willy Tarreau <w@1wt.eu> | 2016-01-29 22:12:42 +0100 |
| commit | 073a63f16e3f34ef520270d998d2afea9b79d35f (patch) | |
| tree | 64a02bb439ddf5316df15d60029fc8e1eab150d1 | |
| parent | be9b6c294668e0686e8ac69f617c6c1963a91472 (diff) | |
| download | linux-stable-073a63f16e3f34ef520270d998d2afea9b79d35f.tar.gz linux-stable-073a63f16e3f34ef520270d998d2afea9b79d35f.tar.bz2 linux-stable-073a63f16e3f34ef520270d998d2afea9b79d35f.zip | |
net: fix warnings in 'make htmldocs' by moving macro definition out of field declaration
commit 7bbadd2d1009575dad675afc16650ebb5aa10612 upstream.
Docbook does not like the definition of macros inside a field declaration
and adds a warning. Move the definition out.
Fixes: 79462ad02e86180 ("net: add validation for the socket syscall protocol argument")
Reported-by: kbuild test robot <lkp@intel.com>
Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
[bwh: Backported to 3.2: keep open-coding U8_MAX]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
(cherry picked from commit 35da6d62b608fd3beb576d72e48e2bc866d714c9)
[wt: adjusted context]
Signed-off-by: Willy Tarreau <w@1wt.eu>
| -rw-r--r-- | include/net/sock.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index 0de7d227704f..44d6be82e157 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -230,8 +230,8 @@ struct sock { sk_no_check : 2, sk_userlocks : 4, sk_protocol : 8, -#define SK_PROTOCOL_MAX ((u8)~0U) sk_type : 16; +#define SK_PROTOCOL_MAX ((u8)~0U) kmemcheck_bitfield_end(flags); int sk_rcvbuf; socket_lock_t sk_lock; |