summaryrefslogtreecommitdiff
path: root/net/netfilter/nft_payload.c
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2013-10-10 11:41:20 +0200
committerPablo Neira Ayuso <pablo@netfilter.org>2013-10-14 17:16:08 +0200
commitef1f7df9170dbd875ce198ba84e6ab80f6fc139e (patch)
treeac15a3cbf8c4a05b8b1919cf195189e00c3a2956 /net/netfilter/nft_payload.c
parent20a69341f2d00cd042e81c82289fba8a13c05a25 (diff)
netfilter: nf_tables: expression ops overloading
Split the expression ops into two parts and support overloading of the runtime expression ops based on the requested function through a ->select_ops() callback. This can be used to provide optimized implementations, for instance for loading small aligned amounts of data from the packet or inlining frequently used operations into the main evaluation loop. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/netfilter/nft_payload.c')
-rw-r--r--net/netfilter/nft_payload.c18
1 files changed, 12 insertions, 6 deletions
diff --git a/net/netfilter/nft_payload.c b/net/netfilter/nft_payload.c
index 329f134b3f89..d99db6e37fb1 100644
--- a/net/netfilter/nft_payload.c
+++ b/net/netfilter/nft_payload.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008 Patrick McHardy <kaber@trash.net>
+ * Copyright (c) 2008-2009 Patrick McHardy <kaber@trash.net>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
@@ -115,23 +115,29 @@ nla_put_failure:
return -1;
}
-static struct nft_expr_ops nft_payload_ops __read_mostly = {
- .name = "payload",
+static struct nft_expr_type nft_payload_type;
+static const struct nft_expr_ops nft_payload_ops = {
+ .type = &nft_payload_type,
.size = NFT_EXPR_SIZE(sizeof(struct nft_payload)),
- .owner = THIS_MODULE,
.eval = nft_payload_eval,
.init = nft_payload_init,
.dump = nft_payload_dump,
+};
+
+static struct nft_expr_type nft_payload_type __read_mostly = {
+ .name = "payload",
+ .ops = &nft_payload_ops,
.policy = nft_payload_policy,
.maxattr = NFTA_PAYLOAD_MAX,
+ .owner = THIS_MODULE,
};
int __init nft_payload_module_init(void)
{
- return nft_register_expr(&nft_payload_ops);
+ return nft_register_expr(&nft_payload_type);
}
void nft_payload_module_exit(void)
{
- nft_unregister_expr(&nft_payload_ops);
+ nft_unregister_expr(&nft_payload_type);
}