netfilter: nft_ct: keep counters away from CONFIG_NF_CONNTRACK_LABELS

ummakynes · ummakynes · commit efaea94aaf0d · 2016-01-14T19:41:16.000+01:00
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 <arnd@arndb.de> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> Acked-by: Florian Westphal <fw@strlen.de>
diff --git 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,
 			       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;
 	}

Original file line number	Diff line number	Diff line change
`@@ -127,6 +127,7 @@ static void nft_ct_get_eval(const struct nft_expr *expr,`
`127`	`127`	`NF_CT_LABELS_MAX_SIZE - size);`
`128`	`128`	`return;`
`129`	`129`	`}`
	`130`	`+#endif`
`130`	`131`	`case NFT_CT_BYTES: /* fallthrough */`
`131`	`132`	`case NFT_CT_PKTS: {`
`132`	`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`	`139`	`memcpy(dest, &count, sizeof(count));`
`139`	`140`	`return;`
`140`	`141`	`}`
`141`		`-#endif`
`142`	`142`	`default:`
`143`	`143`	`break;`
`144`	`144`	`}`