@@ -22,7 +22,7 @@
#include <net/netfilter/nf_conntrack_ecache.h>
#include <net/netfilter/nf_conntrack_labels.h>
-struct nft_ct {
+struct nft_ct_reg {
enum nft_ct_keys key:8;
enum ip_conntrack_dir dir:8;
union {
@@ -47,7 +47,7 @@ static void nft_ct_get_eval(const struct nft_expr *expr,
struct nft_regs *regs,
const struct nft_pktinfo *pkt)
{
- const struct nft_ct *priv = nft_expr_priv(expr);
+ const struct nft_ct_reg *priv = nft_expr_priv(expr);
u32 *dest = ®s->data[priv->dreg];
enum ip_conntrack_info ctinfo;
const struct nf_conn *ct;
@@ -177,7 +177,7 @@ static void nft_ct_set_eval(const struct nft_expr *expr,
struct nft_regs *regs,
const struct nft_pktinfo *pkt)
{
- const struct nft_ct *priv = nft_expr_priv(expr);
+ const struct nft_ct_reg *priv = nft_expr_priv(expr);
struct sk_buff *skb = pkt->skb;
#ifdef CONFIG_NF_CONNTRACK_MARK
u32 value = regs->data[priv->sreg];
@@ -247,7 +247,7 @@ static int nft_ct_get_init(const struct nft_ctx *ctx,
const struct nft_expr *expr,
const struct nlattr * const tb[])
{
- struct nft_ct *priv = nft_expr_priv(expr);
+ struct nft_ct_reg *priv = nft_expr_priv(expr);
unsigned int len;
int err;
@@ -354,7 +354,7 @@ static int nft_ct_set_init(const struct nft_ctx *ctx,
const struct nft_expr *expr,
const struct nlattr * const tb[])
{
- struct nft_ct *priv = nft_expr_priv(expr);
+ struct nft_ct_reg *priv = nft_expr_priv(expr);
unsigned int len;
int err;
@@ -381,15 +381,15 @@ static int nft_ct_set_init(const struct nft_ctx *ctx,
return 0;
}
-static void nft_ct_destroy(const struct nft_ctx *ctx,
- const struct nft_expr *expr)
+static void nft_ct_reg_destroy(const struct nft_ctx *ctx,
+ const struct nft_expr *expr)
{
nft_ct_l3proto_module_put(ctx->afi->family);
}
static int nft_ct_get_dump(struct sk_buff *skb, const struct nft_expr *expr)
{
- const struct nft_ct *priv = nft_expr_priv(expr);
+ const struct nft_ct_reg *priv = nft_expr_priv(expr);
if (nft_dump_register(skb, NFTA_CT_DREG, priv->dreg))
goto nla_put_failure;
@@ -424,7 +424,7 @@ nla_put_failure:
static int nft_ct_set_dump(struct sk_buff *skb, const struct nft_expr *expr)
{
- const struct nft_ct *priv = nft_expr_priv(expr);
+ const struct nft_ct_reg *priv = nft_expr_priv(expr);
if (nft_dump_register(skb, NFTA_CT_SREG, priv->sreg))
goto nla_put_failure;
@@ -439,19 +439,19 @@ nla_put_failure:
static struct nft_expr_type nft_ct_type;
static const struct nft_expr_ops nft_ct_get_ops = {
.type = &nft_ct_type,
- .size = NFT_EXPR_SIZE(sizeof(struct nft_ct)),
+ .size = NFT_EXPR_SIZE(sizeof(struct nft_ct_reg)),
.eval = nft_ct_get_eval,
.init = nft_ct_get_init,
- .destroy = nft_ct_destroy,
+ .destroy = nft_ct_reg_destroy,
.dump = nft_ct_get_dump,
};
static const struct nft_expr_ops nft_ct_set_ops = {
.type = &nft_ct_type,
- .size = NFT_EXPR_SIZE(sizeof(struct nft_ct)),
+ .size = NFT_EXPR_SIZE(sizeof(struct nft_ct_reg)),
.eval = nft_ct_set_eval,
.init = nft_ct_set_init,
- .destroy = nft_ct_destroy,
+ .destroy = nft_ct_reg_destroy,
.dump = nft_ct_set_dump,
};
Pablo suggested to have upcoming set support that takes value from an immediate attribute use distinct struct: Quoting Pablo: 'I'd suggest "struct nft_ct_reg" and "struct nft_ct_imm"'. Make it so. Suggested-by: Pablo Neira Ayuso <pablo@netfilter.org> Signed-off-by: Florian Westphal <fw@strlen.de> --- net/netfilter/nft_ct.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-)