Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

netfilter: conntrack: remove CONFIG_NF_CONNTRACK checks from nf_conntrack_zones.h.

nf_conntrack_zones.h was wrapped in a CONFIG_NF_CONNTRACK check in order
to fix compilation failures:

37ee3d5b3e97 ("netfilter: nf_defrag_ipv4: fix compilation error with NF_CONNTRACK=n")

Subsequent changes mean that these failures will no longer occur and the
check is unnecessary. Remove it.

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

authored by

Jeremy Sowden and committed by
Pablo Neira Ayuso
1f1475f3 f19438bd

+1 -4
+1 -4
include/net/netfilter/nf_conntrack_zones.h
··· 3 3 #define _NF_CONNTRACK_ZONES_H 4 4 5 5 #include <linux/netfilter/nf_conntrack_zones_common.h> 6 - 7 - #if IS_ENABLED(CONFIG_NF_CONNTRACK) 8 - 9 6 #include <net/netfilter/nf_conntrack.h> 10 7 11 8 static inline const struct nf_conntrack_zone * ··· 85 88 return true; 86 89 #endif 87 90 } 88 - #endif /* IS_ENABLED(CONFIG_NF_CONNTRACK) */ 91 + 89 92 #endif /* _NF_CONNTRACK_ZONES_H */