mirror of
https://github.com/torvalds/linux.git
synced 2024-12-01 08:31:37 +00:00
Merge branches 'cma' and 'mlx4' into for-linus
This commit is contained in:
commit
ee48c3d7d3
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user