netfilter: nf_tables_offload: Pass callback list to nft_setup_cb_call()

This allows to reuse nft_setup_cb_call() from the callback unbind path.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/net/netfilter/nf_tables_offload.c b/net/netfilter/nf_tables_offload.c
index 4554bc661817ee749d694c11febd5ab3351e7350..b85ea768ca80fc47b8fb139c56b819e40922d8f2 100644 (file)
--- a/net/netfilter/nf_tables_offload.c
+++ b/net/netfilter/nf_tables_offload.c
@@ -132,13 +132,13 @@ static void nft_flow_offload_common_init(struct flow_cls_common_offload *common,
        common->extack = extack;
 }
 
-static int nft_setup_cb_call(struct nft_base_chain *basechain,
-                            enum tc_setup_type type, void *type_data)
+static int nft_setup_cb_call(enum tc_setup_type type, void *type_data,
+                            struct list_head *cb_list)
 {
        struct flow_block_cb *block_cb;
        int err;
 
-       list_for_each_entry(block_cb, &basechain->flow_block.cb_list, list) {
+       list_for_each_entry(block_cb, cb_list, list) {
                err = block_cb->cb(type, type_data, block_cb->cb_priv);
                if (err < 0)
                        return err;
@@ -180,7 +180,8 @@ static int nft_flow_offload_rule(struct nft_chain *chain,
        if (flow)
                cls_flow.rule = flow->rule;
 
-       return nft_setup_cb_call(basechain, TC_SETUP_CLSFLOWER, &cls_flow);
+       return nft_setup_cb_call(TC_SETUP_CLSFLOWER, &cls_flow,
+                                &basechain->flow_block.cb_list);
 }
 
 static int nft_flow_offload_bind(struct flow_block_offload *bo,