Instead, expose the block index that is sufficient to look up for the
tcf_block_cb object.
Signed-off-by: Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx>
---
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 4 ++--
drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 10 +++++-----
drivers/net/ethernet/netronome/nfp/flower/offload.c | 4 ++--
include/net/pkt_cls.h | 2 +-
net/dsa/slave.c | 4 ++--
net/sched/cls_api.c | 10 +++++-----
6 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
index f09135b7a605..f85f725fc0dc 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
@@ -731,7 +731,7 @@ mlx5e_rep_indr_setup_tc_block(struct net_device *netdev,
list_add(&indr_priv->list,
&rpriv->uplink_priv.tc_indr_block_priv_list);
- block_cb = tcf_block_cb_alloc(f->block->index,
+ block_cb = tcf_block_cb_alloc(f->block_index,
mlx5e_rep_indr_setup_block_cb,
indr_priv, indr_priv,
mlx5e_rep_indr_tc_block_unbind);
@@ -747,7 +747,7 @@ mlx5e_rep_indr_setup_tc_block(struct net_device *netdev,
if (!indr_priv)
return -ENOENT;
- block_cb = tcf_block_cb_lookup(f->block->index,
+ block_cb = tcf_block_cb_lookup(f->block_index,
mlx5e_rep_indr_setup_block_cb,
indr_priv);
if (!block_cb)
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
index c07fa0487b39..060a0de69638 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
@@ -1531,14 +1531,14 @@ mlxsw_sp_setup_tc_block_flower_bind(struct mlxsw_sp_port *mlxsw_sp_port,
struct tcf_block_cb *block_cb;
int err;
- block_cb = tcf_block_cb_lookup(f->block->index,
+ block_cb = tcf_block_cb_lookup(f->block_index,
mlxsw_sp_setup_tc_block_cb_flower,
mlxsw_sp);
if (!block_cb) {
acl_block = mlxsw_sp_acl_block_create(mlxsw_sp, net);
if (!acl_block)
return -ENOMEM;
- block_cb = tcf_block_cb_alloc(f->block->index,
+ block_cb = tcf_block_cb_alloc(f->block_index,
mlxsw_sp_setup_tc_block_cb_flower,
mlxsw_sp, acl_block,
mlxsw_sp_tc_block_flower_release);
@@ -1580,7 +1580,7 @@ mlxsw_sp_setup_tc_block_flower_unbind(struct mlxsw_sp_port *mlxsw_sp_port,
struct tcf_block_cb *block_cb;
int err;
- block_cb = tcf_block_cb_lookup(f->block->index,
+ block_cb = tcf_block_cb_lookup(f->block_index,
mlxsw_sp_setup_tc_block_cb_flower,
mlxsw_sp);
if (!block_cb)
@@ -1618,7 +1618,7 @@ static int mlxsw_sp_setup_tc_block(struct mlxsw_sp_port *mlxsw_sp_port,
switch (f->command) {
case TC_BLOCK_BIND:
- block_cb = tcf_block_cb_alloc(f->block->index, cb, mlxsw_sp_port,
+ block_cb = tcf_block_cb_alloc(f->block_index, cb, mlxsw_sp_port,
mlxsw_sp_port, NULL);
if (!block_cb)
return -ENOMEM;
@@ -1633,7 +1633,7 @@ static int mlxsw_sp_setup_tc_block(struct mlxsw_sp_port *mlxsw_sp_port,
case TC_BLOCK_UNBIND:
mlxsw_sp_setup_tc_block_flower_unbind(mlxsw_sp_port,
f, ingress);
- block_cb = tcf_block_cb_lookup(f->block->index, cb,
+ block_cb = tcf_block_cb_lookup(f->block_index, cb,
mlxsw_sp_port);
if (!block_cb)
return -ENOENT;
diff --git a/drivers/net/ethernet/netronome/nfp/flower/offload.c b/drivers/net/ethernet/netronome/nfp/flower/offload.c
index d2bc36859952..1ad46cf2413f 100644
--- a/drivers/net/ethernet/netronome/nfp/flower/offload.c
+++ b/drivers/net/ethernet/netronome/nfp/flower/offload.c
@@ -1277,7 +1277,7 @@ nfp_flower_setup_indr_tc_block(struct net_device *netdev, struct nfp_app *app,
cb_priv->app = app;
list_add(&cb_priv->list, &priv->indr_block_cb_priv);
- block_cb = tcf_block_cb_alloc(f->block->index,
+ block_cb = tcf_block_cb_alloc(f->block_index,
nfp_flower_setup_indr_block_cb,
cb_priv, cb_priv,
nfp_flower_setup_indr_tc_release);
@@ -1293,7 +1293,7 @@ nfp_flower_setup_indr_tc_block(struct net_device *netdev, struct nfp_app *app,
if (!cb_priv)
return -ENOENT;
- block_cb = tcf_block_cb_lookup(f->block->index,
+ block_cb = tcf_block_cb_lookup(f->block_index,
nfp_flower_setup_indr_block_cb,
cb_priv);
if (!block_cb)
diff --git a/include/net/pkt_cls.h b/include/net/pkt_cls.h
index 8f0486a00d70..a3a3cfbf0ba0 100644
--- a/include/net/pkt_cls.h
+++ b/include/net/pkt_cls.h
@@ -648,7 +648,7 @@ struct tc_block_offload {
enum tc_block_command command;
enum tcf_block_binder_type binder_type;
struct list_head cb_list;
- struct tcf_block *block;
+ u32 block_index;
struct netlink_ext_ack *extack;
};
diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index 7ef34cc2f574..4fe5386f2613 100644
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -914,7 +914,7 @@ static int dsa_slave_setup_tc_block(struct net_device *dev,
switch (f->command) {
case TC_BLOCK_BIND:
- block_cb = tcf_block_cb_alloc(f->block->index, cb, dev, dev,
+ block_cb = tcf_block_cb_alloc(f->block_index, cb, dev, dev,
NULL);
if (!block_cb)
return -ENOMEM;
@@ -922,7 +922,7 @@ static int dsa_slave_setup_tc_block(struct net_device *dev,
tcf_block_cb_list_add(block_cb, &f->cb_list);
return 0;
case TC_BLOCK_UNBIND:
- block_cb = tcf_block_cb_lookup(f->block->index, cb, dev);
+ block_cb = tcf_block_cb_lookup(f->block_index, cb, dev);
if (!block_cb)
return -ENOENT;
diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c
index f7f6f42d58d1..d6fb80f68eec 100644
--- a/net/sched/cls_api.c
+++ b/net/sched/cls_api.c
@@ -941,7 +941,7 @@ int tcf_setup_block_offload(struct tc_block_offload *f, tc_setup_cb_t *cb,
switch (f->command) {
case TC_BLOCK_BIND:
- block_cb = tcf_block_cb_alloc(f->block->index, cb, cb_priv,
+ block_cb = tcf_block_cb_alloc(f->block_index, cb, cb_priv,
cb_priv, NULL);
if (!block_cb)
return -ENOMEM;
@@ -949,7 +949,7 @@ int tcf_setup_block_offload(struct tc_block_offload *f, tc_setup_cb_t *cb,
tcf_block_cb_list_add(block_cb, &f->cb_list);
return 0;
case TC_BLOCK_UNBIND:
- block_cb = tcf_block_cb_lookup(f->block->index, cb, cb_priv);
+ block_cb = tcf_block_cb_lookup(f->block_index, cb, cb_priv);
if (!block_cb)
return -ENOENT;
@@ -1075,7 +1075,7 @@ static void tc_indr_block_ing_cmd(struct tc_indr_block_dev *indr_dev,
struct tc_block_offload bo = {
.command = command,
.binder_type = TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS,
- .block = indr_dev->block,
+ .block_index = indr_dev->block->index,
};
INIT_LIST_HEAD(&bo.cb_list);
@@ -1165,7 +1165,7 @@ static void tc_indr_block_call(struct tcf_block *block, struct net_device *dev,
struct tc_block_offload bo = {
.command = command,
.binder_type = ei->binder_type,
- .block = block,
+ .block_index = block->index,
.extack = extack,
};
INIT_LIST_HEAD(&bo.cb_list);
@@ -1194,7 +1194,7 @@ static int tcf_block_offload_cmd(struct tcf_block *block,
bo.command = command;
bo.binder_type = ei->binder_type;
- bo.block = block;
+ bo.block_index = block->index;
bo.extack = extack;
INIT_LIST_HEAD(&bo.cb_list);
--
2.11.0
