Skip to content

Commit

Permalink
Merge branches 'cma' and 'mlx4' into for-linus
Browse files Browse the repository at this point in the history
  • Loading branch information
Roland Dreier committed Dec 30, 2008
2 parents 2c4ab62 + f781a22 commit ee48c3d
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/infiniband/hw/mlx4/cq.c
Original file line number Diff line number Diff line change
Expand Up @@ -699,7 +699,7 @@ static int mlx4_ib_poll_one(struct mlx4_ib_cq *cq,
}

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;
Expand Down

0 comments on commit ee48c3d

Please sign in to comment.