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 /include/rdma | |
| 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 'include/rdma')
| -rw-r--r-- | include/rdma/iw_cm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/rdma/iw_cm.h b/include/rdma/iw_cm.h index 1017e0bdf8ba..036bd2772662 100644 --- a/include/rdma/iw_cm.h +++ b/include/rdma/iw_cm.h @@ -91,6 +91,7 @@ struct iw_cm_id { /* Used by provider to add and remove refs on IW cm_id */ void (*add_ref)(struct iw_cm_id *); void (*rem_ref)(struct iw_cm_id *); + u8 tos; }; struct iw_cm_conn_param { |