leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IB/cm: Introduce and use helper function to get cm_port from path

Browse Source 
Introduce and use helper function get_cm_port_from_path() to get
cm_port based on the the path record entry.

Reviewed-by: Daniel Jurgens <danielj@mellanox.com>
Signed-off-by: Parav Pandit <parav@mellanox.com>
Signed-off-by: Leon Romanovsky <leon@kernel.org>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
This commit is contained in:
Parav Pandit 2018-03-13 16:06:22 +02:00 committed by Jason Gunthorpe
parent 0a51415935
commit cb12a8e2fa
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/infiniband/core/cm.c
View File

@ -482,13 +482,11 @@ static int add_cm_id_to_port_list(struct cm_id_private *cm_id_priv,
return ret; return ret;
} }
static int cm_init_av_by_path(struct sa_path_rec *path, struct cm_av *av, static struct cm_port *get_cm_port_from_path(struct sa_path_rec *path)
struct cm_id_private *cm_id_priv)
{ {
struct cm_device *cm_dev; struct cm_device *cm_dev;
struct cm_port *port = NULL; struct cm_port *port = NULL;
unsigned long flags; unsigned long flags;
int ret;
u8 p; u8 p;
struct net_device *ndev = ib_get_ndev_from_path(path); struct net_device *ndev = ib_get_ndev_from_path(path);
@ -497,7 +495,7 @@ static int cm_init_av_by_path(struct sa_path_rec *path, struct cm_av *av,
if (!ib_find_cached_gid(cm_dev->ib_device, &path->sgid, if (!ib_find_cached_gid(cm_dev->ib_device, &path->sgid,
sa_conv_pathrec_to_gid_type(path), sa_conv_pathrec_to_gid_type(path),
ndev, &p, NULL)) { ndev, &p, NULL)) {
port = cm_dev->port[p-1]; port = cm_dev->port[p - 1];
break; break;
} }
} }
@ -505,9 +503,20 @@ static int cm_init_av_by_path(struct sa_path_rec *path, struct cm_av *av,
if (ndev) if (ndev)
dev_put(ndev); dev_put(ndev);
return port;
}
static int cm_init_av_by_path(struct sa_path_rec *path, struct cm_av *av,
struct cm_id_private *cm_id_priv)
{
struct cm_device *cm_dev;
struct cm_port *port;
int ret;
port = get_cm_port_from_path(path);
if (!port) if (!port)
return -EINVAL; return -EINVAL;
cm_dev = port->cm_dev;
ret = ib_find_cached_pkey(cm_dev->ib_device, port->port_num, ret = ib_find_cached_pkey(cm_dev->ib_device, port->port_num,
be16_to_cpu(path->pkey), &av->pkey_index); be16_to_cpu(path->pkey), &av->pkey_index);