Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

net: flow_offload: rename TC_BLOCK_{UN}BIND to FLOW_BLOCK_{UN}BIND 



Rename from TC_BLOCK_{UN}BIND to FLOW_BLOCK_{UN}BIND and remove
temporary tc_block_command alias.

Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4e95bc26

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

+2 −2
Original line number Diff line number Diff line
@@ -705,7 +705,7 @@ mlx5e_rep_indr_setup_tc_block(struct net_device *netdev, 
		return -EOPNOTSUPP;



	switch (f->command) {

	case TC_BLOCK_BIND:

	case FLOW_BLOCK_BIND:

		indr_priv = mlx5e_rep_indr_block_priv_lookup(rpriv, netdev);

		if (indr_priv)

			return -EEXIST;
@@ -728,7 +728,7 @@ mlx5e_rep_indr_setup_tc_block(struct net_device *netdev, 
		}



		return err;

	case TC_BLOCK_UNBIND:

	case FLOW_BLOCK_UNBIND:

		indr_priv = mlx5e_rep_indr_block_priv_lookup(rpriv, netdev);

		if (!indr_priv)

			return -ENOENT;

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

+2 −2
Original line number Diff line number Diff line
@@ -1679,7 +1679,7 @@ static int mlxsw_sp_setup_tc_block(struct mlxsw_sp_port *mlxsw_sp_port, 
	}



	switch (f->command) {

	case TC_BLOCK_BIND:

	case FLOW_BLOCK_BIND:

		err = tcf_block_cb_register(f->block, cb, mlxsw_sp_port,

					    mlxsw_sp_port, f->extack);

		if (err)
@@ -1692,7 +1692,7 @@ static int mlxsw_sp_setup_tc_block(struct mlxsw_sp_port *mlxsw_sp_port, 
			return err;

		}

		return 0;

	case TC_BLOCK_UNBIND:

	case FLOW_BLOCK_UNBIND:

		mlxsw_sp_setup_tc_block_flower_unbind(mlxsw_sp_port,

						      f->block, ingress);

		tcf_block_cb_unregister(f->block, cb, mlxsw_sp_port);

drivers/net/ethernet/mscc/ocelot_tc.c

+2 −2
Original line number Diff line number Diff line
@@ -147,14 +147,14 @@ static int ocelot_setup_tc_block(struct ocelot_port *port, 
	}



	switch (f->command) {

	case TC_BLOCK_BIND:

	case FLOW_BLOCK_BIND:

		ret = tcf_block_cb_register(f->block, cb, port,

					    port, f->extack);

		if (ret)

			return ret;



		return ocelot_setup_tc_block_flower_bind(port, f);

	case TC_BLOCK_UNBIND:

	case FLOW_BLOCK_UNBIND:

		ocelot_setup_tc_block_flower_unbind(port, f);

		tcf_block_cb_unregister(f->block, cb, port);

		return 0;

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

+4 −4
Original line number Diff line number Diff line
@@ -1315,11 +1315,11 @@ static int nfp_flower_setup_tc_block(struct net_device *netdev, 
	repr_priv->block_shared = tcf_block_shared(f->block);



	switch (f->command) {

	case TC_BLOCK_BIND:

	case FLOW_BLOCK_BIND:

		return tcf_block_cb_register(f->block,

					     nfp_flower_setup_tc_block_cb,

					     repr, repr, f->extack);

	case TC_BLOCK_UNBIND:

	case FLOW_BLOCK_UNBIND:

		tcf_block_cb_unregister(f->block,

					nfp_flower_setup_tc_block_cb,

					repr);
@@ -1395,7 +1395,7 @@ nfp_flower_setup_indr_tc_block(struct net_device *netdev, struct nfp_app *app, 
		return -EOPNOTSUPP;



	switch (f->command) {

	case TC_BLOCK_BIND:

	case FLOW_BLOCK_BIND:

		cb_priv = kmalloc(sizeof(*cb_priv), GFP_KERNEL);

		if (!cb_priv)

			return -ENOMEM;
@@ -1413,7 +1413,7 @@ nfp_flower_setup_indr_tc_block(struct net_device *netdev, struct nfp_app *app, 
		}



		return err;

	case TC_BLOCK_UNBIND:

	case FLOW_BLOCK_UNBIND:

		cb_priv = nfp_flower_indr_block_cb_priv_lookup(app, netdev);

		if (!cb_priv)

			return -ENOENT;

include/net/flow_offload.h

+2 −2
Original line number Diff line number Diff line
@@ -239,8 +239,8 @@ static inline void flow_stats_update(struct flow_stats *flow_stats, 
}



enum flow_block_command {

	TC_BLOCK_BIND,

	TC_BLOCK_UNBIND,

	FLOW_BLOCK_BIND,

	FLOW_BLOCK_UNBIND,

};



enum flow_block_binder_type {