diff options
| author | Doug Ledford <dledford@redhat.com> | 2019-02-09 20:54:04 +0300 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2019-02-09 20:54:04 +0300 |
| commit | 82771f20338fcdeb0a38319c7a72f1f36df39a7a (patch) | |
| tree | 532f865fff8bb8e17ec5b743c57bd5c5ec07fd2e /drivers/infiniband/hw/qib | |
| parent | ecb53febfcad565366762b7413b03452874643db (diff) | |
| parent | 416fbc1bbaa51742f7c49ff0578a594c2082c73b (diff) | |
| download | linux-82771f20338fcdeb0a38319c7a72f1f36df39a7a.tar.xz | |
Merge branch 'wip/dl-for-next' into for-next
Due to concurrent work by myself and Jason, a normal fast forward merge
was not possible. This brings in a number of hfi1 changes, mainly the
hfi1 TID RDMA support (roughly 10,000 LOC change), which was reviewed
and integrated over a period of days.
Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'drivers/infiniband/hw/qib')
| -rw-r--r-- | drivers/infiniband/hw/qib/qib_rc.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/infiniband/hw/qib/qib_rc.c b/drivers/infiniband/hw/qib/qib_rc.c index 6fa002940451..50dd9811b088 100644 --- a/drivers/infiniband/hw/qib/qib_rc.c +++ b/drivers/infiniband/hw/qib/qib_rc.c @@ -45,12 +45,7 @@ static u32 restart_sge(struct rvt_sge_state *ss, struct rvt_swqe *wqe, u32 len; len = ((psn - wqe->psn) & QIB_PSN_MASK) * pmtu; - ss->sge = wqe->sg_list[0]; - ss->sg_list = wqe->sg_list + 1; - ss->num_sge = wqe->wr.num_sge; - ss->total_len = wqe->length; - rvt_skip_sge(ss, len, false); - return wqe->length - len; + return rvt_restart_sge(ss, wqe, len); } /** |