diff options
| author | David S. Miller | 2019-07-12 00:04:39 +0200 |
|---|---|---|
| committer | David S. Miller | 2019-07-12 00:04:39 +0200 |
| commit | 08d14c49ac949b0e42f2aa36fb8d5c860cfe130d (patch) | |
| tree | cd0e5b09a03563f06cb153203d1680f4ea5d27e3 /drivers/net/ethernet/mellanox/mlx5/core/en_main.c | |
| parent | ipv6: fix static key imbalance in fl_create() (diff) | |
| parent | net/mlx5: E-Switch, Reduce ingress acl modify metadata stack usage (diff) | |
| download | kernel-qcow2-linux-08d14c49ac949b0e42f2aa36fb8d5c860cfe130d.tar.gz kernel-qcow2-linux-08d14c49ac949b0e42f2aa36fb8d5c860cfe130d.tar.xz kernel-qcow2-linux-08d14c49ac949b0e42f2aa36fb8d5c860cfe130d.zip | |
Merge branch 'mlx5-build-fixes'
Saeed Mahameed says:
====================
Mellanox, mlx5 build fixes
I know net-next is closed but these patches are fixing some compiler
build and warnings issues people have been complaining about.
I hope it is not too late, but in case it is a lot of trouble for you,
I guess they can wait.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx5/core/en_main.c')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c index 6d0ae87c8ded..9163d6904741 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c @@ -3390,10 +3390,9 @@ static int mlx5e_modify_channels_vsd(struct mlx5e_channels *chs, bool vsd) return 0; } -static int mlx5e_setup_tc_mqprio(struct net_device *netdev, +static int mlx5e_setup_tc_mqprio(struct mlx5e_priv *priv, struct tc_mqprio_qopt *mqprio) { - struct mlx5e_priv *priv = netdev_priv(netdev); struct mlx5e_channels new_channels = {}; u8 tc = mqprio->num_tc; int err = 0; @@ -3475,7 +3474,7 @@ static int mlx5e_setup_tc(struct net_device *dev, enum tc_setup_type type, priv, priv, true); #endif case TC_SETUP_QDISC_MQPRIO: - return mlx5e_setup_tc_mqprio(dev, type_data); + return mlx5e_setup_tc_mqprio(priv, type_data); default: return -EOPNOTSUPP; } |