Message ID | 20170811105003.7661-10-leon@kernel.org (mailing list archive) |
---|---|
State | Superseded |
Headers | show |
On Fri, Aug 11, 2017 at 01:49:50PM +0300, Leon Romanovsky wrote: > From: Leon Romanovsky <leonro@mellanox.com> > > The return values from rdma_node_get_transport() are strict > and IB_LINK_LAYER_UNSPECIFIED is unreachable in this flow. > > Signed-off-by: Leon Romanovsky <leonro@mellanox.com> > Reviewed-by: Dennis Dalessandro <dennis.dalessandro@intel.com> > --- > drivers/infiniband/core/verbs.c | 13 +++++-------- > 1 file changed, 5 insertions(+), 8 deletions(-) > > diff --git a/drivers/infiniband/core/verbs.c b/drivers/infiniband/core/verbs.c > index 0d359a482b13..e3aa9c60bcc5 100644 > --- a/drivers/infiniband/core/verbs.c > +++ b/drivers/infiniband/core/verbs.c > @@ -192,18 +192,15 @@ EXPORT_SYMBOL(rdma_node_get_transport); > > enum rdma_link_layer rdma_port_get_link_layer(struct ib_device *device, u8 port_num) > { > + enum rdma_transport_type lt; > if (device->get_link_layer) > return device->get_link_layer(device, port_num); > > - switch (rdma_node_get_transport(device->node_type)) { > - case RDMA_TRANSPORT_IB: > + lt = rdma_node_get_transport(device->node_type); > + if (lt == RDMA_TRANSPORT_IB) > return IB_LINK_LAYER_INFINIBAND; > - case RDMA_TRANSPORT_IWARP: > - case RDMA_TRANSPORT_USNIC_UDP: > - return IB_LINK_LAYER_ETHERNET; > - default: > - return IB_LINK_LAYER_UNSPECIFIED; > - } > + > + return IB_LINK_LAYER_ETHERNET; > } > EXPORT_SYMBOL(rdma_port_get_link_layer); > Reviewed-by: Yuval Shaia <yuval.shaia@oracle.com> > -- > 2.14.0 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-rdma" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/infiniband/core/verbs.c b/drivers/infiniband/core/verbs.c index 0d359a482b13..e3aa9c60bcc5 100644 --- a/drivers/infiniband/core/verbs.c +++ b/drivers/infiniband/core/verbs.c @@ -192,18 +192,15 @@ EXPORT_SYMBOL(rdma_node_get_transport); enum rdma_link_layer rdma_port_get_link_layer(struct ib_device *device, u8 port_num) { + enum rdma_transport_type lt; if (device->get_link_layer) return device->get_link_layer(device, port_num); - switch (rdma_node_get_transport(device->node_type)) { - case RDMA_TRANSPORT_IB: + lt = rdma_node_get_transport(device->node_type); + if (lt == RDMA_TRANSPORT_IB) return IB_LINK_LAYER_INFINIBAND; - case RDMA_TRANSPORT_IWARP: - case RDMA_TRANSPORT_USNIC_UDP: - return IB_LINK_LAYER_ETHERNET; - default: - return IB_LINK_LAYER_UNSPECIFIED; - } + + return IB_LINK_LAYER_ETHERNET; } EXPORT_SYMBOL(rdma_port_get_link_layer);