diff options
| author | Roland Dreier | 2008-12-31 00:36:58 +0100 |
|---|---|---|
| committer | Roland Dreier | 2008-12-31 00:36:58 +0100 |
| commit | ee48c3d7d3afab7b582051ee8f3f8979e6a87766 (patch) | |
| tree | 9bf21ff6aab5170bd2f78274244bed213f9cde5e /drivers | |
| parent | RDMA/addr: Fix build breakage when IPv6 is disabled (diff) | |
| parent | IB/mlx4: Fix reading SL field out of cqe->sl_vid (diff) | |
| download | kernel-qcow2-linux-ee48c3d7d3afab7b582051ee8f3f8979e6a87766.tar.gz kernel-qcow2-linux-ee48c3d7d3afab7b582051ee8f3f8979e6a87766.tar.xz kernel-qcow2-linux-ee48c3d7d3afab7b582051ee8f3f8979e6a87766.zip | |
Merge branches 'cma' and 'mlx4' into for-linus
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/infiniband/hw/mlx4/cq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/mlx4/cq.c b/drivers/infiniband/hw/mlx4/cq.c index 8415ecce5c4c..a3c5af1d7ec0 100644 --- a/drivers/infiniband/hw/mlx4/cq.c +++ b/drivers/infiniband/hw/mlx4/cq.c @@ -699,7 +699,7 @@ repoll: } wc->slid = be16_to_cpu(cqe->rlid); - wc->sl = be16_to_cpu(cqe->sl_vid >> 12); + wc->sl = be16_to_cpu(cqe->sl_vid) >> 12; g_mlpath_rqpn = be32_to_cpu(cqe->g_mlpath_rqpn); wc->src_qp = g_mlpath_rqpn & 0xffffff; wc->dlid_path_bits = (g_mlpath_rqpn >> 24) & 0x7f; |