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

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

net: flow_offload: rename TCF_BLOCK_BINDER_TYPE_* to FLOW_BLOCK_BINDER_TYPE_* 



Rename from TCF_BLOCK_BINDER_TYPE_* to FLOW_BLOCK_BINDER_TYPE_* and
remove temporary tcf_block_binder_type alias.

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

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

+1 −1
Original line number Diff line number Diff line
@@ -701,7 +701,7 @@ mlx5e_rep_indr_setup_tc_block(struct net_device *netdev, 
	struct mlx5e_rep_indr_block_priv *indr_priv;

	int err = 0;



	if (f->binder_type != TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS)

	if (f->binder_type != FLOW_BLOCK_BINDER_TYPE_CLSACT_INGRESS)

		return -EOPNOTSUPP;



	switch (f->command) {

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

+2 −2
Original line number Diff line number Diff line
@@ -1668,10 +1668,10 @@ static int mlxsw_sp_setup_tc_block(struct mlxsw_sp_port *mlxsw_sp_port, 
	bool ingress;

	int err;



	if (f->binder_type == TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS) {

	if (f->binder_type == FLOW_BLOCK_BINDER_TYPE_CLSACT_INGRESS) {

		cb = mlxsw_sp_setup_tc_block_cb_matchall_ig;

		ingress = true;

	} else if (f->binder_type == TCF_BLOCK_BINDER_TYPE_CLSACT_EGRESS) {

	} else if (f->binder_type == FLOW_BLOCK_BINDER_TYPE_CLSACT_EGRESS) {

		cb = mlxsw_sp_setup_tc_block_cb_matchall_eg;

		ingress = false;

	} else {

drivers/net/ethernet/mscc/ocelot_flower.c

+1 −1
Original line number Diff line number Diff line
@@ -306,7 +306,7 @@ int ocelot_setup_tc_block_flower_bind(struct ocelot_port *port, 
	struct tcf_block_cb *block_cb;

	int ret;



	if (f->binder_type == TCF_BLOCK_BINDER_TYPE_CLSACT_EGRESS)

	if (f->binder_type == FLOW_BLOCK_BINDER_TYPE_CLSACT_EGRESS)

		return -EOPNOTSUPP;



	block_cb = tcf_block_cb_lookup(f->block,

drivers/net/ethernet/mscc/ocelot_tc.c

+2 −2
Original line number Diff line number Diff line
@@ -137,10 +137,10 @@ static int ocelot_setup_tc_block(struct ocelot_port *port, 
	netdev_dbg(port->dev, "tc_block command %d, binder_type %d\n",

		   f->command, f->binder_type);



	if (f->binder_type == TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS) {

	if (f->binder_type == FLOW_BLOCK_BINDER_TYPE_CLSACT_INGRESS) {

		cb = ocelot_setup_tc_block_cb_ig;

		port->tc.block_shared = tcf_block_shared(f->block);

	} else if (f->binder_type == TCF_BLOCK_BINDER_TYPE_CLSACT_EGRESS) {

	} else if (f->binder_type == FLOW_BLOCK_BINDER_TYPE_CLSACT_EGRESS) {

		cb = ocelot_setup_tc_block_cb_eg;

	} else {

		return -EOPNOTSUPP;

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

+3 −3
Original line number Diff line number Diff line
@@ -1308,7 +1308,7 @@ static int nfp_flower_setup_tc_block(struct net_device *netdev, 
	struct nfp_repr *repr = netdev_priv(netdev);

	struct nfp_flower_repr_priv *repr_priv;



	if (f->binder_type != TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS)

	if (f->binder_type != FLOW_BLOCK_BINDER_TYPE_CLSACT_INGRESS)

		return -EOPNOTSUPP;



	repr_priv = repr->app_priv;
@@ -1389,8 +1389,8 @@ nfp_flower_setup_indr_tc_block(struct net_device *netdev, struct nfp_app *app, 
	struct nfp_flower_priv *priv = app->priv;

	int err;



	if (f->binder_type != TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS &&

	    !(f->binder_type == TCF_BLOCK_BINDER_TYPE_CLSACT_EGRESS &&

	if (f->binder_type != FLOW_BLOCK_BINDER_TYPE_CLSACT_INGRESS &&

	    !(f->binder_type == FLOW_BLOCK_BINDER_TYPE_CLSACT_EGRESS &&

	      nfp_flower_internal_port_can_offload(app, netdev)))

		return -EOPNOTSUPP;