From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Thu, 24 Oct 2019 09:47:08 +0200
Subject: netfilter: nf_tables_offload: add nft_chain_offload_cmd()
Patch-mainline: v5.5-rc1
Git-commit: 6df5490fbb9c2d48e9f27a7f128032ac38ae5c59
References: bsc#1176447
This patch adds the nft_chain_offload_cmd() helper function.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>
---
net/netfilter/nf_tables_offload.c | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
--- a/net/netfilter/nf_tables_offload.c
+++ b/net/netfilter/nf_tables_offload.c
@@ -316,6 +316,20 @@ static int nft_indr_block_offload_cmd(st
#define FLOW_SETUP_BLOCK TC_SETUP_BLOCK
+static int nft_chain_offload_cmd(struct nft_base_chain *basechain,
+ struct net_device *dev,
+ enum flow_block_command cmd)
+{
+ int err;
+
+ if (dev->netdev_ops->ndo_setup_tc)
+ err = nft_block_offload_cmd(basechain, dev, cmd);
+ else
+ err = nft_indr_block_offload_cmd(basechain, dev, cmd);
+
+ return err;
+}
+
static int nft_flow_block_chain(struct nft_base_chain *basechain,
const struct net_device *this_dev,
enum flow_block_command cmd)
@@ -329,11 +343,7 @@ static int nft_flow_block_chain(struct n
if (this_dev && this_dev != dev)
continue;
- if (dev->netdev_ops->ndo_setup_tc)
- err = nft_block_offload_cmd(basechain, dev, cmd);
- else
- err = nft_indr_block_offload_cmd(basechain, dev, cmd);
-
+ err = nft_chain_offload_cmd(basechain, dev, cmd);
if (err < 0)
return err;
}