[PATCH nf-next v5 3/4] netfilter: nf_offload: refactor the nft_flow_offload_rule function

[wenxu]

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

Refactor nft_flow_offload_rule and make it more common

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

 net/netfilter/nf_tables_offload.c | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/net/netfilter/nf_tables_offload.c 
b/net/netfilter/nf_tables_offload.c
index c49bd1a..78b95e1 100644
--- a/net/netfilter/nf_tables_offload.c
+++ b/net/netfilter/nf_tables_offload.c
@@ -140,20 +140,20 @@ int nft_chain_offload_priority(struct nft_base_chain 
*basechain)
        return 0;
 }
 
-static int nft_flow_offload_rule(struct nft_trans *trans,
+static int nft_flow_offload_rule(struct nft_chain *chain,
+                                struct nft_rule *rule,
+                                struct nft_flow_rule *flow,
                                 enum flow_cls_command command)
 {
-       struct nft_flow_rule *flow = nft_trans_flow_rule(trans);
-       struct nft_rule *rule = nft_trans_rule(trans);
        struct flow_cls_offload cls_flow = {};
        struct nft_base_chain *basechain;
        struct netlink_ext_ack extack;
        __be16 proto = ETH_P_ALL;
 
-       if (!nft_is_base_chain(trans->ctx.chain))
+       if (!nft_is_base_chain(chain))
                return -EOPNOTSUPP;
 
-       basechain = nft_base_chain(trans->ctx.chain);
+       basechain = nft_base_chain(chain);
 
        if (flow)
                proto = flow->proto;
@@ -168,6 +168,16 @@ static int nft_flow_offload_rule(struct nft_trans *trans,
        return nft_setup_cb_call(basechain, TC_SETUP_CLSFLOWER, &cls_flow);
 }
 
+static int nft_flow_offload_rule_commit(struct nft_trans *trans,
+                                       enum flow_cls_command command)
+{
+       struct nft_flow_rule *flow = nft_trans_flow_rule(trans);
+       struct nft_rule *rule = nft_trans_rule(trans);
+       struct nft_chain *chain = trans->ctx.chain;
+
+       return nft_flow_offload_rule(chain, rule, flow, command);
+}
+
 static int nft_flow_offload_bind(struct flow_block_offload *bo,
                                 struct nft_base_chain *basechain)
 {
@@ -343,14 +353,14 @@ int nft_flow_rule_offload_commit(struct net *net)
                            !(trans->ctx.flags & NLM_F_APPEND))
                                return -EOPNOTSUPP;
 
-                       err = nft_flow_offload_rule(trans, FLOW_CLS_REPLACE);
+                       err = nft_flow_offload_rule_commit(trans, 
FLOW_CLS_REPLACE);
                        nft_flow_rule_destroy(nft_trans_flow_rule(trans));
                        break;
                case NFT_MSG_DELRULE:
                        if (!(trans->ctx.chain->flags & NFT_CHAIN_HW_OFFLOAD))
                                continue;
 
-                       err = nft_flow_offload_rule(trans, FLOW_CLS_DESTROY);
+                       err = nft_flow_offload_rule_commit(trans, 
FLOW_CLS_DESTROY);
                        break;
                }
 
-- 
1.8.3.1