diff options
| author | Roland Dreier <rolandd@cisco.com> | 2008-12-30 15:36:58 -0800 |
|---|---|---|
| committer | Roland Dreier <rolandd@cisco.com> | 2008-12-30 15:36:58 -0800 |
| commit | ee48c3d7d3afab7b582051ee8f3f8979e6a87766 (patch) | |
| tree | 9bf21ff6aab5170bd2f78274244bed213f9cde5e /drivers/infiniband | |
| parent | 2c4ab6243f91cda62f22af2eb8a6c07590de37b1 (diff) | |
| parent | f781a22fa2ec11878a960bc3c2abb0a76f9a8f16 (diff) | |
| download | op-kernel-dev-ee48c3d7d3afab7b582051ee8f3f8979e6a87766.zip op-kernel-dev-ee48c3d7d3afab7b582051ee8f3f8979e6a87766.tar.gz | |
Merge branches 'cma' and 'mlx4' into for-linus
Diffstat (limited to 'drivers/infiniband')
| -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 8415ecc..a3c5af1d 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; |
