Skip to content

Commit

Permalink
netfilter: nft_ct: keep counters away from CONFIG_NF_CONNTRACK_LABELS
Browse files Browse the repository at this point in the history
This is accidental, they don't depend on the label infrastructure.

Fixes: 48f66c9 ("netfilter: nft_ct: add byte/packet counter support")
Reported-by: Arnd Bergmann <[email protected]>
Signed-off-by: Pablo Neira Ayuso <[email protected]>
Acked-by: Florian Westphal <[email protected]>
  • Loading branch information
ummakynes committed Jan 14, 2016
1 parent f90d2d3 commit efaea94
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion net/netfilter/nft_ct.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -138,7 +139,6 @@ static void nft_ct_get_eval(const struct nft_expr *expr,
memcpy(dest, &count, sizeof(count));
return;
}
#endif
default:
break;
}
Expand Down

0 comments on commit efaea94

Please sign in to comment.