net: linux/skbuff.h: combine SKB_EXTENSIONS + KCOV handling
authorRandy Dunlap <rdunlap@infradead.org>
Mon, 16 Nov 2020 21:21:08 +0000 (13:21 -0800)
committerJakub Kicinski <kuba@kernel.org>
Tue, 17 Nov 2020 19:04:55 +0000 (11:04 -0800)
commit97f53a08cba128a724ebbbf34778d3553d559816
treeb0509e559d6f3e0371484fae97dc4e90cd4cbb5a
parent7c3e2b771d79327e434ac7d873f9949a7c5d7b3b
net: linux/skbuff.h: combine SKB_EXTENSIONS + KCOV handling

The previous Kconfig patch led to some other build errors as
reported by the 0day bot and my own overnight build testing.

These are all in <linux/skbuff.h> when KCOV is enabled but
SKB_EXTENSIONS is not enabled, so fix those by combining those conditions
in the header file.

Fixes: 6370cc3bbd8a ("net: add kcov handle to skb extensions")
Fixes: 85ce50d337d1 ("net: kcov: don't select SKB_EXTENSIONS when there is no NET")
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Reported-by: kernel test robot <lkp@intel.com>
Cc: Aleksandr Nogikh <nogikh@google.com>
Cc: Willem de Bruijn <willemb@google.com>
Acked-by: Florian Westphal <fw@strlen.de>
Link: https://lore.kernel.org/r/20201116212108.32465-1-rdunlap@infradead.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
include/linux/skbuff.h