diff options
| author | Roland Dreier <roland@purestorage.com> | 2014-01-23 07:24:21 (GMT) |
|---|---|---|
| committer | Roland Dreier <roland@purestorage.com> | 2014-01-23 07:24:21 (GMT) |
| commit | fb1b5034e4987b158179a62732fb6dfb8f7ec88e (patch) | |
| tree | 93d02ff7f0f530286fd54d03b632c6eaabc9dcc9 /include/rdma/ib_cm.h | |
| parent | 8f399921ea9a562bc8221258c4b8a7bd69577939 (diff) | |
| parent | 27cdef637c25705b433d5c4deeef4cf8dcb75d6a (diff) | |
| download | linux-fb1b5034e4987b158179a62732fb6dfb8f7ec88e.tar.xz | |
Merge branch 'ip-roce' into for-next
Conflicts:
drivers/infiniband/hw/mlx4/main.c
Diffstat (limited to 'include/rdma/ib_cm.h')
| -rw-r--r-- | include/rdma/ib_cm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/rdma/ib_cm.h b/include/rdma/ib_cm.h index 0e3ff30..f29e3a2 100644 --- a/include/rdma/ib_cm.h +++ b/include/rdma/ib_cm.h @@ -601,4 +601,5 @@ struct ib_cm_sidr_rep_param { int ib_send_cm_sidr_rep(struct ib_cm_id *cm_id, struct ib_cm_sidr_rep_param *param); +int ib_update_cm_av(struct ib_cm_id *id, const u8 *smac, const u8 *alt_smac); #endif /* IB_CM_H */ |