diff options
| author |   Doug Ledford <dledford@redhat.com> | 2015-06-02 09:33:22 -0400 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2015-06-02 09:33:22 -0400 |
| commit | b806ef3bbed39c95b45343bf0fd78802142f6017 (patch) | |
| tree | eab4e67bef332c78c25d95e00b2d6ce3241f1aee /drivers/infiniband/core | |
| parent | IB/core cleanup: Add const to args - agent_send_response (diff) | |
| parent | IB/mlx4: Fix error paths in mlx4_ib_create_flow() (diff) | |
| download | linux-dev-b806ef3bbed39c95b45343bf0fd78802142f6017.tar.xz linux-dev-b806ef3bbed39c95b45343bf0fd78802142f6017.zip | |
Merge branch 'for-4.2-misc' into k.o/for-4.2
Diffstat (limited to 'drivers/infiniband/core')
| -rw-r--r-- | drivers/infiniband/core/cma.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c index c34d650463bd..3b943b700a63 100644 --- a/drivers/infiniband/core/cma.c +++ b/drivers/infiniband/core/cma.c @@ -1619,6 +1619,7 @@ static int cma_iw_listen(struct rdma_id_private *id_priv, int backlog) if (IS_ERR(id)) return PTR_ERR(id); + id->tos = id_priv->tos; id_priv->cm_id.iw = id; memcpy(&id_priv->cm_id.iw->local_addr, cma_src_addr(id_priv), @@ -2851,6 +2852,7 @@ static int cma_connect_iw(struct rdma_id_private *id_priv, if (IS_ERR(cm_id)) return PTR_ERR(cm_id); + cm_id->tos = id_priv->tos; id_priv->cm_id.iw = cm_id; memcpy(&cm_id->local_addr, cma_src_addr(id_priv), |