diff options
author | Pablo Neira Ayuso <pablo@netfilter.org> | 2016-01-13 11:34:38 -0500 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2016-01-14 13:41:16 -0500 |
commit | efaea94aaf0decd55b15aa7068d4d516a352e56e (patch) | |
tree | 6031d6dd1807e5f9e79dc5bc6f67b4581c9d48d2 /net | |
parent | f90d2d37fb933773c9945c5939ae87aea2343057 (diff) |
netfilter: nft_ct: keep counters away from CONFIG_NF_CONNTRACK_LABELS
This is accidental, they don't depend on the label infrastructure.
Fixes: 48f66c905a97 ("netfilter: nft_ct: add byte/packet counter support")
Reported-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Acked-by: Florian Westphal <fw@strlen.de>
Diffstat (limited to 'net')
-rw-r--r-- | net/netfilter/nft_ct.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/nft_ct.c b/net/netfilter/nft_ct.c index a0eb2161e3ef..d4a4619fcebc 100644 --- a/net/netfilter/nft_ct.c +++ b/net/netfilter/nft_ct.c | |||
@@ -127,6 +127,7 @@ static void nft_ct_get_eval(const struct nft_expr *expr, | |||
127 | NF_CT_LABELS_MAX_SIZE - size); | 127 | NF_CT_LABELS_MAX_SIZE - size); |
128 | return; | 128 | return; |
129 | } | 129 | } |
130 | #endif | ||
130 | case NFT_CT_BYTES: /* fallthrough */ | 131 | case NFT_CT_BYTES: /* fallthrough */ |
131 | case NFT_CT_PKTS: { | 132 | case NFT_CT_PKTS: { |
132 | const struct nf_conn_acct *acct = nf_conn_acct_find(ct); | 133 | const struct nf_conn_acct *acct = nf_conn_acct_find(ct); |
@@ -138,7 +139,6 @@ static void nft_ct_get_eval(const struct nft_expr *expr, | |||
138 | memcpy(dest, &count, sizeof(count)); | 139 | memcpy(dest, &count, sizeof(count)); |
139 | return; | 140 | return; |
140 | } | 141 | } |
141 | #endif | ||
142 | default: | 142 | default: |
143 | break; | 143 | break; |
144 | } | 144 | } |