[PATCH nf-next v5 2/4] netfilter: nf_offload: refactor the nft_flow_offload_chain function

[wenxu]

From: wenxu <we...@ucloud.cn>

Refactor nft_flow_offload_chain and make it more common

Signed-off-by: wenxu <we...@ucloud.cn>
---
v5: no change

 net/netfilter/nf_tables_offload.c | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/net/netfilter/nf_tables_offload.c 
b/net/netfilter/nf_tables_offload.c
index 03ee823..c49bd1a 100644
--- a/net/netfilter/nf_tables_offload.c
+++ b/net/netfilter/nf_tables_offload.c
@@ -279,10 +279,9 @@ static int nft_indr_block_offload_cmd(struct 
nft_base_chain *chain,
 
 #define FLOW_SETUP_BLOCK TC_SETUP_BLOCK
 
-static int nft_flow_offload_chain(struct nft_trans *trans,
+static int nft_flow_offload_chain(struct nft_chain *chain,
                                  enum flow_block_command cmd)
 {
-       struct nft_chain *chain = trans->ctx.chain;
        struct nft_base_chain *basechain;
        struct net_device *dev;
 
@@ -294,16 +293,24 @@ static int nft_flow_offload_chain(struct nft_trans *trans,
        if (!dev)
                return -EOPNOTSUPP;
 
+       if (dev->netdev_ops->ndo_setup_tc)
+               return nft_block_offload_cmd(basechain, dev, cmd);
+       else
+               return nft_indr_block_offload_cmd(basechain, dev, cmd);
+}
+
+static int nft_flow_offload_chain_commit(struct nft_trans *trans,
+                                        enum flow_block_command cmd)
+{
+       struct nft_chain *chain = trans->ctx.chain;
+
        /* Only default policy to accept is supported for now. */
        if (cmd == FLOW_BLOCK_BIND &&
            nft_trans_chain_policy(trans) != -1 &&
            nft_trans_chain_policy(trans) != NF_ACCEPT)
                return -EOPNOTSUPP;
 
-       if (dev->netdev_ops->ndo_setup_tc)
-               return nft_block_offload_cmd(basechain, dev, cmd);
-       else
-               return nft_indr_block_offload_cmd(basechain, dev, cmd);
+       return nft_flow_offload_chain(chain, cmd);
 }
 
 int nft_flow_rule_offload_commit(struct net *net)
@@ -320,13 +327,13 @@ int nft_flow_rule_offload_commit(struct net *net)
                        if (!(trans->ctx.chain->flags & NFT_CHAIN_HW_OFFLOAD))
                                continue;
 
-                       err = nft_flow_offload_chain(trans, FLOW_BLOCK_BIND);
+                       err = nft_flow_offload_chain_commit(trans, 
FLOW_BLOCK_BIND);
                        break;
                case NFT_MSG_DELCHAIN:
                        if (!(trans->ctx.chain->flags & NFT_CHAIN_HW_OFFLOAD))
                                continue;
 
-                       err = nft_flow_offload_chain(trans, FLOW_BLOCK_UNBIND);
+                       err = nft_flow_offload_chain_commit(trans, 
FLOW_BLOCK_UNBIND);
                        break;
                case NFT_MSG_NEWRULE:
                        if (!(trans->ctx.chain->flags & NFT_CHAIN_HW_OFFLOAD))
-- 
1.8.3.1