From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Cc: davem@davemloft.net, netdev@vger.kernel.org
Subject: [PATCH 30/31] netfilter: nf_tables_offload: add nft_flow_block_offload_init()
Date: Sat, 26 Oct 2019 13:47:32 +0200 [thread overview]
Message-ID: <20191026114733.28111-31-pablo@netfilter.org> (raw)
In-Reply-To: <20191026114733.28111-1-pablo@netfilter.org>
This patch adds the nft_flow_block_offload_init() helper function to
initialize the flow_block_offload object.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
net/netfilter/nf_tables_offload.c | 42 +++++++++++++++++++--------------------
1 file changed, 21 insertions(+), 21 deletions(-)
diff --git a/net/netfilter/nf_tables_offload.c b/net/netfilter/nf_tables_offload.c
index 70f50d306799..d51728affa1c 100644
--- a/net/netfilter/nf_tables_offload.c
+++ b/net/netfilter/nf_tables_offload.c
@@ -246,20 +246,30 @@ static int nft_block_setup(struct nft_base_chain *basechain,
return err;
}
+static void nft_flow_block_offload_init(struct flow_block_offload *bo,
+ struct net *net,
+ enum flow_block_command cmd,
+ struct nft_base_chain *basechain,
+ struct netlink_ext_ack *extack)
+{
+ memset(bo, 0, sizeof(*bo));
+ bo->net = net;
+ bo->block = &basechain->flow_block;
+ bo->command = cmd;
+ bo->binder_type = FLOW_BLOCK_BINDER_TYPE_CLSACT_INGRESS;
+ bo->extack = extack;
+ INIT_LIST_HEAD(&bo->cb_list);
+}
+
static int nft_block_offload_cmd(struct nft_base_chain *chain,
struct net_device *dev,
enum flow_block_command cmd)
{
struct netlink_ext_ack extack = {};
- struct flow_block_offload bo = {};
+ struct flow_block_offload bo;
int err;
- bo.net = dev_net(dev);
- bo.block = &chain->flow_block;
- bo.command = cmd;
- bo.binder_type = FLOW_BLOCK_BINDER_TYPE_CLSACT_INGRESS;
- bo.extack = &extack;
- INIT_LIST_HEAD(&bo.cb_list);
+ nft_flow_block_offload_init(&bo, dev_net(dev), cmd, chain, &extack);
err = dev->netdev_ops->ndo_setup_tc(dev, TC_SETUP_BLOCK, &bo);
if (err < 0)
@@ -275,17 +285,12 @@ static void nft_indr_block_ing_cmd(struct net_device *dev,
enum flow_block_command cmd)
{
struct netlink_ext_ack extack = {};
- struct flow_block_offload bo = {};
+ struct flow_block_offload bo;
if (!chain)
return;
- bo.net = dev_net(dev);
- bo.block = &chain->flow_block;
- bo.command = cmd;
- bo.binder_type = FLOW_BLOCK_BINDER_TYPE_CLSACT_INGRESS;
- bo.extack = &extack;
- INIT_LIST_HEAD(&bo.cb_list);
+ nft_flow_block_offload_init(&bo, dev_net(dev), cmd, chain, &extack);
cb(dev, cb_priv, TC_SETUP_BLOCK, &bo);
@@ -296,15 +301,10 @@ static int nft_indr_block_offload_cmd(struct nft_base_chain *chain,
struct net_device *dev,
enum flow_block_command cmd)
{
- struct flow_block_offload bo = {};
struct netlink_ext_ack extack = {};
+ struct flow_block_offload bo;
- bo.net = dev_net(dev);
- bo.block = &chain->flow_block;
- bo.command = cmd;
- bo.binder_type = FLOW_BLOCK_BINDER_TYPE_CLSACT_INGRESS;
- bo.extack = &extack;
- INIT_LIST_HEAD(&bo.cb_list);
+ nft_flow_block_offload_init(&bo, dev_net(dev), cmd, chain, &extack);
flow_indr_block_call(dev, &bo, cmd);
--
2.11.0
next prev parent reply other threads:[~2019-10-26 11:48 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-26 11:47 [PATCH 00/31] Netfilter/IPVS updates for net-next Pablo Neira Ayuso
2019-10-26 11:47 ` [PATCH 01/31] netfilter: ipset: add a coding-style fix to ip_set_ext_destroy Pablo Neira Ayuso
2019-10-26 11:47 ` [PATCH 02/31] netfilter: ipset: remove inline from static functions in .c files Pablo Neira Ayuso
2019-10-26 11:47 ` [PATCH 03/31] netfilter: ipset: move ip_set_comment functions from ip_set.h to ip_set_core.c Pablo Neira Ayuso
2019-10-26 11:47 ` [PATCH 04/31] netfilter: ipset: move functions " Pablo Neira Ayuso
2019-10-26 11:47 ` [PATCH 05/31] netfilter: ipset: make ip_set_put_flags extern Pablo Neira Ayuso
2019-10-26 11:47 ` [PATCH 06/31] netfilter: ipset: move function to ip_set_bitmap_ip.c Pablo Neira Ayuso
2019-10-26 11:47 ` [PATCH 07/31] netfilter: ipset: move ip_set_get_ip_port() to ip_set_bitmap_port.c Pablo Neira Ayuso
2019-10-26 11:47 ` [PATCH 08/31] ipvs: no need to update skb route entry for local destination packets Pablo Neira Ayuso
2019-10-26 11:47 ` [PATCH 09/31] ipvs: batch __ip_vs_cleanup Pablo Neira Ayuso
2019-10-26 11:47 ` [PATCH 10/31] ipvs: batch __ip_vs_dev_cleanup Pablo Neira Ayuso
2019-10-26 11:47 ` [PATCH 11/31] selftests: netfilter: add ipvs test script Pablo Neira Ayuso
2019-10-26 11:47 ` [PATCH 12/31] selftests: netfilter: add ipvs nat test case Pablo Neira Ayuso
2019-10-26 11:47 ` [PATCH 13/31] selftests: netfilter: add ipvs tunnel " Pablo Neira Ayuso
2019-10-26 11:47 ` [PATCH 14/31] netfilter: ecache: document extension area access rules Pablo Neira Ayuso
2019-10-26 11:47 ` [PATCH 15/31] netfilter: ctnetlink: don't dump ct extensions of unconfirmed conntracks Pablo Neira Ayuso
2019-10-26 11:47 ` [PATCH 16/31] netfilter: conntrack: free extension area immediately Pablo Neira Ayuso
2019-10-26 11:47 ` [PATCH 17/31] netfilter: add and use nf_hook_slow_list() Pablo Neira Ayuso
2019-10-26 11:47 ` [PATCH 18/31] netfilter: nft_tproxy: Fix typo in IPv6 module description Pablo Neira Ayuso
2019-10-26 11:47 ` [PATCH 19/31] netfilter: nf_flow_table: move priority to struct nf_flowtable Pablo Neira Ayuso
2019-10-26 11:47 ` [PATCH 20/31] netfilter: nf_tables: dynamically allocate hooks per net_device in flowtables Pablo Neira Ayuso
2019-10-26 11:47 ` [PATCH 21/31] netfilter: nf_tables: allow netdevice to be used only once per flowtable Pablo Neira Ayuso
2019-10-26 11:47 ` [PATCH 22/31] netfilter: nf_tables: increase maximum devices number " Pablo Neira Ayuso
2019-10-26 11:47 ` [PATCH 23/31] netfilter: nf_tables_offload: add nft_flow_block_chain() Pablo Neira Ayuso
2019-10-26 11:47 ` [PATCH 24/31] netfilter: nf_tables_offload: Pass callback list to nft_setup_cb_call() Pablo Neira Ayuso
2019-10-26 11:47 ` [PATCH 25/31] netfilter: nf_tables_offload: add nft_flow_cls_offload_setup() Pablo Neira Ayuso
2019-10-26 11:47 ` [PATCH 26/31] netfilter: nf_tables_offload: remove rules on unregistered device only Pablo Neira Ayuso
2019-10-26 11:47 ` [PATCH 27/31] netfilter: nf_tables: support for multiple devices per netdev hook Pablo Neira Ayuso
2019-10-26 11:47 ` [PATCH 28/31] netfilter: ecache: don't look for ecache extension on dying/unconfirmed conntracks Pablo Neira Ayuso
2019-10-26 11:47 ` [PATCH 29/31] netfilter: nf_tables_offload: add nft_chain_offload_cmd() Pablo Neira Ayuso
2019-10-26 11:47 ` Pablo Neira Ayuso [this message]
2019-10-26 11:47 ` [PATCH 31/31] netfilter: nf_tables_offload: unbind if multi-device binding fails Pablo Neira Ayuso
2019-10-26 18:36 ` [PATCH 00/31] Netfilter/IPVS updates for net-next David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191026114733.28111-31-pablo@netfilter.org \
--to=pablo@netfilter.org \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).