UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Pablo Neira Ayuso 2019-07-09 22:55:41 +02:00 committed by David S. Miller
parent 9c0e189ec9
commit 32f8c4093a
11 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
View File

@ -701,7 +701,7 @@ mlx5e_rep_indr_setup_tc_block(struct net_device *netdev,
struct mlx5e_rep_indr_block_priv *indr_priv; struct mlx5e_rep_indr_block_priv *indr_priv;
int err = 0; 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; return -EOPNOTSUPP;
switch (f->command) { switch (f->command) {

4
drivers/net/ethernet/mellanox/mlxsw/spectrum.c
View File

@ -1668,10 +1668,10 @@ static int mlxsw_sp_setup_tc_block(struct mlxsw_sp_port *mlxsw_sp_port,
bool ingress; bool ingress;
int err; 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; cb = mlxsw_sp_setup_tc_block_cb_matchall_ig;
ingress = true; 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; cb = mlxsw_sp_setup_tc_block_cb_matchall_eg;
ingress = false; ingress = false;
} else { } else {

2
drivers/net/ethernet/mscc/ocelot_flower.c
View File

@ -306,7 +306,7 @@ int ocelot_setup_tc_block_flower_bind(struct ocelot_port *port,
struct tcf_block_cb *block_cb; struct tcf_block_cb *block_cb;
int ret; int ret;
if (f->binder_type == TCF_BLOCK_BINDER_TYPE_CLSACT_EGRESS) if (f->binder_type == FLOW_BLOCK_BINDER_TYPE_CLSACT_EGRESS)
return -EOPNOTSUPP; return -EOPNOTSUPP;
block_cb = tcf_block_cb_lookup(f->block, block_cb = tcf_block_cb_lookup(f->block,

4
drivers/net/ethernet/mscc/ocelot_tc.c
View File

@ -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", netdev_dbg(port->dev, "tc_block command %d, binder_type %d\n",
f->command, f->binder_type); 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; cb = ocelot_setup_tc_block_cb_ig;
port->tc.block_shared = tcf_block_shared(f->block); 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; cb = ocelot_setup_tc_block_cb_eg;
} else { } else {
return -EOPNOTSUPP; return -EOPNOTSUPP;

6
drivers/net/ethernet/netronome/nfp/flower/offload.c
View File

@ -1308,7 +1308,7 @@ static int nfp_flower_setup_tc_block(struct net_device *netdev,
struct nfp_repr *repr = netdev_priv(netdev); struct nfp_repr *repr = netdev_priv(netdev);
struct nfp_flower_repr_priv *repr_priv; 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; return -EOPNOTSUPP;
repr_priv = repr->app_priv; 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; struct nfp_flower_priv *priv = app->priv;
int err; int err;
if (f->binder_type != TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS && if (f->binder_type != FLOW_BLOCK_BINDER_TYPE_CLSACT_INGRESS &&
!(f->binder_type == TCF_BLOCK_BINDER_TYPE_CLSACT_EGRESS && !(f->binder_type == FLOW_BLOCK_BINDER_TYPE_CLSACT_EGRESS &&
nfp_flower_internal_port_can_offload(app, netdev))) nfp_flower_internal_port_can_offload(app, netdev)))
return -EOPNOTSUPP; return -EOPNOTSUPP;

6
include/net/flow_offload.h
View File

@ -244,9 +244,9 @@ enum flow_block_command {
}; };
enum flow_block_binder_type { enum flow_block_binder_type {
TCF_BLOCK_BINDER_TYPE_UNSPEC, FLOW_BLOCK_BINDER_TYPE_UNSPEC,
TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS, FLOW_BLOCK_BINDER_TYPE_CLSACT_INGRESS,
TCF_BLOCK_BINDER_TYPE_CLSACT_EGRESS, FLOW_BLOCK_BINDER_TYPE_CLSACT_EGRESS,
}; };
struct tcf_block; struct tcf_block;

3
include/net/pkt_cls.h
View File

@ -27,10 +27,9 @@ int register_tcf_proto_ops(struct tcf_proto_ops *ops);
int unregister_tcf_proto_ops(struct tcf_proto_ops *ops); int unregister_tcf_proto_ops(struct tcf_proto_ops *ops);
#define tc_block_offload flow_block_offload #define tc_block_offload flow_block_offload
#define tcf_block_binder_type flow_block_binder_type
struct tcf_block_ext_info { struct tcf_block_ext_info {
enum tcf_block_binder_type binder_type; enum flow_block_binder_type binder_type;
tcf_chain_head_change_t *chain_head_change; tcf_chain_head_change_t *chain_head_change;
void *chain_head_change_priv; void *chain_head_change_priv;
u32 block_index; u32 block_index;

2
net/core/flow_offload.c
View File

@ -172,7 +172,7 @@ int flow_block_cb_setup_simple(struct flow_block_offload *f,
bool ingress_only) bool ingress_only)
{ {
if (ingress_only && if (ingress_only &&
f->binder_type != TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS) f->binder_type != FLOW_BLOCK_BINDER_TYPE_CLSACT_INGRESS)
return -EOPNOTSUPP; return -EOPNOTSUPP;
f->driver_block_list = driver_block_list; f->driver_block_list = driver_block_list;

4
net/dsa/slave.c
View File

@ -947,9 +947,9 @@ static int dsa_slave_setup_tc_block(struct net_device *dev,
{ {
tc_setup_cb_t *cb; tc_setup_cb_t *cb;
if (f->binder_type == TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS) if (f->binder_type == FLOW_BLOCK_BINDER_TYPE_CLSACT_INGRESS)
cb = dsa_slave_setup_tc_block_cb_ig; cb = dsa_slave_setup_tc_block_cb_ig;
else if (f->binder_type == TCF_BLOCK_BINDER_TYPE_CLSACT_EGRESS) else if (f->binder_type == FLOW_BLOCK_BINDER_TYPE_CLSACT_EGRESS)
cb = dsa_slave_setup_tc_block_cb_eg; cb = dsa_slave_setup_tc_block_cb_eg;
else else
return -EOPNOTSUPP; return -EOPNOTSUPP;

14
net/sched/cls_api.c
View File

@ -679,7 +679,7 @@ static void tc_indr_block_ing_cmd(struct tc_indr_block_dev *indr_dev,
{ {
struct tc_block_offload bo = { struct tc_block_offload bo = {
.command = command, .command = command,
.binder_type = TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS, .binder_type = FLOW_BLOCK_BINDER_TYPE_CLSACT_INGRESS,
.block = indr_dev->block, .block = indr_dev->block,
}; };
@ -1341,17 +1341,17 @@ static void tcf_block_release(struct Qdisc *q, struct tcf_block *block,
struct tcf_block_owner_item { struct tcf_block_owner_item {
struct list_head list; struct list_head list;
struct Qdisc *q; struct Qdisc *q;
enum tcf_block_binder_type binder_type; enum flow_block_binder_type binder_type;
}; };
static void static void
tcf_block_owner_netif_keep_dst(struct tcf_block *block, tcf_block_owner_netif_keep_dst(struct tcf_block *block,
struct Qdisc *q, struct Qdisc *q,
enum tcf_block_binder_type binder_type) enum flow_block_binder_type binder_type)
{ {
if (block->keep_dst && if (block->keep_dst &&
binder_type != TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS && binder_type != FLOW_BLOCK_BINDER_TYPE_CLSACT_INGRESS &&
binder_type != TCF_BLOCK_BINDER_TYPE_CLSACT_EGRESS) binder_type != FLOW_BLOCK_BINDER_TYPE_CLSACT_EGRESS)
netif_keep_dst(qdisc_dev(q)); netif_keep_dst(qdisc_dev(q));
} }
@ -1368,7 +1368,7 @@ EXPORT_SYMBOL(tcf_block_netif_keep_dst);
static int tcf_block_owner_add(struct tcf_block *block, static int tcf_block_owner_add(struct tcf_block *block,
struct Qdisc *q, struct Qdisc *q,
enum tcf_block_binder_type binder_type) enum flow_block_binder_type binder_type)
{ {
struct tcf_block_owner_item *item; struct tcf_block_owner_item *item;
@ -1383,7 +1383,7 @@ static int tcf_block_owner_add(struct tcf_block *block,
static void tcf_block_owner_del(struct tcf_block *block, static void tcf_block_owner_del(struct tcf_block *block,
struct Qdisc *q, struct Qdisc *q,
enum tcf_block_binder_type binder_type) enum flow_block_binder_type binder_type)
{ {
struct tcf_block_owner_item *item; struct tcf_block_owner_item *item;

6
net/sched/sch_ingress.c
View File

@ -83,7 +83,7 @@ static int ingress_init(struct Qdisc *sch, struct nlattr *opt,
mini_qdisc_pair_init(&q->miniqp, sch, &dev->miniq_ingress); mini_qdisc_pair_init(&q->miniqp, sch, &dev->miniq_ingress);
q->block_info.binder_type = TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS; q->block_info.binder_type = FLOW_BLOCK_BINDER_TYPE_CLSACT_INGRESS;
q->block_info.chain_head_change = clsact_chain_head_change; q->block_info.chain_head_change = clsact_chain_head_change;
q->block_info.chain_head_change_priv = &q->miniqp; q->block_info.chain_head_change_priv = &q->miniqp;
@ -217,7 +217,7 @@ static int clsact_init(struct Qdisc *sch, struct nlattr *opt,
mini_qdisc_pair_init(&q->miniqp_ingress, sch, &dev->miniq_ingress); mini_qdisc_pair_init(&q->miniqp_ingress, sch, &dev->miniq_ingress);
q->ingress_block_info.binder_type = TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS; q->ingress_block_info.binder_type = FLOW_BLOCK_BINDER_TYPE_CLSACT_INGRESS;
q->ingress_block_info.chain_head_change = clsact_chain_head_change; q->ingress_block_info.chain_head_change = clsact_chain_head_change;
q->ingress_block_info.chain_head_change_priv = &q->miniqp_ingress; q->ingress_block_info.chain_head_change_priv = &q->miniqp_ingress;
@ -228,7 +228,7 @@ static int clsact_init(struct Qdisc *sch, struct nlattr *opt,
mini_qdisc_pair_init(&q->miniqp_egress, sch, &dev->miniq_egress); mini_qdisc_pair_init(&q->miniqp_egress, sch, &dev->miniq_egress);
q->egress_block_info.binder_type = TCF_BLOCK_BINDER_TYPE_CLSACT_EGRESS; q->egress_block_info.binder_type = FLOW_BLOCK_BINDER_TYPE_CLSACT_EGRESS;
q->egress_block_info.chain_head_change = clsact_chain_head_change; q->egress_block_info.chain_head_change = clsact_chain_head_change;
q->egress_block_info.chain_head_change_priv = &q->miniqp_egress; q->egress_block_info.chain_head_change_priv = &q->miniqp_egress;