diff options
| author |   David S. Miller <davem@davemloft.net> | 2015-04-02 16:25:27 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-04-02 16:25:27 -0400 |
| commit | c5531ca2bf3de4e172d2dcc12b97b9f663ab0453 (patch) | |
| tree | 1832a7b19b4a403b29b3b066a3b0db88833c7094 /drivers/net/ethernet/mellanox/mlx4/qp.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| parent | MAINTAINERS: Update mlx4_en entry (diff) | |
| download | linux-dev-c5531ca2bf3de4e172d2dcc12b97b9f663ab0453.tar.xz linux-dev-c5531ca2bf3de4e172d2dcc12b97b9f663ab0453.zip | |
Merge branch 'mlx4-next'
Or Gerlitz says:
====================
Mellanox mlx4 driver updates
The main feature added by this series are Ido's changes to support
Granular QoS for VFs, where for the time being only max rate is supported.
Muhammad added support for setting rx-fcs and rx-all through ethtool,
and Ido did the interface identify work.
Last, add Ido as a maintainer for the mlx4 Ethernet driver!
Some of next week is the Passover holiday here and I will be
mostly OOO. If needed (...) Ido or Amir will send V1 and such.
Rebased against net-next commit 033f46b "crypto: algif -
explicitly mark end of data".
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx4/qp.c')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/qp.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/qp.c b/drivers/net/ethernet/mellanox/mlx4/qp.c index 69e4462e4ee4..b75214a80d0e 100644 --- a/drivers/net/ethernet/mellanox/mlx4/qp.c +++ b/drivers/net/ethernet/mellanox/mlx4/qp.c @@ -447,6 +447,11 @@ int mlx4_update_qp(struct mlx4_dev *dev, u32 qpn, cmd->qp_context.rate_limit_params = cpu_to_be16((params->rate_unit << 14) | params->rate_val); } + if (attr & MLX4_UPDATE_QP_QOS_VPORT) { + qp_mask |= 1ULL << MLX4_UPD_QP_MASK_QOS_VPP; + cmd->qp_context.qos_vport = params->qos_vport; + } + cmd->primary_addr_path_mask = cpu_to_be64(pri_addr_path_mask); cmd->qp_mask = cpu_to_be64(qp_mask); |