cls_api: modify the tc_indr_block_ing_cmd parameters.

This patch make tc_indr_block_ing_cmd can't access struct
tc_indr_block_dev and tc_indr_block_cb.

Signed-off-by: wenxu <wenxu@ucloud.cn>
Acked-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c
index 9d85d3295c7c557abdc7820b32aa7111bc54d2d7..1dd210d353b772cd9f01110579c2792e3f3c36be 100644 (file)
--- a/net/sched/cls_api.c
+++ b/net/sched/cls_api.c
@@ -677,26 +677,28 @@ static void tc_indr_block_cb_del(struct tc_indr_block_cb *indr_block_cb)
 static int tcf_block_setup(struct tcf_block *block,
                           struct flow_block_offload *bo);
 
-static void tc_indr_block_ing_cmd(struct tc_indr_block_dev *indr_dev,
-                                 struct tc_indr_block_cb *indr_block_cb,
+static void tc_indr_block_ing_cmd(struct net_device *dev,
+                                 struct tcf_block *block,
+                                 tc_indr_block_bind_cb_t *cb,
+                                 void *cb_priv,
                                  enum flow_block_command command)
 {
        struct flow_block_offload bo = {
                .command        = command,
                .binder_type    = FLOW_BLOCK_BINDER_TYPE_CLSACT_INGRESS,
-               .net            = dev_net(indr_dev->dev),
-               .block_shared   = tcf_block_non_null_shared(indr_dev->block),
+               .net            = dev_net(dev),
+               .block_shared   = tcf_block_non_null_shared(block),
        };
        INIT_LIST_HEAD(&bo.cb_list);
 
-       if (!indr_dev->block)
+       if (!block)
                return;
 
-       bo.block = &indr_dev->block->flow_block;
+       bo.block = &block->flow_block;
 
-       indr_block_cb->cb(indr_dev->dev, indr_block_cb->cb_priv, TC_SETUP_BLOCK,
-                         &bo);
-       tcf_block_setup(indr_dev->block, &bo);
+       cb(dev, cb_priv, TC_SETUP_BLOCK, &bo);
+
+       tcf_block_setup(block, &bo);
 }
 
 int __tc_indr_block_cb_register(struct net_device *dev, void *cb_priv,
@@ -715,7 +717,8 @@ int __tc_indr_block_cb_register(struct net_device *dev, void *cb_priv,
        if (err)
                goto err_dev_put;
 
-       tc_indr_block_ing_cmd(indr_dev, indr_block_cb, FLOW_BLOCK_BIND);
+       tc_indr_block_ing_cmd(dev, indr_dev->block, cb, cb_priv,
+                             FLOW_BLOCK_BIND);
        return 0;
 
 err_dev_put:
@@ -752,7 +755,8 @@ void __tc_indr_block_cb_unregister(struct net_device *dev,
                return;
 
        /* Send unbind message if required to free any block cbs. */
-       tc_indr_block_ing_cmd(indr_dev, indr_block_cb, FLOW_BLOCK_UNBIND);
+       tc_indr_block_ing_cmd(dev, indr_dev->block, cb, indr_block_cb->cb_priv,
+                             FLOW_BLOCK_UNBIND);
        tc_indr_block_cb_del(indr_block_cb);
        tc_indr_block_dev_put(indr_dev);
 }