diff options
| author | Roland Dreier <rolandd@cisco.com> | 2010-03-02 02:52:31 -0500 |
|---|---|---|
| committer | Roland Dreier <rolandd@cisco.com> | 2010-03-02 02:52:31 -0500 |
| commit | fe8875e5a41a36ef26072cf05731df5493ade0e1 (patch) | |
| tree | 786c31c1e86f5287177210fb469c8ecae0bdd146 /drivers/infiniband/hw/mlx4/qp.c | |
| parent | f57721507ffeaf8785f7f17254651de4d8b45e09 (diff) | |
| parent | a265e5587f078618c1f17c3a83da65046f18746f (diff) | |
Merge branch 'misc' into for-next
Conflicts:
drivers/infiniband/core/uverbs_main.c
Diffstat (limited to 'drivers/infiniband/hw/mlx4/qp.c')
| -rw-r--r-- | drivers/infiniband/hw/mlx4/qp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/mlx4/qp.c b/drivers/infiniband/hw/mlx4/qp.c index b377671264e9..ae75389937d6 100644 --- a/drivers/infiniband/hw/mlx4/qp.c +++ b/drivers/infiniband/hw/mlx4/qp.c | |||
| @@ -1228,7 +1228,7 @@ static int build_mlx_header(struct mlx4_ib_sqp *sqp, struct ib_send_wr *wr, | |||
| 1228 | for (i = 0; i < wr->num_sge; ++i) | 1228 | for (i = 0; i < wr->num_sge; ++i) |
| 1229 | send_size += wr->sg_list[i].length; | 1229 | send_size += wr->sg_list[i].length; |
| 1230 | 1230 | ||
| 1231 | ib_ud_header_init(send_size, mlx4_ib_ah_grh_present(ah), &sqp->ud_header); | 1231 | ib_ud_header_init(send_size, mlx4_ib_ah_grh_present(ah), 0, &sqp->ud_header); |
| 1232 | 1232 | ||
| 1233 | sqp->ud_header.lrh.service_level = | 1233 | sqp->ud_header.lrh.service_level = |
| 1234 | be32_to_cpu(ah->av.sl_tclass_flowlabel) >> 28; | 1234 | be32_to_cpu(ah->av.sl_tclass_flowlabel) >> 28; |