projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
IB/Verbs: Use management helper rdma_cap_ib_cm()
[deliverable/linux.git]
/
drivers
/
infiniband
/
core
/
cma.c
diff --git
a/drivers/infiniband/core/cma.c
b/drivers/infiniband/core/cma.c
index da7e55f8097fb6bbbf82ad220626eacec3171890..754a96b6660856e6b28f8c8ae8d856a689a81658 100644
(file)
--- a/
drivers/infiniband/core/cma.c
+++ b/
drivers/infiniband/core/cma.c
@@
-745,7
+745,7
@@
int rdma_init_qp_attr(struct rdma_cm_id *id, struct ib_qp_attr *qp_attr,
int ret = 0;
id_priv = container_of(id, struct rdma_id_private, id);
int ret = 0;
id_priv = container_of(id, struct rdma_id_private, id);
- if (rdma_
ib_or_iboe
(id->device, id->port_num)) {
+ if (rdma_
cap_ib_cm
(id->device, id->port_num)) {
if (!id_priv->cm_id.ib || (id_priv->id.qp_type == IB_QPT_UD))
ret = cma_ib_init_qp_attr(id_priv, qp_attr, qp_attr_mask);
else
if (!id_priv->cm_id.ib || (id_priv->id.qp_type == IB_QPT_UD))
ret = cma_ib_init_qp_attr(id_priv, qp_attr, qp_attr_mask);
else
@@
-1040,7
+1040,7
@@
void rdma_destroy_id(struct rdma_cm_id *id)
mutex_unlock(&id_priv->handler_mutex);
if (id_priv->cma_dev) {
mutex_unlock(&id_priv->handler_mutex);
if (id_priv->cma_dev) {
- if (rdma_
ib_or_iboe
(id_priv->id.device, 1)) {
+ if (rdma_
cap_ib_cm
(id_priv->id.device, 1)) {
if (id_priv->cm_id.ib)
ib_destroy_cm_id(id_priv->cm_id.ib);
} else if (rdma_protocol_iwarp(id_priv->id.device, 1)) {
if (id_priv->cm_id.ib)
ib_destroy_cm_id(id_priv->cm_id.ib);
} else if (rdma_protocol_iwarp(id_priv->id.device, 1)) {
@@
-1623,8
+1623,7
@@
static void cma_listen_on_dev(struct rdma_id_private *id_priv,
struct rdma_cm_id *id;
int ret;
struct rdma_cm_id *id;
int ret;
- if (cma_family(id_priv) == AF_IB &&
- !rdma_ib_or_iboe(cma_dev->device, 1))
+ if (cma_family(id_priv) == AF_IB && !rdma_cap_ib_cm(cma_dev->device, 1))
return;
id = rdma_create_id(cma_listen_handler, id_priv, id_priv->id.ps,
return;
id = rdma_create_id(cma_listen_handler, id_priv, id_priv->id.ps,
@@
-2015,7
+2014,7
@@
static int cma_bind_loopback(struct rdma_id_private *id_priv)
mutex_lock(&lock);
list_for_each_entry(cur_dev, &dev_list, list) {
if (cma_family(id_priv) == AF_IB &&
mutex_lock(&lock);
list_for_each_entry(cur_dev, &dev_list, list) {
if (cma_family(id_priv) == AF_IB &&
- !rdma_
ib_or_iboe
(cur_dev->device, 1))
+ !rdma_
cap_ib_cm
(cur_dev->device, 1))
continue;
if (!cma_dev)
continue;
if (!cma_dev)
@@
-2524,7
+2523,7
@@
int rdma_listen(struct rdma_cm_id *id, int backlog)
id_priv->backlog = backlog;
if (id->device) {
id_priv->backlog = backlog;
if (id->device) {
- if (rdma_
ib_or_iboe
(id->device, 1)) {
+ if (rdma_
cap_ib_cm
(id->device, 1)) {
ret = cma_ib_listen(id_priv);
if (ret)
goto err;
ret = cma_ib_listen(id_priv);
if (ret)
goto err;
@@
-2868,7
+2867,7
@@
int rdma_connect(struct rdma_cm_id *id, struct rdma_conn_param *conn_param)
id_priv->srq = conn_param->srq;
}
id_priv->srq = conn_param->srq;
}
- if (rdma_
ib_or_iboe
(id->device, id->port_num)) {
+ if (rdma_
cap_ib_cm
(id->device, id->port_num)) {
if (id->qp_type == IB_QPT_UD)
ret = cma_resolve_ib_udp(id_priv, conn_param);
else
if (id->qp_type == IB_QPT_UD)
ret = cma_resolve_ib_udp(id_priv, conn_param);
else
@@
-2979,7
+2978,7
@@
int rdma_accept(struct rdma_cm_id *id, struct rdma_conn_param *conn_param)
id_priv->srq = conn_param->srq;
}
id_priv->srq = conn_param->srq;
}
- if (rdma_
ib_or_iboe
(id->device, id->port_num)) {
+ if (rdma_
cap_ib_cm
(id->device, id->port_num)) {
if (id->qp_type == IB_QPT_UD) {
if (conn_param)
ret = cma_send_sidr_rep(id_priv, IB_SIDR_SUCCESS,
if (id->qp_type == IB_QPT_UD) {
if (conn_param)
ret = cma_send_sidr_rep(id_priv, IB_SIDR_SUCCESS,
@@
-3042,7
+3041,7
@@
int rdma_reject(struct rdma_cm_id *id, const void *private_data,
if (!id_priv->cm_id.ib)
return -EINVAL;
if (!id_priv->cm_id.ib)
return -EINVAL;
- if (rdma_
ib_or_iboe
(id->device, id->port_num)) {
+ if (rdma_
cap_ib_cm
(id->device, id->port_num)) {
if (id->qp_type == IB_QPT_UD)
ret = cma_send_sidr_rep(id_priv, IB_SIDR_REJECT, 0,
private_data, private_data_len);
if (id->qp_type == IB_QPT_UD)
ret = cma_send_sidr_rep(id_priv, IB_SIDR_REJECT, 0,
private_data, private_data_len);
@@
-3069,7
+3068,7
@@
int rdma_disconnect(struct rdma_cm_id *id)
if (!id_priv->cm_id.ib)
return -EINVAL;
if (!id_priv->cm_id.ib)
return -EINVAL;
- if (rdma_
ib_or_iboe
(id->device, id->port_num)) {
+ if (rdma_
cap_ib_cm
(id->device, id->port_num)) {
ret = cma_modify_qp_err(id_priv);
if (ret)
goto out;
ret = cma_modify_qp_err(id_priv);
if (ret)
goto out;
This page took
0.02559 seconds
and
5
git commands to generate.