Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1315635 > unrolled thread

[PATCH 2.6.32 11/42] net: fix warnings in make htmldocs by moving macro definition out of field declaration

Started byWilly Tarreau <w@1wt.eu>
First post2016-01-23 16:00 +0100
Last post2016-01-23 16:00 +0100
Articles 1 — 1 participant

Back to article view | Back to linux.kernel

This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by below is the oldest one visible, not the original post.


Contents

  [PATCH 2.6.32 11/42] net: fix warnings in make htmldocs by moving macro  definition out of field declaration Willy Tarreau <w@1wt.eu> - 2016-01-23 16:00 +0100

#1315635 — [PATCH 2.6.32 11/42] net: fix warnings in make htmldocs by moving macro definition out of field declaration

FromWilly Tarreau <w@1wt.eu>
Date2016-01-23 16:00 +0100
Subject[PATCH 2.6.32 11/42] net: fix warnings in make htmldocs by moving macro definition out of field declaration
Message-ID<qU7Pt-48H-35@gated-at.bofh.it>
2.6.32-longterm review patch.  If anyone has any objections, please let me know.

------------------

From: Hannes Frederic Sowa <hannes@stressinduktion.org>

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>
---
 include/net/sock.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/net/sock.h b/include/net/sock.h
index 0de7d22..44d6be8 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;
-- 
1.7.12.2.21.g234cd45.dirty

[toc] | [standalone]


Back to top | Article view | linux.kernel


csiph-web