OSDN Git Service

netfilter: conntrack: remove CONFIG_NF_CONNTRACK checks from nf_conntrack_zones.h.
authorJeremy Sowden <jeremy@azazel.net>
Fri, 13 Sep 2019 08:13:17 +0000 (09:13 +0100)
committerPablo Neira Ayuso <pablo@netfilter.org>
Fri, 13 Sep 2019 10:47:41 +0000 (12:47 +0200)
commit1f1475f38b6830f40daa5d2e5290b926bcb63981
tree0a2f1adcbeecc70c0d0f864f80f9c391bed6d5d7
parentf19438bdd4bfbfdaac441034c1aaecf02c116e68
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>
include/net/netfilter/nf_conntrack_zones.h