netfilter: nf_tables_offload: refactor the nft_flow_offload_rule function (e211aab7) · Commits · 戴 / test

net/netfilter/nf_tables_offload.c

+13 −7

Original line number	Diff line number	Diff line
		@@ -155,20 +155,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;
		@@ -357,14 +357,20 @@ 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(trans->ctx.chain,
		nft_trans_rule(trans),
		nft_trans_flow_rule(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(trans->ctx.chain,
		nft_trans_rule(trans),
		nft_trans_flow_rule(trans),
		FLOW_CLS_DESTROY);
		break;
		}