diff options
| author | Doug Ledford <dledford@redhat.com> | 2015-12-22 17:03:15 -0500 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2015-12-22 17:03:15 -0500 |
| commit | 882f3b3b916a01c703bf7516800a0dca741cd3e7 (patch) | |
| tree | 3a67f04a2b31985bb8044d39f0f5ebd9858658ae /drivers/infiniband/ulp/ipoib | |
| parent | 182a2da0c768a9ec64abb0d6009667057f1c06af (diff) | |
| parent | c6333f9f9f7646e311248a09e8ed96126a97aba8 (diff) | |
| download | op-kernel-dev-882f3b3b916a01c703bf7516800a0dca741cd3e7.zip op-kernel-dev-882f3b3b916a01c703bf7516800a0dca741cd3e7.tar.gz | |
Merge branches '4.5/Or-cleanup' and '4.5/rdma-cq' into k.o/for-4.5
Signed-off-by: Doug Ledford <dledford@redhat.com>
Conflicts:
drivers/infiniband/ulp/iser/iser_verbs.c
Diffstat (limited to 'drivers/infiniband/ulp/ipoib')
| -rw-r--r-- | drivers/infiniband/ulp/ipoib/ipoib_cm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_cm.c b/drivers/infiniband/ulp/ipoib/ipoib_cm.c index 94d144d..917e46e 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib_cm.c +++ b/drivers/infiniband/ulp/ipoib/ipoib_cm.c @@ -70,7 +70,6 @@ static struct ib_qp_attr ipoib_cm_err_attr = { #define IPOIB_CM_RX_DRAIN_WRID 0xffffffff static struct ib_send_wr ipoib_cm_rx_drain_wr = { - .wr_id = IPOIB_CM_RX_DRAIN_WRID, .opcode = IB_WR_SEND, }; @@ -223,6 +222,7 @@ static void ipoib_cm_start_rx_drain(struct ipoib_dev_priv *priv) * error" WC will be immediately generated for each WR we post. */ p = list_entry(priv->cm.rx_flush_list.next, typeof(*p), list); + ipoib_cm_rx_drain_wr.wr_id = IPOIB_CM_RX_DRAIN_WRID; if (ib_post_send(p->qp, &ipoib_cm_rx_drain_wr, &bad_wr)) ipoib_warn(priv, "failed to post drain wr\n"); |
