diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2008-12-31 07:35:57 -0500 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2008-12-31 07:35:57 -0500 |
| commit | 2ca1a615835d9f4990f42102ab1f2ef434e7e89c (patch) | |
| tree | 726cf3d5f29a6c66c44e4bd68e7ebed2fd83d059 /drivers/infiniband/hw/mlx4/cq.c | |
| parent | e12f0102ac81d660c9f801d0a0e10ccf4537a9de (diff) | |
| parent | 6a94cb73064c952255336cc57731904174b2c58f (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
arch/x86/kernel/io_apic.c
Diffstat (limited to 'drivers/infiniband/hw/mlx4/cq.c')
| -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: | |||
| 699 | } | 699 | } |
| 700 | 700 | ||
| 701 | wc->slid = be16_to_cpu(cqe->rlid); | 701 | wc->slid = be16_to_cpu(cqe->rlid); |
| 702 | wc->sl = be16_to_cpu(cqe->sl_vid >> 12); | 702 | wc->sl = be16_to_cpu(cqe->sl_vid) >> 12; |
| 703 | g_mlpath_rqpn = be32_to_cpu(cqe->g_mlpath_rqpn); | 703 | g_mlpath_rqpn = be32_to_cpu(cqe->g_mlpath_rqpn); |
| 704 | wc->src_qp = g_mlpath_rqpn & 0xffffff; | 704 | wc->src_qp = g_mlpath_rqpn & 0xffffff; |
| 705 | wc->dlid_path_bits = (g_mlpath_rqpn >> 24) & 0x7f; | 705 | wc->dlid_path_bits = (g_mlpath_rqpn >> 24) & 0x7f; |