netfilter: add missing IS_ENABLED(CONFIG_NF_CONNTRACK) checks to some header-files.

Browse source

struct nf_conn contains a "struct nf_conntrack ct_general" member and
struct net contains a "struct netns_ct ct" member which are both only
defined in CONFIG_NF_CONNTRACK is enabled.  These members are used in a
number of inline functions defined in other header-files.  Added
preprocessor checks to make sure the headers will compile if
CONFIG_NF_CONNTRACK is disabled.

Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

...

This commit is contained in:

Jeremy Sowden 2019-08-07 15:17:02 +01:00 • committed by Pablo Neira Ayuso

parent 47e640af2e

commit 0abc8bf4f2

4 changed files with 31 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

10

include/net/netfilter/nf_conntrack.h

View file

13

include/net/netfilter/nf_conntrack_acct.h

View file

2

include/net/netfilter/nf_conntrack_l4proto.h

View file

6

include/net/netfilter/nf_conntrack_timestamp.h

View file