]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commit
tcp: Avoid preprocessor directives in tracepoint macro args
authorMat Martineau <mathew.j.martineau@linux.intel.com>
Thu, 21 Dec 2017 18:29:09 +0000 (10:29 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 26 Dec 2017 22:25:22 +0000 (17:25 -0500)
commit6a6b0b9914e73a8a54253dd5f6f5e5dd5e4a756c
tree4b234f7585bf2dc12c0a6656e97073f215c1e4d1
parent3a33a19bf88cdfc6d982972bc6ffcf7a62c1015e
tcp: Avoid preprocessor directives in tracepoint macro args

Using a preprocessor directive to check for CONFIG_IPV6 in the middle of
a DECLARE_EVENT_CLASS macro's arg list causes sparse to report a series
of errors:

./include/trace/events/tcp.h:68:1: error: directive in argument list
./include/trace/events/tcp.h:75:1: error: directive in argument list
./include/trace/events/tcp.h:144:1: error: directive in argument list
./include/trace/events/tcp.h:151:1: error: directive in argument list
./include/trace/events/tcp.h:216:1: error: directive in argument list
./include/trace/events/tcp.h:223:1: error: directive in argument list
./include/trace/events/tcp.h:274:1: error: directive in argument list
./include/trace/events/tcp.h:281:1: error: directive in argument list

Once sparse finds an error, it stops printing warnings for the file it
is checking. This masks any sparse warnings that would normally be
reported for the core TCP code.

Instead, handle the preprocessor conditionals in a couple of auxiliary
macros. This also has the benefit of reducing duplicate code.

Cc: David Ahern <dsahern@gmail.com>
Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/trace/events/tcp.h