diff options
| author |   Jeremy Sowden <jeremy@azazel.net> | 2019-09-13 09:13:17 +0100 |
|---|---|---|
| committer |   Pablo Neira Ayuso <pablo@netfilter.org> | 2019-09-13 12:47:41 +0200 |
| commit | 1f1475f38b6830f40daa5d2e5290b926bcb63981 (patch) | |
| tree | 0a2f1adcbeecc70c0d0f864f80f9c391bed6d5d7 /include | |
| parent | netfilter: remove CONFIG_NETFILTER checks from headers. (diff) | |
| download | linux-dev-1f1475f38b6830f40daa5d2e5290b926bcb63981.tar.xz linux-dev-1f1475f38b6830f40daa5d2e5290b926bcb63981.zip | |
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>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/netfilter/nf_conntrack_zones.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/include/net/netfilter/nf_conntrack_zones.h b/include/net/netfilter/nf_conntrack_zones.h index 33b91d19cb7d..48dbadb96fb3 100644 --- a/include/net/netfilter/nf_conntrack_zones.h +++ b/include/net/netfilter/nf_conntrack_zones.h @@ -3,9 +3,6 @@ #define _NF_CONNTRACK_ZONES_H #include <linux/netfilter/nf_conntrack_zones_common.h> - -#if IS_ENABLED(CONFIG_NF_CONNTRACK) - #include <net/netfilter/nf_conntrack.h> static inline const struct nf_conntrack_zone * @@ -88,5 +85,5 @@ static inline bool nf_ct_zone_equal_any(const struct nf_conn *a, return true; #endif } -#endif /* IS_ENABLED(CONFIG_NF_CONNTRACK) */ + #endif /* _NF_CONNTRACK_ZONES_H */ |