Commit 0c7294dd authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso Committed by David S. Miller
Browse files

net: flow_offload: remove netns parameter from flow_block_cb_alloc() 



No need to annotate the netns on the flow block callback object,
flow_block_cb_is_busy() already checks for used blocks.

Fixes: d63db30c ("net: flow_offload: add flow_block_cb_alloc() and flow_block_cb_free()")
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Acked-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent aef833c5

drivers/net/ethernet/mellanox/mlx5/core/en_rep.c

+1 −2
Original line number Diff line number Diff line
@@ -735,8 +735,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 = flow_block_cb_alloc(f->net,

					       mlx5e_rep_indr_setup_block_cb,

		block_cb = flow_block_cb_alloc(mlx5e_rep_indr_setup_block_cb,

					       indr_priv, indr_priv,

					       mlx5e_rep_indr_tc_block_unbind);

		if (IS_ERR(block_cb)) {

drivers/net/ethernet/mellanox/mlxsw/spectrum.c

+2 −3
Original line number Diff line number Diff line
@@ -1610,8 +1610,7 @@ mlxsw_sp_setup_tc_block_flower_bind(struct mlxsw_sp_port *mlxsw_sp_port, 
		acl_block = mlxsw_sp_acl_block_create(mlxsw_sp, f->net);

		if (!acl_block)

			return -ENOMEM;

		block_cb = flow_block_cb_alloc(f->net,

					       mlxsw_sp_setup_tc_block_cb_flower,

		block_cb = flow_block_cb_alloc(mlxsw_sp_setup_tc_block_cb_flower,

					       mlxsw_sp, acl_block,

					       mlxsw_sp_tc_block_flower_release);

		if (IS_ERR(block_cb)) {
@@ -1702,7 +1701,7 @@ static int mlxsw_sp_setup_tc_block(struct mlxsw_sp_port *mlxsw_sp_port, 
					  &mlxsw_sp_block_cb_list))

			return -EBUSY;



		block_cb = flow_block_cb_alloc(f->net, cb, mlxsw_sp_port,

		block_cb = flow_block_cb_alloc(cb, mlxsw_sp_port,

					       mlxsw_sp_port, NULL);

		if (IS_ERR(block_cb))

			return PTR_ERR(block_cb);

drivers/net/ethernet/mscc/ocelot_flower.c

+1 −2
Original line number Diff line number Diff line
@@ -323,8 +323,7 @@ int ocelot_setup_tc_block_flower_bind(struct ocelot_port *port, 
		if (!port_block)

			return -ENOMEM;



		block_cb = flow_block_cb_alloc(f->net,

					       ocelot_setup_tc_block_cb_flower,

		block_cb = flow_block_cb_alloc(ocelot_setup_tc_block_cb_flower,

					       port, port_block,

					       ocelot_tc_block_unbind);

		if (IS_ERR(block_cb)) {

drivers/net/ethernet/mscc/ocelot_tc.c

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ static int ocelot_setup_tc_block(struct ocelot_port *port, 
		if (flow_block_cb_is_busy(cb, port, &ocelot_block_cb_list))

			return -EBUSY;



		block_cb = flow_block_cb_alloc(f->net, cb, port, port, NULL);

		block_cb = flow_block_cb_alloc(cb, port, port, NULL);

		if (IS_ERR(block_cb))

			return PTR_ERR(block_cb);

drivers/net/ethernet/netronome/nfp/flower/offload.c

+2 −4
Original line number Diff line number Diff line
@@ -1318,8 +1318,7 @@ static int nfp_flower_setup_tc_block(struct net_device *netdev, 
					  &nfp_block_cb_list))

			return -EBUSY;



		block_cb = flow_block_cb_alloc(f->net,

					       nfp_flower_setup_tc_block_cb,

		block_cb = flow_block_cb_alloc(nfp_flower_setup_tc_block_cb,

					       repr, repr, NULL);

		if (IS_ERR(block_cb))

			return PTR_ERR(block_cb);
@@ -1424,8 +1423,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 = flow_block_cb_alloc(f->net,

					       nfp_flower_setup_indr_block_cb,

		block_cb = flow_block_cb_alloc(nfp_flower_setup_indr_block_cb,

					       cb_priv, cb_priv,

					       nfp_flower_setup_indr_tc_release);

		if (IS_ERR(block_cb)) {