netfilter: nft_ct: keep counters away from CONFIG_NF_CONNTRACK_LABELS
Subsystems (2)
Pablo Neira Ayuso
maintainerPATCH 1/1 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 <[email protected]>
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- net/netfilter/nft_ct.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/netfilter/nft_ct.c +1 -1
@@ -127,6 +127,7 @@ static void nft_ct_get_eval(const struct nft_expr *expr, NF_CT_LABELS_MAX_SIZE - size); return; } +#endif case NFT_CT_BYTES :/* fallthrough */ case NFT_CT_PKTS : {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,memcpy (dest, &count,sizeof (count));return ; } -#endif default :break ; }
Signature · 1 line
2.1.4
Quoted 1 line · Pablo Neira Ayuso
This is accidental, they don't depend on the label infrastructure.
Thats exactly right, sorry :-|
Acked-by Florian Westphal <[email protected]>