xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: sched: make egress_dev flag part of flower offload struct

Browse Source 
Since this is specific to flower now, make it part of the flower offload
struct.

Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Acked-by: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jiri Pirko
2017-08-07 10:15:19 +02:00
committed by David S. Miller
parent ade9b65884
commit 3e0e826643
4 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -661,7 +661,7 @@ static int mlx5e_rep_ndo_setup_tc(struct net_device *dev,
if (TC_H_MAJ(handle) != TC_H_MAJ(TC_H_INGRESS)) if (TC_H_MAJ(handle) != TC_H_MAJ(TC_H_INGRESS))
return -EOPNOTSUPP; return -EOPNOTSUPP;
if (tc->egress_dev) { if (type == TC_SETUP_CLSFLOWER && tc->cls_flower->egress_dev) {
struct mlx5_eswitch *esw = priv->mdev->priv.eswitch; struct mlx5_eswitch *esw = priv->mdev->priv.eswitch;
struct net_device *uplink_dev = mlx5_eswitch_get_uplink_netdev(esw); struct net_device *uplink_dev = mlx5_eswitch_get_uplink_netdev(esw);

1
include/linux/netdevice.h
View File

@@ -792,7 +792,6 @@ struct tc_to_netdev {
struct tc_cls_bpf_offload *cls_bpf; struct tc_cls_bpf_offload *cls_bpf;
struct tc_mqprio_qopt *mqprio; struct tc_mqprio_qopt *mqprio;
}; };
bool egress_dev;
}; };
/* These structures hold the attributes of xdp state that are being passed /* These structures hold the attributes of xdp state that are being passed

1
include/net/pkt_cls.h
View File

@@ -504,6 +504,7 @@ struct tc_cls_flower_offload {
struct fl_flow_key *mask; struct fl_flow_key *mask;
struct fl_flow_key *key; struct fl_flow_key *key;
struct tcf_exts *exts; struct tcf_exts *exts;
bool egress_dev;
}; };
enum tc_matchall_command { enum tc_matchall_command {

2
net/sched/cls_flower.c
View File

@@ -259,7 +259,7 @@ static int fl_hw_replace_filter(struct tcf_proto *tp,
return tc_skip_sw(f->flags) ? -EINVAL : 0; return tc_skip_sw(f->flags) ? -EINVAL : 0;
} }
dev = f->hw_dev; dev = f->hw_dev;
tc->egress_dev = true; offload.egress_dev = true;
} else { } else {
f->hw_dev = dev; f->hw_dev = dev;
} }