diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-30 19:36:33 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-30 19:36:33 -0400 |
| commit | 4dcf39c6cc5f9f01c46aa71fe95cae9927edeeab (patch) | |
| tree | 84de77738748fdfa54778833b440f7bf009639eb /drivers/infiniband/hw/mlx4/qp.c | |
| parent | af9473118979f3b09ee5d92fdbd8014cf085f7c5 (diff) | |
| parent | 78d1e02fac0595a8aa8a5064d1bd0c0ea55b22b0 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
IB/ipath: Workaround problem of errormask register being overwritten
IB/ipath: Fix some issues with buffer cancel and sendctrl register update
IB/ipath: Use faster put_tid_2 routine after initialization
IB/ipath: Remove unsafe fastrcvint code from interrupt handler
IB/ehca: Move extern declarations from .c files to .h files
IB/mlx4: Whitespace fix
IB/ehca: Fix include order to better match kernel style
mlx4_core: Remove kfree() in mlx4_mr_alloc() error flow
RDMA/amso1100: Initialize the wait_queue_head_t in the c2_qp structure
Diffstat (limited to 'drivers/infiniband/hw/mlx4/qp.c')
| -rw-r--r-- | drivers/infiniband/hw/mlx4/qp.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/mlx4/qp.c b/drivers/infiniband/hw/mlx4/qp.c index f6315dfb213e..ba0428d872aa 100644 --- a/drivers/infiniband/hw/mlx4/qp.c +++ b/drivers/infiniband/hw/mlx4/qp.c | |||
| @@ -1209,7 +1209,6 @@ static void set_datagram_seg(struct mlx4_wqe_datagram_seg *dseg, | |||
| 1209 | memcpy(dseg->av, &to_mah(wr->wr.ud.ah)->av, sizeof (struct mlx4_av)); | 1209 | memcpy(dseg->av, &to_mah(wr->wr.ud.ah)->av, sizeof (struct mlx4_av)); |
| 1210 | dseg->dqpn = cpu_to_be32(wr->wr.ud.remote_qpn); | 1210 | dseg->dqpn = cpu_to_be32(wr->wr.ud.remote_qpn); |
| 1211 | dseg->qkey = cpu_to_be32(wr->wr.ud.remote_qkey); | 1211 | dseg->qkey = cpu_to_be32(wr->wr.ud.remote_qkey); |
| 1212 | |||
| 1213 | } | 1212 | } |
| 1214 | 1213 | ||
| 1215 | static void set_data_seg(struct mlx4_wqe_data_seg *dseg, | 1214 | static void set_data_seg(struct mlx4_wqe_data_seg *dseg, |