Skip to content

R
raspberrypi-kernel

openeuler / raspberrypi-kernel

通知 13
Star 1
Fork 0
R
raspberrypi-kernel
提交 2572ac53 编写于 作者: J Jiri Pirko 提交者： David S. Miller
浏览文件
操作

net: sched: make type an argument for ndo_setup_tc 

Since the type is always present, push it to be a separate argument to
ndo_setup_tc. On the way, name the type enum and use it for arg type.
Signed-off-by: NJiri Pirko <jiri@mellanox.com>
Acked-by: NJamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 1afec92b
隐藏空白更改
内联 并排
Showing with 125 addition and 113 deletion
drivers/net/ethernet/amd/xgbe/xgbe-drv.c
浏览文件 @ 2572ac53
...@@ -1918,14 +1918,14 @@ static void xgbe_poll_controller(struct net_device *netdev) ...@@ -1918,14 +1918,14 @@ static void xgbe_poll_controller(struct net_device *netdev)
} }
#endif /* End CONFIG_NET_POLL_CONTROLLER */ #endif /* End CONFIG_NET_POLL_CONTROLLER */
static int xgbe_setup_tc(struct net_device *netdev, u32 handle, u32 chain_index, static int xgbe_setup_tc(struct net_device *netdev, enum tc_setup_type type,
__be16 proto, u32 handle, u32 chain_index, __be16 proto,
struct tc_to_netdev *tc_to_netdev) struct tc_to_netdev *tc_to_netdev)
{ {
struct xgbe_prv_data *pdata = netdev_priv(netdev); struct xgbe_prv_data *pdata = netdev_priv(netdev);
u8 tc; u8 tc;
if (tc_to_netdev->type != TC_SETUP_MQPRIO) if (type != TC_SETUP_MQPRIO)
return -EINVAL; return -EINVAL;
tc_to_netdev->mqprio->hw = TC_MQPRIO_HW_OFFLOAD_TCS; tc_to_netdev->mqprio->hw = TC_MQPRIO_HW_OFFLOAD_TCS;
......
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
浏览文件 @ 2572ac53
...@@ -4284,10 +4284,11 @@ int bnx2x_setup_tc(struct net_device *dev, u8 num_tc) ...@@ -4284,10 +4284,11 @@ int bnx2x_setup_tc(struct net_device *dev, u8 num_tc)
return 0; return 0;
} }
int __bnx2x_setup_tc(struct net_device *dev, u32 handle, u32 chain_index, int __bnx2x_setup_tc(struct net_device *dev, enum tc_setup_type type,
__be16 proto, struct tc_to_netdev *tc) u32 handle, u32 chain_index, __be16 proto,
struct tc_to_netdev *tc)
{ {
if (tc->type != TC_SETUP_MQPRIO) if (type != TC_SETUP_MQPRIO)
return -EINVAL; return -EINVAL;
tc->mqprio->hw = TC_MQPRIO_HW_OFFLOAD_TCS; tc->mqprio->hw = TC_MQPRIO_HW_OFFLOAD_TCS;
......
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
浏览文件 @ 2572ac53
...@@ -486,8 +486,9 @@ netdev_tx_t bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev); ...@@ -486,8 +486,9 @@ netdev_tx_t bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev);
/* setup_tc callback */ /* setup_tc callback */
int bnx2x_setup_tc(struct net_device *dev, u8 num_tc); int bnx2x_setup_tc(struct net_device *dev, u8 num_tc);
int __bnx2x_setup_tc(struct net_device *dev, u32 handle, u32 chain_index, int __bnx2x_setup_tc(struct net_device *dev, enum tc_setup_type type,
__be16 proto, struct tc_to_netdev *tc); u32 handle, u32 chain_index, __be16 proto,
struct tc_to_netdev *tc);
int bnx2x_get_vf_config(struct net_device *dev, int vf, int bnx2x_get_vf_config(struct net_device *dev, int vf,
struct ifla_vf_info *ivi); struct ifla_vf_info *ivi);
......
drivers/net/ethernet/broadcom/bnxt/bnxt.c
浏览文件 @ 2572ac53
...@@ -7237,10 +7237,11 @@ int bnxt_setup_mq_tc(struct net_device *dev, u8 tc) ...@@ -7237,10 +7237,11 @@ int bnxt_setup_mq_tc(struct net_device *dev, u8 tc)
return 0; return 0;
} }
static int bnxt_setup_tc(struct net_device *dev, u32 handle, u32 chain_index, static int bnxt_setup_tc(struct net_device *dev, enum tc_setup_type type,
__be16 proto, struct tc_to_netdev *ntc) u32 handle, u32 chain_index, __be16 proto,
struct tc_to_netdev *ntc)
{ {
if (ntc->type != TC_SETUP_MQPRIO) if (type != TC_SETUP_MQPRIO)
return -EINVAL; return -EINVAL;
ntc->mqprio->hw = TC_MQPRIO_HW_OFFLOAD_TCS; ntc->mqprio->hw = TC_MQPRIO_HW_OFFLOAD_TCS;
......
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
浏览文件 @ 2572ac53
...@@ -2889,8 +2889,9 @@ static int cxgb_set_tx_maxrate(struct net_device *dev, int index, u32 rate) ...@@ -2889,8 +2889,9 @@ static int cxgb_set_tx_maxrate(struct net_device *dev, int index, u32 rate)
return err; return err;
} }
static int cxgb_setup_tc(struct net_device *dev, u32 handle, u32 chain_index, static int cxgb_setup_tc(struct net_device *dev, enum tc_setup_type type,
__be16 proto, struct tc_to_netdev *tc) u32 handle, u32 chain_index, __be16 proto,
struct tc_to_netdev *tc)
{ {
struct port_info *pi = netdev2pinfo(dev); struct port_info *pi = netdev2pinfo(dev);
struct adapter *adap = netdev2adap(dev); struct adapter *adap = netdev2adap(dev);
...@@ -2906,7 +2907,7 @@ static int cxgb_setup_tc(struct net_device *dev, u32 handle, u32 chain_index, ...@@ -2906,7 +2907,7 @@ static int cxgb_setup_tc(struct net_device *dev, u32 handle, u32 chain_index,
} }
if (TC_H_MAJ(handle) == TC_H_MAJ(TC_H_INGRESS) && if (TC_H_MAJ(handle) == TC_H_MAJ(TC_H_INGRESS) &&
tc->type == TC_SETUP_CLSU32) { type == TC_SETUP_CLSU32) {
switch (tc->cls_u32->command) { switch (tc->cls_u32->command) {
case TC_CLSU32_NEW_KNODE: case TC_CLSU32_NEW_KNODE:
case TC_CLSU32_REPLACE_KNODE: case TC_CLSU32_REPLACE_KNODE:
......
drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
浏览文件 @ 2572ac53
...@@ -342,14 +342,15 @@ static void dpaa_get_stats64(struct net_device *net_dev, ...@@ -342,14 +342,15 @@ static void dpaa_get_stats64(struct net_device *net_dev,
} }
} }
static int dpaa_setup_tc(struct net_device *net_dev, u32 handle, static int dpaa_setup_tc(struct net_device *net_dev, enum tc_setup_type type,
u32 chain_index, __be16 proto, struct tc_to_netdev *tc) u32 handle, u32 chain_index, __be16 proto,
struct tc_to_netdev *tc)
{ {
struct dpaa_priv *priv = netdev_priv(net_dev); struct dpaa_priv *priv = netdev_priv(net_dev);
u8 num_tc; u8 num_tc;
int i; int i;
if (tc->type != TC_SETUP_MQPRIO) if (type != TC_SETUP_MQPRIO)
return -EINVAL; return -EINVAL;
tc->mqprio->hw = TC_MQPRIO_HW_OFFLOAD_TCS; tc->mqprio->hw = TC_MQPRIO_HW_OFFLOAD_TCS;
......
drivers/net/ethernet/hisilicon/hns3/hns3pf/hns3_enet.c
浏览文件 @ 2572ac53
...@@ -1219,11 +1219,11 @@ static int hns3_setup_tc(struct net_device *netdev, u8 tc) ...@@ -1219,11 +1219,11 @@ static int hns3_setup_tc(struct net_device *netdev, u8 tc)
return 0; return 0;
} }
static int hns3_nic_setup_tc(struct net_device *dev, u32 handle, static int hns3_nic_setup_tc(struct net_device *dev, enum tc_setup_type type,
u32 chain_index, __be16 protocol, u32 handle, u32 chain_index, __be16 protocol,
struct tc_to_netdev *tc) struct tc_to_netdev *tc)
{ {
if (handle != TC_H_ROOT || tc->type != TC_SETUP_MQPRIO) if (handle != TC_H_ROOT || type != TC_SETUP_MQPRIO)
return -EINVAL; return -EINVAL;
return hns3_setup_tc(dev, tc->mqprio->num_tc); return hns3_setup_tc(dev, tc->mqprio->num_tc);
......
drivers/net/ethernet/intel/fm10k/fm10k_netdev.c
浏览文件 @ 2572ac53
...@@ -1265,10 +1265,11 @@ int fm10k_setup_tc(struct net_device *dev, u8 tc) ...@@ -1265,10 +1265,11 @@ int fm10k_setup_tc(struct net_device *dev, u8 tc)
return err; return err;
} }
static int __fm10k_setup_tc(struct net_device *dev, u32 handle, u32 chain_index, static int __fm10k_setup_tc(struct net_device *dev, enum tc_setup_type type,
__be16 proto, struct tc_to_netdev *tc) u32 handle, u32 chain_index, __be16 proto,
struct tc_to_netdev *tc)
{ {
if (tc->type != TC_SETUP_MQPRIO) if (type != TC_SETUP_MQPRIO)
return -EINVAL; return -EINVAL;
tc->mqprio->hw = TC_MQPRIO_HW_OFFLOAD_TCS; tc->mqprio->hw = TC_MQPRIO_HW_OFFLOAD_TCS;
......
drivers/net/ethernet/intel/i40e/i40e_main.c
浏览文件 @ 2572ac53
...@@ -5656,11 +5656,11 @@ static int i40e_setup_tc(struct net_device *netdev, u8 tc) ...@@ -5656,11 +5656,11 @@ static int i40e_setup_tc(struct net_device *netdev, u8 tc)
return ret; return ret;
} }
static int __i40e_setup_tc(struct net_device *netdev, u32 handle, static int __i40e_setup_tc(struct net_device *netdev, enum tc_setup_type type,
u32 chain_index, __be16 proto, u32 handle, u32 chain_index, __be16 proto,
struct tc_to_netdev *tc) struct tc_to_netdev *tc)
{ {
if (tc->type != TC_SETUP_MQPRIO) if (type != TC_SETUP_MQPRIO)
return -EINVAL; return -EINVAL;
tc->mqprio->hw = TC_MQPRIO_HW_OFFLOAD_TCS; tc->mqprio->hw = TC_MQPRIO_HW_OFFLOAD_TCS;
......
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
浏览文件 @ 2572ac53
...@@ -9226,8 +9226,9 @@ static int ixgbe_configure_clsu32(struct ixgbe_adapter *adapter, ...@@ -9226,8 +9226,9 @@ static int ixgbe_configure_clsu32(struct ixgbe_adapter *adapter,
return err; return err;
} }
static int __ixgbe_setup_tc(struct net_device *dev, u32 handle, u32 chain_index, static int __ixgbe_setup_tc(struct net_device *dev, enum tc_setup_type type,
__be16 proto, struct tc_to_netdev *tc) u32 handle, u32 chain_index, __be16 proto,
struct tc_to_netdev *tc)
{ {
struct ixgbe_adapter *adapter = netdev_priv(dev); struct ixgbe_adapter *adapter = netdev_priv(dev);
...@@ -9235,7 +9236,7 @@ static int __ixgbe_setup_tc(struct net_device *dev, u32 handle, u32 chain_index, ...@@ -9235,7 +9236,7 @@ static int __ixgbe_setup_tc(struct net_device *dev, u32 handle, u32 chain_index,
return -EOPNOTSUPP; return -EOPNOTSUPP;
if (TC_H_MAJ(handle) == TC_H_MAJ(TC_H_INGRESS) && if (TC_H_MAJ(handle) == TC_H_MAJ(TC_H_INGRESS) &&
tc->type == TC_SETUP_CLSU32) { type == TC_SETUP_CLSU32) {
switch (tc->cls_u32->command) { switch (tc->cls_u32->command) {
case TC_CLSU32_NEW_KNODE: case TC_CLSU32_NEW_KNODE:
case TC_CLSU32_REPLACE_KNODE: case TC_CLSU32_REPLACE_KNODE:
...@@ -9255,7 +9256,7 @@ static int __ixgbe_setup_tc(struct net_device *dev, u32 handle, u32 chain_index, ...@@ -9255,7 +9256,7 @@ static int __ixgbe_setup_tc(struct net_device *dev, u32 handle, u32 chain_index,
} }
} }
if (tc->type != TC_SETUP_MQPRIO) if (type != TC_SETUP_MQPRIO)
return -EINVAL; return -EINVAL;
tc->mqprio->hw = TC_MQPRIO_HW_OFFLOAD_TCS; tc->mqprio->hw = TC_MQPRIO_HW_OFFLOAD_TCS;
......
drivers/net/ethernet/mellanox/mlx4/en_netdev.c
浏览文件 @ 2572ac53
...@@ -130,11 +130,11 @@ int mlx4_en_alloc_tx_queue_per_tc(struct net_device *dev, u8 tc) ...@@ -130,11 +130,11 @@ int mlx4_en_alloc_tx_queue_per_tc(struct net_device *dev, u8 tc)
return err; return err;
} }
static int __mlx4_en_setup_tc(struct net_device *dev, u32 handle, static int __mlx4_en_setup_tc(struct net_device *dev, enum tc_setup_type type,
u32 chain_index, __be16 proto, u32 handle, u32 chain_index, __be16 proto,
struct tc_to_netdev *tc) struct tc_to_netdev *tc)
{ {
if (tc->type != TC_SETUP_MQPRIO) if (type != TC_SETUP_MQPRIO)
return -EINVAL; return -EINVAL;
if (tc->mqprio->num_tc && tc->mqprio->num_tc != MLX4_EN_NUM_UP_HIGH) if (tc->mqprio->num_tc && tc->mqprio->num_tc != MLX4_EN_NUM_UP_HIGH)
......
drivers/net/ethernet/mellanox/mlx5/core/en_main.c
浏览文件 @ 2572ac53
...@@ -3027,8 +3027,8 @@ static int mlx5e_setup_tc(struct net_device *netdev, u8 tc) ...@@ -3027,8 +3027,8 @@ static int mlx5e_setup_tc(struct net_device *netdev, u8 tc)
return err; return err;
} }
static int mlx5e_ndo_setup_tc(struct net_device *dev, u32 handle, static int mlx5e_ndo_setup_tc(struct net_device *dev, enum tc_setup_type type,
u32 chain_index, __be16 proto, u32 handle, u32 chain_index, __be16 proto,
struct tc_to_netdev *tc) struct tc_to_netdev *tc)
{ {
struct mlx5e_priv *priv = netdev_priv(dev); struct mlx5e_priv *priv = netdev_priv(dev);
...@@ -3039,7 +3039,7 @@ static int mlx5e_ndo_setup_tc(struct net_device *dev, u32 handle, ...@@ -3039,7 +3039,7 @@ static int mlx5e_ndo_setup_tc(struct net_device *dev, u32 handle,
if (chain_index) if (chain_index)
return -EOPNOTSUPP; return -EOPNOTSUPP;
switch (tc->type) { switch (type) {
case TC_SETUP_CLSFLOWER: case TC_SETUP_CLSFLOWER:
switch (tc->cls_flower->command) { switch (tc->cls_flower->command) {
case TC_CLSFLOWER_REPLACE: case TC_CLSFLOWER_REPLACE:
...@@ -3054,7 +3054,7 @@ static int mlx5e_ndo_setup_tc(struct net_device *dev, u32 handle, ...@@ -3054,7 +3054,7 @@ static int mlx5e_ndo_setup_tc(struct net_device *dev, u32 handle,
} }
mqprio: mqprio:
if (tc->type != TC_SETUP_MQPRIO) if (type != TC_SETUP_MQPRIO)
return -EINVAL; return -EINVAL;
tc->mqprio->hw = TC_MQPRIO_HW_OFFLOAD_TCS; tc->mqprio->hw = TC_MQPRIO_HW_OFFLOAD_TCS;
......
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
浏览文件 @ 2572ac53
...@@ -651,7 +651,8 @@ static int mlx5e_rep_get_phys_port_name(struct net_device *dev, ...@@ -651,7 +651,8 @@ static int mlx5e_rep_get_phys_port_name(struct net_device *dev,
return 0; return 0;
} }
static int mlx5e_rep_ndo_setup_tc(struct net_device *dev, u32 handle, static int mlx5e_rep_ndo_setup_tc(struct net_device *dev,
enum tc_setup_type type, u32 handle,
u32 chain_index, __be16 proto, u32 chain_index, __be16 proto,
struct tc_to_netdev *tc) struct tc_to_netdev *tc)
{ {
...@@ -664,15 +665,15 @@ static int mlx5e_rep_ndo_setup_tc(struct net_device *dev, u32 handle, ...@@ -664,15 +665,15 @@ static int mlx5e_rep_ndo_setup_tc(struct net_device *dev, u32 handle,
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);
return uplink_dev->netdev_ops->ndo_setup_tc(uplink_dev, handle, return uplink_dev->netdev_ops->ndo_setup_tc(uplink_dev, type,
chain_index, handle, chain_index,
proto, tc); proto, tc);
} }
if (chain_index) if (chain_index)
return -EOPNOTSUPP; return -EOPNOTSUPP;
switch (tc->type) { switch (type) {
case TC_SETUP_CLSFLOWER: case TC_SETUP_CLSFLOWER:
switch (tc->cls_flower->command) { switch (tc->cls_flower->command) {
case TC_CLSFLOWER_REPLACE: case TC_CLSFLOWER_REPLACE:
......
drivers/net/ethernet/mellanox/mlxsw/spectrum.c
浏览文件 @ 2572ac53
...@@ -1693,8 +1693,8 @@ static void mlxsw_sp_port_del_cls_matchall(struct mlxsw_sp_port *mlxsw_sp_port, ...@@ -1693,8 +1693,8 @@ static void mlxsw_sp_port_del_cls_matchall(struct mlxsw_sp_port *mlxsw_sp_port,
kfree(mall_tc_entry); kfree(mall_tc_entry);
} }
static int mlxsw_sp_setup_tc(struct net_device *dev, u32 handle, static int mlxsw_sp_setup_tc(struct net_device *dev, enum tc_setup_type type,
u32 chain_index, __be16 proto, u32 handle, u32 chain_index, __be16 proto,
struct tc_to_netdev *tc) struct tc_to_netdev *tc)
{ {
struct mlxsw_sp_port *mlxsw_sp_port = netdev_priv(dev); struct mlxsw_sp_port *mlxsw_sp_port = netdev_priv(dev);
...@@ -1703,7 +1703,7 @@ static int mlxsw_sp_setup_tc(struct net_device *dev, u32 handle, ...@@ -1703,7 +1703,7 @@ static int mlxsw_sp_setup_tc(struct net_device *dev, u32 handle,
if (chain_index) if (chain_index)
return -EOPNOTSUPP; return -EOPNOTSUPP;
switch (tc->type) { switch (type) {
case TC_SETUP_MATCHALL: case TC_SETUP_MATCHALL:
switch (tc->cls_mall->command) { switch (tc->cls_mall->command) {
case TC_CLSMATCHALL_REPLACE: case TC_CLSMATCHALL_REPLACE:
...@@ -1733,9 +1733,9 @@ static int mlxsw_sp_setup_tc(struct net_device *dev, u32 handle, ...@@ -1733,9 +1733,9 @@ static int mlxsw_sp_setup_tc(struct net_device *dev, u32 handle,
default: default:
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
default:
return -EOPNOTSUPP;
} }
return -EOPNOTSUPP;
} }
static const struct net_device_ops mlxsw_sp_port_netdev_ops = { static const struct net_device_ops mlxsw_sp_port_netdev_ops = {
......
drivers/net/ethernet/netronome/nfp/bpf/main.c
浏览文件 @ 2572ac53
...@@ -121,7 +121,8 @@ static void nfp_bpf_vnic_clean(struct nfp_app *app, struct nfp_net *nn) ...@@ -121,7 +121,8 @@ static void nfp_bpf_vnic_clean(struct nfp_app *app, struct nfp_net *nn)
} }
static int nfp_bpf_setup_tc(struct nfp_app *app, struct net_device *netdev, static int nfp_bpf_setup_tc(struct nfp_app *app, struct net_device *netdev,
u32 handle, __be16 proto, struct tc_to_netdev *tc) enum tc_setup_type type, u32 handle, __be16 proto,
struct tc_to_netdev *tc)
{ {
struct nfp_net *nn = netdev_priv(netdev); struct nfp_net *nn = netdev_priv(netdev);
...@@ -130,7 +131,7 @@ static int nfp_bpf_setup_tc(struct nfp_app *app, struct net_device *netdev, ...@@ -130,7 +131,7 @@ static int nfp_bpf_setup_tc(struct nfp_app *app, struct net_device *netdev,
if (proto != htons(ETH_P_ALL)) if (proto != htons(ETH_P_ALL))
return -EOPNOTSUPP; return -EOPNOTSUPP;
if (tc->type == TC_SETUP_CLSBPF && nfp_net_ebpf_capable(nn)) { if (type == TC_SETUP_CLSBPF && nfp_net_ebpf_capable(nn)) {
if (!nn->dp.bpf_offload_xdp) if (!nn->dp.bpf_offload_xdp)
return nfp_net_bpf_offload(nn, tc->cls_bpf); return nfp_net_bpf_offload(nn, tc->cls_bpf);
else else
......
drivers/net/ethernet/netronome/nfp/flower/main.h
浏览文件 @ 2572ac53
...@@ -135,7 +135,8 @@ int nfp_flower_metadata_init(struct nfp_app *app); ...@@ -135,7 +135,8 @@ int nfp_flower_metadata_init(struct nfp_app *app);
void nfp_flower_metadata_cleanup(struct nfp_app *app); void nfp_flower_metadata_cleanup(struct nfp_app *app);
int nfp_flower_setup_tc(struct nfp_app *app, struct net_device *netdev, int nfp_flower_setup_tc(struct nfp_app *app, struct net_device *netdev,
u32 handle, __be16 proto, struct tc_to_netdev *tc); enum tc_setup_type type, u32 handle, __be16 proto,
struct tc_to_netdev *tc);
int nfp_flower_compile_flow_match(struct tc_cls_flower_offload *flow, int nfp_flower_compile_flow_match(struct tc_cls_flower_offload *flow,
struct nfp_fl_key_ls *key_ls, struct nfp_fl_key_ls *key_ls,
struct net_device *netdev, struct net_device *netdev,
......
drivers/net/ethernet/netronome/nfp/flower/offload.c
浏览文件 @ 2572ac53
...@@ -385,7 +385,8 @@ nfp_flower_repr_offload(struct nfp_app *app, struct net_device *netdev, ...@@ -385,7 +385,8 @@ nfp_flower_repr_offload(struct nfp_app *app, struct net_device *netdev,
} }
int nfp_flower_setup_tc(struct nfp_app *app, struct net_device *netdev, int nfp_flower_setup_tc(struct nfp_app *app, struct net_device *netdev,
u32 handle, __be16 proto, struct tc_to_netdev *tc) enum tc_setup_type type, u32 handle, __be16 proto,
struct tc_to_netdev *tc)
{ {
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;
...@@ -393,7 +394,7 @@ int nfp_flower_setup_tc(struct nfp_app *app, struct net_device *netdev, ...@@ -393,7 +394,7 @@ int nfp_flower_setup_tc(struct nfp_app *app, struct net_device *netdev,
if (!eth_proto_is_802_3(proto)) if (!eth_proto_is_802_3(proto))
return -EOPNOTSUPP; return -EOPNOTSUPP;
if (tc->type != TC_SETUP_CLSFLOWER) if (type != TC_SETUP_CLSFLOWER)
return -EINVAL; return -EINVAL;
return nfp_flower_repr_offload(app, netdev, tc->cls_flower); return nfp_flower_repr_offload(app, netdev, tc->cls_flower);
......
drivers/net/ethernet/netronome/nfp/nfp_app.h
浏览文件 @ 2572ac53
...@@ -109,7 +109,8 @@ struct nfp_app_type { ...@@ -109,7 +109,8 @@ struct nfp_app_type {
void (*ctrl_msg_rx)(struct nfp_app *app, struct sk_buff *skb); void (*ctrl_msg_rx)(struct nfp_app *app, struct sk_buff *skb);
int (*setup_tc)(struct nfp_app *app, struct net_device *netdev, int (*setup_tc)(struct nfp_app *app, struct net_device *netdev,
u32 handle, __be16 proto, struct tc_to_netdev *tc); enum tc_setup_type type, u32 handle, __be16 proto,
struct tc_to_netdev *tc);
bool (*tc_busy)(struct nfp_app *app, struct nfp_net *nn); bool (*tc_busy)(struct nfp_app *app, struct nfp_net *nn);
int (*xdp_offload)(struct nfp_app *app, struct nfp_net *nn, int (*xdp_offload)(struct nfp_app *app, struct nfp_net *nn,
struct bpf_prog *prog); struct bpf_prog *prog);
...@@ -238,12 +239,13 @@ static inline bool nfp_app_tc_busy(struct nfp_app *app, struct nfp_net *nn) ...@@ -238,12 +239,13 @@ static inline bool nfp_app_tc_busy(struct nfp_app *app, struct nfp_net *nn)
static inline int nfp_app_setup_tc(struct nfp_app *app, static inline int nfp_app_setup_tc(struct nfp_app *app,
struct net_device *netdev, struct net_device *netdev,
enum tc_setup_type type,
u32 handle, __be16 proto, u32 handle, __be16 proto,
struct tc_to_netdev *tc) struct tc_to_netdev *tc)
{ {
if (!app || !app->type->setup_tc) if (!app || !app->type->setup_tc)
return -EOPNOTSUPP; return -EOPNOTSUPP;
return app->type->setup_tc(app, netdev, handle, proto, tc); return app->type->setup_tc(app, netdev, type, handle, proto, tc);
} }
static inline int nfp_app_xdp_offload(struct nfp_app *app, struct nfp_net *nn, static inline int nfp_app_xdp_offload(struct nfp_app *app, struct nfp_net *nn,
......
drivers/net/ethernet/netronome/nfp/nfp_port.c
浏览文件 @ 2572ac53
...@@ -88,8 +88,9 @@ const struct switchdev_ops nfp_port_switchdev_ops = { ...@@ -88,8 +88,9 @@ const struct switchdev_ops nfp_port_switchdev_ops = {
.switchdev_port_attr_get = nfp_port_attr_get, .switchdev_port_attr_get = nfp_port_attr_get,
}; };
int nfp_port_setup_tc(struct net_device *netdev, u32 handle, u32 chain_index, int nfp_port_setup_tc(struct net_device *netdev, enum tc_setup_type type,
__be16 proto, struct tc_to_netdev *tc) u32 handle, u32 chain_index, __be16 proto,
struct tc_to_netdev *tc)
{ {
struct nfp_port *port; struct nfp_port *port;
...@@ -100,7 +101,7 @@ int nfp_port_setup_tc(struct net_device *netdev, u32 handle, u32 chain_index, ...@@ -100,7 +101,7 @@ int nfp_port_setup_tc(struct net_device *netdev, u32 handle, u32 chain_index,
if (!port) if (!port)
return -EOPNOTSUPP; return -EOPNOTSUPP;
return nfp_app_setup_tc(port->app, netdev, handle, proto, tc); return nfp_app_setup_tc(port->app, netdev, type, handle, proto, tc);
} }
struct nfp_port * struct nfp_port *
......
drivers/net/ethernet/netronome/nfp/nfp_port.h
浏览文件 @ 2572ac53
...@@ -109,8 +109,9 @@ struct nfp_port { ...@@ -109,8 +109,9 @@ struct nfp_port {
extern const struct switchdev_ops nfp_port_switchdev_ops; extern const struct switchdev_ops nfp_port_switchdev_ops;
int nfp_port_setup_tc(struct net_device *netdev, u32 handle, u32 chain_index, int nfp_port_setup_tc(struct net_device *netdev, enum tc_setup_type type,
__be16 proto, struct tc_to_netdev *tc); u32 handle, u32 chain_index, __be16 proto,
struct tc_to_netdev *tc);
struct nfp_port *nfp_port_from_netdev(struct net_device *netdev); struct nfp_port *nfp_port_from_netdev(struct net_device *netdev);
struct nfp_port * struct nfp_port *
......
drivers/net/ethernet/sfc/efx.h
浏览文件 @ 2572ac53
...@@ -32,8 +32,9 @@ netdev_tx_t efx_hard_start_xmit(struct sk_buff *skb, ...@@ -32,8 +32,9 @@ netdev_tx_t efx_hard_start_xmit(struct sk_buff *skb,
struct net_device *net_dev); struct net_device *net_dev);
netdev_tx_t efx_enqueue_skb(struct efx_tx_queue *tx_queue, struct sk_buff *skb); netdev_tx_t efx_enqueue_skb(struct efx_tx_queue *tx_queue, struct sk_buff *skb);
void efx_xmit_done(struct efx_tx_queue *tx_queue, unsigned int index); void efx_xmit_done(struct efx_tx_queue *tx_queue, unsigned int index);
int efx_setup_tc(struct net_device *net_dev, u32 handle, u32 chain_index, int efx_setup_tc(struct net_device *net_dev, enum tc_setup_type type,
__be16 proto, struct tc_to_netdev *tc); u32 handle, u32 chain_index, __be16 proto,
struct tc_to_netdev *tc);
unsigned int efx_tx_max_skb_descs(struct efx_nic *efx); unsigned int efx_tx_max_skb_descs(struct efx_nic *efx);
extern unsigned int efx_piobuf_size; extern unsigned int efx_piobuf_size;
extern bool efx_separate_tx_channels; extern bool efx_separate_tx_channels;
......
drivers/net/ethernet/sfc/falcon/efx.h
浏览文件 @ 2572ac53
...@@ -32,8 +32,9 @@ netdev_tx_t ef4_hard_start_xmit(struct sk_buff *skb, ...@@ -32,8 +32,9 @@ netdev_tx_t ef4_hard_start_xmit(struct sk_buff *skb,
struct net_device *net_dev); struct net_device *net_dev);
netdev_tx_t ef4_enqueue_skb(struct ef4_tx_queue *tx_queue, struct sk_buff *skb); netdev_tx_t ef4_enqueue_skb(struct ef4_tx_queue *tx_queue, struct sk_buff *skb);
void ef4_xmit_done(struct ef4_tx_queue *tx_queue, unsigned int index); void ef4_xmit_done(struct ef4_tx_queue *tx_queue, unsigned int index);
int ef4_setup_tc(struct net_device *net_dev, u32 handle, u32 chain_index, int ef4_setup_tc(struct net_device *net_dev, enum tc_setup_type type,
__be16 proto, struct tc_to_netdev *tc); u32 handle, u32 chain_index, __be16 proto,
struct tc_to_netdev *tc);
unsigned int ef4_tx_max_skb_descs(struct ef4_nic *efx); unsigned int ef4_tx_max_skb_descs(struct ef4_nic *efx);
extern bool ef4_separate_tx_channels; extern bool ef4_separate_tx_channels;
......
drivers/net/ethernet/sfc/falcon/tx.c
浏览文件 @ 2572ac53
...@@ -425,8 +425,9 @@ void ef4_init_tx_queue_core_txq(struct ef4_tx_queue *tx_queue) ...@@ -425,8 +425,9 @@ void ef4_init_tx_queue_core_txq(struct ef4_tx_queue *tx_queue)
efx->n_tx_channels : 0)); efx->n_tx_channels : 0));
} }
int ef4_setup_tc(struct net_device *net_dev, u32 handle, u32 chain_index, int ef4_setup_tc(struct net_device *net_dev, enum tc_setup_type type,
__be16 proto, struct tc_to_netdev *ntc) u32 handle, u32 chain_index, __be16 proto,
struct tc_to_netdev *ntc)
{ {
struct ef4_nic *efx = netdev_priv(net_dev); struct ef4_nic *efx = netdev_priv(net_dev);
struct ef4_channel *channel; struct ef4_channel *channel;
...@@ -434,7 +435,7 @@ int ef4_setup_tc(struct net_device *net_dev, u32 handle, u32 chain_index, ...@@ -434,7 +435,7 @@ int ef4_setup_tc(struct net_device *net_dev, u32 handle, u32 chain_index,
unsigned tc, num_tc; unsigned tc, num_tc;
int rc; int rc;
if (ntc->type != TC_SETUP_MQPRIO) if (type != TC_SETUP_MQPRIO)
return -EINVAL; return -EINVAL;
num_tc = ntc->mqprio->num_tc; num_tc = ntc->mqprio->num_tc;
......
drivers/net/ethernet/sfc/tx.c
浏览文件 @ 2572ac53
...@@ -653,8 +653,9 @@ void efx_init_tx_queue_core_txq(struct efx_tx_queue *tx_queue) ...@@ -653,8 +653,9 @@ void efx_init_tx_queue_core_txq(struct efx_tx_queue *tx_queue)
efx->n_tx_channels : 0)); efx->n_tx_channels : 0));
} }
int efx_setup_tc(struct net_device *net_dev, u32 handle, u32 chain_index, int efx_setup_tc(struct net_device *net_dev, enum tc_setup_type type,
__be16 proto, struct tc_to_netdev *ntc) u32 handle, u32 chain_index, __be16 proto,
struct tc_to_netdev *ntc)
{ {
struct efx_nic *efx = netdev_priv(net_dev); struct efx_nic *efx = netdev_priv(net_dev);
struct efx_channel *channel; struct efx_channel *channel;
...@@ -662,7 +663,7 @@ int efx_setup_tc(struct net_device *net_dev, u32 handle, u32 chain_index, ...@@ -662,7 +663,7 @@ int efx_setup_tc(struct net_device *net_dev, u32 handle, u32 chain_index,
unsigned tc, num_tc; unsigned tc, num_tc;
int rc; int rc;
if (ntc->type != TC_SETUP_MQPRIO) if (type != TC_SETUP_MQPRIO)
return -EINVAL; return -EINVAL;
num_tc = ntc->mqprio->num_tc; num_tc = ntc->mqprio->num_tc;
......
drivers/net/ethernet/ti/netcp_core.c
浏览文件 @ 2572ac53
...@@ -1877,8 +1877,9 @@ static u16 netcp_select_queue(struct net_device *dev, struct sk_buff *skb, ...@@ -1877,8 +1877,9 @@ static u16 netcp_select_queue(struct net_device *dev, struct sk_buff *skb,
return 0; return 0;
} }
static int netcp_setup_tc(struct net_device *dev, u32 handle, u32 chain_index, static int netcp_setup_tc(struct net_device *dev, enum tc_setup_type type,
__be16 proto, struct tc_to_netdev *tc) u32 handle, u32 chain_index, __be16 proto,
struct tc_to_netdev *tc)
{ {
u8 num_tc; u8 num_tc;
int i; int i;
...@@ -1886,7 +1887,7 @@ static int netcp_setup_tc(struct net_device *dev, u32 handle, u32 chain_index, ...@@ -1886,7 +1887,7 @@ static int netcp_setup_tc(struct net_device *dev, u32 handle, u32 chain_index,
/* setup tc must be called under rtnl lock */ /* setup tc must be called under rtnl lock */
ASSERT_RTNL(); ASSERT_RTNL();
if (tc->type != TC_SETUP_MQPRIO) if (type != TC_SETUP_MQPRIO)
return -EINVAL; return -EINVAL;
tc->mqprio->hw = TC_MQPRIO_HW_OFFLOAD_TCS; tc->mqprio->hw = TC_MQPRIO_HW_OFFLOAD_TCS;
......
include/linux/netdevice.h
浏览文件 @ 2572ac53
...@@ -774,7 +774,7 @@ typedef u16 (*select_queue_fallback_t)(struct net_device *dev, ...@@ -774,7 +774,7 @@ typedef u16 (*select_queue_fallback_t)(struct net_device *dev,
/* These structures hold the attributes of qdisc and classifiers /* These structures hold the attributes of qdisc and classifiers
* that are being passed to the netdevice through the setup_tc op. * that are being passed to the netdevice through the setup_tc op.
*/ */
enum { enum tc_setup_type {
TC_SETUP_MQPRIO, TC_SETUP_MQPRIO,
TC_SETUP_CLSU32, TC_SETUP_CLSU32,
TC_SETUP_CLSFLOWER, TC_SETUP_CLSFLOWER,
...@@ -785,7 +785,6 @@ enum { ...@@ -785,7 +785,6 @@ enum {
struct tc_cls_u32_offload; struct tc_cls_u32_offload;
struct tc_to_netdev { struct tc_to_netdev {
unsigned int type;
union { union {
struct tc_cls_u32_offload *cls_u32; struct tc_cls_u32_offload *cls_u32;
struct tc_cls_flower_offload *cls_flower; struct tc_cls_flower_offload *cls_flower;
...@@ -978,8 +977,9 @@ struct xfrmdev_ops { ...@@ -978,8 +977,9 @@ struct xfrmdev_ops {
* with PF and querying it may introduce a theoretical security risk. * with PF and querying it may introduce a theoretical security risk.
* int (*ndo_set_vf_rss_query_en)(struct net_device *dev, int vf, bool setting); * int (*ndo_set_vf_rss_query_en)(struct net_device *dev, int vf, bool setting);
* int (*ndo_get_vf_port)(struct net_device *dev, int vf, struct sk_buff *skb); * int (*ndo_get_vf_port)(struct net_device *dev, int vf, struct sk_buff *skb);
* int (*ndo_setup_tc)(struct net_device *dev, u32 handle, u32 chain_index, * int (*ndo_setup_tc)(struct net_device *dev, enum tc_setup_type type,
* __be16 protocol, struct tc_to_netdev *tc); * u32 handle, u32 chain_index, __be16 protocol,
* struct tc_to_netdev *tc);
* Called to setup any 'tc' scheduler, classifier or action on @dev. * Called to setup any 'tc' scheduler, classifier or action on @dev.
* This is always called from the stack with the rtnl lock held and netif * This is always called from the stack with the rtnl lock held and netif
* tx queues stopped. This allows the netdevice to perform queue * tx queues stopped. This allows the netdevice to perform queue
...@@ -1227,6 +1227,7 @@ struct net_device_ops { ...@@ -1227,6 +1227,7 @@ struct net_device_ops {
struct net_device *dev, struct net_device *dev,
int vf, bool setting); int vf, bool setting);
int (*ndo_setup_tc)(struct net_device *dev, int (*ndo_setup_tc)(struct net_device *dev,
enum tc_setup_type type,
u32 handle, u32 chain_index, u32 handle, u32 chain_index,
__be16 protocol, __be16 protocol,
struct tc_to_netdev *tc); struct tc_to_netdev *tc);
......
net/dsa/slave.c
浏览文件 @ 2572ac53
...@@ -863,8 +863,8 @@ static void dsa_slave_del_cls_matchall(struct net_device *dev, ...@@ -863,8 +863,8 @@ static void dsa_slave_del_cls_matchall(struct net_device *dev,
kfree(mall_tc_entry); kfree(mall_tc_entry);
} }
static int dsa_slave_setup_tc(struct net_device *dev, u32 handle, static int dsa_slave_setup_tc(struct net_device *dev, enum tc_setup_type type,
u32 chain_index, __be16 protocol, u32 handle, u32 chain_index, __be16 protocol,
struct tc_to_netdev *tc) struct tc_to_netdev *tc)
{ {
bool ingress = TC_H_MAJ(handle) == TC_H_MAJ(TC_H_INGRESS); bool ingress = TC_H_MAJ(handle) == TC_H_MAJ(TC_H_INGRESS);
...@@ -872,7 +872,7 @@ static int dsa_slave_setup_tc(struct net_device *dev, u32 handle, ...@@ -872,7 +872,7 @@ static int dsa_slave_setup_tc(struct net_device *dev, u32 handle,
if (chain_index) if (chain_index)
return -EOPNOTSUPP; return -EOPNOTSUPP;
switch (tc->type) { switch (type) {
case TC_SETUP_MATCHALL: case TC_SETUP_MATCHALL:
switch (tc->cls_mall->command) { switch (tc->cls_mall->command) {
case TC_CLSMATCHALL_REPLACE: case TC_CLSMATCHALL_REPLACE:
......
net/sched/cls_bpf.c
浏览文件 @ 2572ac53
...@@ -151,7 +151,6 @@ static int cls_bpf_offload_cmd(struct tcf_proto *tp, struct cls_bpf_prog *prog, ...@@ -151,7 +151,6 @@ static int cls_bpf_offload_cmd(struct tcf_proto *tp, struct cls_bpf_prog *prog,
struct tc_to_netdev offload; struct tc_to_netdev offload;
int err; int err;
offload.type = TC_SETUP_CLSBPF;
offload.cls_bpf = &bpf_offload; offload.cls_bpf = &bpf_offload;
bpf_offload.command = cmd; bpf_offload.command = cmd;
...@@ -161,7 +160,8 @@ static int cls_bpf_offload_cmd(struct tcf_proto *tp, struct cls_bpf_prog *prog, ...@@ -161,7 +160,8 @@ static int cls_bpf_offload_cmd(struct tcf_proto *tp, struct cls_bpf_prog *prog,
bpf_offload.exts_integrated = prog->exts_integrated; bpf_offload.exts_integrated = prog->exts_integrated;
bpf_offload.gen_flags = prog->gen_flags; bpf_offload.gen_flags = prog->gen_flags;
err = dev->netdev_ops->ndo_setup_tc(dev, tp->q->handle, err = dev->netdev_ops->ndo_setup_tc(dev, TC_SETUP_CLSBPF,
tp->q->handle,
tp->chain->index, tp->chain->index,
tp->protocol, &offload); tp->protocol, &offload);
......
net/sched/cls_flower.c
浏览文件 @ 2572ac53
...@@ -236,11 +236,10 @@ static void fl_hw_destroy_filter(struct tcf_proto *tp, struct cls_fl_filter *f) ...@@ -236,11 +236,10 @@ static void fl_hw_destroy_filter(struct tcf_proto *tp, struct cls_fl_filter *f)
offload.prio = tp->prio; offload.prio = tp->prio;
offload.cookie = (unsigned long)f; offload.cookie = (unsigned long)f;
tc->type = TC_SETUP_CLSFLOWER;
tc->cls_flower = &offload; tc->cls_flower = &offload;
dev->netdev_ops->ndo_setup_tc(dev, tp->q->handle, tp->chain->index, dev->netdev_ops->ndo_setup_tc(dev, TC_SETUP_CLSFLOWER, tp->q->handle,
tp->protocol, tc); tp->chain->index, tp->protocol, tc);
} }
static int fl_hw_replace_filter(struct tcf_proto *tp, static int fl_hw_replace_filter(struct tcf_proto *tp,
...@@ -273,11 +272,11 @@ static int fl_hw_replace_filter(struct tcf_proto *tp, ...@@ -273,11 +272,11 @@ static int fl_hw_replace_filter(struct tcf_proto *tp,
offload.key = &f->mkey; offload.key = &f->mkey;
offload.exts = &f->exts; offload.exts = &f->exts;
tc->type = TC_SETUP_CLSFLOWER;
tc->cls_flower = &offload; tc->cls_flower = &offload;
err = dev->netdev_ops->ndo_setup_tc(dev, tp->q->handle, err = dev->netdev_ops->ndo_setup_tc(dev, TC_SETUP_CLSFLOWER,
tp->chain->index, tp->protocol, tc); tp->q->handle, tp->chain->index,
tp->protocol, tc);
if (!err) if (!err)
f->flags |= TCA_CLS_FLAGS_IN_HW; f->flags |= TCA_CLS_FLAGS_IN_HW;
...@@ -300,10 +299,9 @@ static void fl_hw_update_stats(struct tcf_proto *tp, struct cls_fl_filter *f) ...@@ -300,10 +299,9 @@ static void fl_hw_update_stats(struct tcf_proto *tp, struct cls_fl_filter *f)
offload.cookie = (unsigned long)f; offload.cookie = (unsigned long)f;
offload.exts = &f->exts; offload.exts = &f->exts;
tc->type = TC_SETUP_CLSFLOWER;
tc->cls_flower = &offload; tc->cls_flower = &offload;
dev->netdev_ops->ndo_setup_tc(dev, tp->q->handle, dev->netdev_ops->ndo_setup_tc(dev, TC_CLSFLOWER_STATS, tp->q->handle,
tp->chain->index, tp->protocol, tc); tp->chain->index, tp->protocol, tc);
} }
......
net/sched/cls_matchall.c
浏览文件 @ 2572ac53
...@@ -58,14 +58,13 @@ static int mall_replace_hw_filter(struct tcf_proto *tp, ...@@ -58,14 +58,13 @@ static int mall_replace_hw_filter(struct tcf_proto *tp,
struct tc_cls_matchall_offload mall_offload = {0}; struct tc_cls_matchall_offload mall_offload = {0};
int err; int err;
offload.type = TC_SETUP_MATCHALL;
offload.cls_mall = &mall_offload; offload.cls_mall = &mall_offload;
offload.cls_mall->command = TC_CLSMATCHALL_REPLACE; offload.cls_mall->command = TC_CLSMATCHALL_REPLACE;
offload.cls_mall->exts = &head->exts; offload.cls_mall->exts = &head->exts;
offload.cls_mall->cookie = cookie; offload.cls_mall->cookie = cookie;
err = dev->netdev_ops->ndo_setup_tc(dev, tp->q->handle, err = dev->netdev_ops->ndo_setup_tc(dev, TC_SETUP_MATCHALL,
tp->chain->index, tp->q->handle, tp->chain->index,
tp->protocol, &offload); tp->protocol, &offload);
if (!err) if (!err)
head->flags |= TCA_CLS_FLAGS_IN_HW; head->flags |= TCA_CLS_FLAGS_IN_HW;
...@@ -81,14 +80,13 @@ static void mall_destroy_hw_filter(struct tcf_proto *tp, ...@@ -81,14 +80,13 @@ static void mall_destroy_hw_filter(struct tcf_proto *tp,
struct tc_to_netdev offload; struct tc_to_netdev offload;
struct tc_cls_matchall_offload mall_offload = {0}; struct tc_cls_matchall_offload mall_offload = {0};
offload.type = TC_SETUP_MATCHALL;
offload.cls_mall = &mall_offload; offload.cls_mall = &mall_offload;
offload.cls_mall->command = TC_CLSMATCHALL_DESTROY; offload.cls_mall->command = TC_CLSMATCHALL_DESTROY;
offload.cls_mall->exts = NULL; offload.cls_mall->exts = NULL;
offload.cls_mall->cookie = cookie; offload.cls_mall->cookie = cookie;
dev->netdev_ops->ndo_setup_tc(dev, tp->q->handle, tp->chain->index, dev->netdev_ops->ndo_setup_tc(dev, TC_SETUP_MATCHALL, tp->q->handle,
tp->protocol, &offload); tp->chain->index, tp->protocol, &offload);
} }
static void mall_destroy(struct tcf_proto *tp) static void mall_destroy(struct tcf_proto *tp)
......
net/sched/cls_u32.c
浏览文件 @ 2572ac53
...@@ -434,15 +434,14 @@ static void u32_remove_hw_knode(struct tcf_proto *tp, u32 handle) ...@@ -434,15 +434,14 @@ static void u32_remove_hw_knode(struct tcf_proto *tp, u32 handle)
struct tc_cls_u32_offload u32_offload = {0}; struct tc_cls_u32_offload u32_offload = {0};
struct tc_to_netdev offload; struct tc_to_netdev offload;
offload.type = TC_SETUP_CLSU32;
offload.cls_u32 = &u32_offload; offload.cls_u32 = &u32_offload;
if (tc_should_offload(dev, tp, 0)) { if (tc_should_offload(dev, tp, 0)) {
offload.cls_u32->command = TC_CLSU32_DELETE_KNODE; offload.cls_u32->command = TC_CLSU32_DELETE_KNODE;
offload.cls_u32->knode.handle = handle; offload.cls_u32->knode.handle = handle;
dev->netdev_ops->ndo_setup_tc(dev, tp->q->handle, dev->netdev_ops->ndo_setup_tc(dev, TC_SETUP_CLSU32,
tp->chain->index, tp->protocol, tp->q->handle, tp->chain->index,
&offload); tp->protocol, &offload);
} }
} }
...@@ -457,7 +456,6 @@ static int u32_replace_hw_hnode(struct tcf_proto *tp, struct tc_u_hnode *h, ...@@ -457,7 +456,6 @@ static int u32_replace_hw_hnode(struct tcf_proto *tp, struct tc_u_hnode *h,
if (!tc_should_offload(dev, tp, flags)) if (!tc_should_offload(dev, tp, flags))
return tc_skip_sw(flags) ? -EINVAL : 0; return tc_skip_sw(flags) ? -EINVAL : 0;
offload.type = TC_SETUP_CLSU32;
offload.cls_u32 = &u32_offload; offload.cls_u32 = &u32_offload;
offload.cls_u32->command = TC_CLSU32_NEW_HNODE; offload.cls_u32->command = TC_CLSU32_NEW_HNODE;
...@@ -465,7 +463,7 @@ static int u32_replace_hw_hnode(struct tcf_proto *tp, struct tc_u_hnode *h, ...@@ -465,7 +463,7 @@ static int u32_replace_hw_hnode(struct tcf_proto *tp, struct tc_u_hnode *h,
offload.cls_u32->hnode.handle = h->handle; offload.cls_u32->hnode.handle = h->handle;
offload.cls_u32->hnode.prio = h->prio; offload.cls_u32->hnode.prio = h->prio;
err = dev->netdev_ops->ndo_setup_tc(dev, tp->q->handle, err = dev->netdev_ops->ndo_setup_tc(dev, TC_SETUP_CLSU32, tp->q->handle,
tp->chain->index, tp->protocol, tp->chain->index, tp->protocol,
&offload); &offload);
if (tc_skip_sw(flags)) if (tc_skip_sw(flags))
...@@ -480,7 +478,6 @@ static void u32_clear_hw_hnode(struct tcf_proto *tp, struct tc_u_hnode *h) ...@@ -480,7 +478,6 @@ static void u32_clear_hw_hnode(struct tcf_proto *tp, struct tc_u_hnode *h)
struct tc_cls_u32_offload u32_offload = {0}; struct tc_cls_u32_offload u32_offload = {0};
struct tc_to_netdev offload; struct tc_to_netdev offload;
offload.type = TC_SETUP_CLSU32;
offload.cls_u32 = &u32_offload; offload.cls_u32 = &u32_offload;
if (tc_should_offload(dev, tp, 0)) { if (tc_should_offload(dev, tp, 0)) {
...@@ -489,9 +486,9 @@ static void u32_clear_hw_hnode(struct tcf_proto *tp, struct tc_u_hnode *h) ...@@ -489,9 +486,9 @@ static void u32_clear_hw_hnode(struct tcf_proto *tp, struct tc_u_hnode *h)
offload.cls_u32->hnode.handle = h->handle; offload.cls_u32->hnode.handle = h->handle;
offload.cls_u32->hnode.prio = h->prio; offload.cls_u32->hnode.prio = h->prio;
dev->netdev_ops->ndo_setup_tc(dev, tp->q->handle, dev->netdev_ops->ndo_setup_tc(dev, TC_SETUP_CLSU32,
tp->chain->index, tp->protocol, tp->q->handle, tp->chain->index,
&offload); tp->protocol, &offload);
} }
} }
...@@ -503,7 +500,6 @@ static int u32_replace_hw_knode(struct tcf_proto *tp, struct tc_u_knode *n, ...@@ -503,7 +500,6 @@ static int u32_replace_hw_knode(struct tcf_proto *tp, struct tc_u_knode *n,
struct tc_to_netdev offload; struct tc_to_netdev offload;
int err; int err;
offload.type = TC_SETUP_CLSU32;
offload.cls_u32 = &u32_offload; offload.cls_u32 = &u32_offload;
if (!tc_should_offload(dev, tp, flags)) if (!tc_should_offload(dev, tp, flags))
...@@ -524,7 +520,7 @@ static int u32_replace_hw_knode(struct tcf_proto *tp, struct tc_u_knode *n, ...@@ -524,7 +520,7 @@ static int u32_replace_hw_knode(struct tcf_proto *tp, struct tc_u_knode *n,
if (n->ht_down) if (n->ht_down)
offload.cls_u32->knode.link_handle = n->ht_down->handle; offload.cls_u32->knode.link_handle = n->ht_down->handle;
err = dev->netdev_ops->ndo_setup_tc(dev, tp->q->handle, err = dev->netdev_ops->ndo_setup_tc(dev, TC_SETUP_CLSU32, tp->q->handle,
tp->chain->index, tp->protocol, tp->chain->index, tp->protocol,
&offload); &offload);
......
net/sched/sch_mqprio.c
浏览文件 @ 2572ac53
...@@ -40,10 +40,10 @@ static void mqprio_destroy(struct Qdisc *sch) ...@@ -40,10 +40,10 @@ static void mqprio_destroy(struct Qdisc *sch)
if (priv->hw_offload && dev->netdev_ops->ndo_setup_tc) { if (priv->hw_offload && dev->netdev_ops->ndo_setup_tc) {
struct tc_mqprio_qopt offload = { 0 }; struct tc_mqprio_qopt offload = { 0 };
struct tc_to_netdev tc = { .type = TC_SETUP_MQPRIO, struct tc_to_netdev tc = { { .mqprio = &offload } };
{ .mqprio = &offload } };
dev->netdev_ops->ndo_setup_tc(dev, sch->handle, 0, 0, &tc); dev->netdev_ops->ndo_setup_tc(dev, TC_SETUP_MQPRIO,
sch->handle, 0, 0, &tc);
} else { } else {
netdev_set_num_tc(dev, 0); netdev_set_num_tc(dev, 0);
} }
...@@ -149,11 +149,10 @@ static int mqprio_init(struct Qdisc *sch, struct nlattr *opt) ...@@ -149,11 +149,10 @@ static int mqprio_init(struct Qdisc *sch, struct nlattr *opt)
*/ */
if (qopt->hw) { if (qopt->hw) {
struct tc_mqprio_qopt offload = *qopt; struct tc_mqprio_qopt offload = *qopt;
struct tc_to_netdev tc = { .type = TC_SETUP_MQPRIO, struct tc_to_netdev tc = { { .mqprio = &offload } };
{ .mqprio = &offload } };
err = dev->netdev_ops->ndo_setup_tc(dev, sch->handle, err = dev->netdev_ops->ndo_setup_tc(dev, TC_SETUP_MQPRIO,
0, 0, &tc); sch->handle, 0, 0, &tc);
if (err) if (err)
return err; return err;
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或