[PATCH 3.2 17/70] net: fix warnings in 'make htmldocs' by moving macro definition out of field declaration

From: Ben Hutchings
Date: Sun Jan 17 2016 - 22:32:54 EST

3.2.76-rc1 review patch. If anyone has any objections, please let me know.


From: Hannes Frederic Sowa <hannes@xxxxxxxxxxxxxxxxxxx>

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@xxxxxxxxx>
Signed-off-by: Hannes Frederic Sowa <hannes@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
[bwh: Backported to 3.2: keep open-coding U8_MAX]
Signed-off-by: Ben Hutchings <ben@xxxxxxxxxxxxxxx>
include/net/sock.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -302,8 +302,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)
int sk_wmem_queued;
gfp_t sk_allocation;