diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-08-02 09:59:20 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-08-02 09:59:20 +0200 |
| commit | 16e0e6a83b778284ae9b3a57003eeea8d8090b55 (patch) | |
| tree | 42bf9a711c59549294b2f2125978f5a7095e16c2 /drivers/net/ethernet/mellanox/mlx4/resource_tracker.c | |
| parent | 25a00ac7dc92912f0b1e5e533bf077255c828b02 (diff) | |
| parent | ce03b6d2b610b70bb527d14d82c2394adb235e5d (diff) | |
| download | blackbird-obmc-linux-16e0e6a83b778284ae9b3a57003eeea8d8090b55.tar.gz blackbird-obmc-linux-16e0e6a83b778284ae9b3a57003eeea8d8090b55.zip | |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx4/resource_tracker.c')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/resource_tracker.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c index 7b1b5ac986d0..31bd56727022 100644 --- a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c +++ b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c @@ -2958,7 +2958,7 @@ int mlx4_RST2INIT_QP_wrapper(struct mlx4_dev *dev, int slave, u32 srqn = qp_get_srqn(qpc) & 0xffffff; int use_srq = (qp_get_srqn(qpc) >> 24) & 1; struct res_srq *srq; - int local_qpn = be32_to_cpu(qpc->local_qpn) & 0xffffff; + int local_qpn = vhcr->in_modifier & 0xffffff; err = adjust_qp_sched_queue(dev, slave, qpc, inbox); if (err) |
