Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dd8028f1 authored by Leon Romanovsky's avatar Leon Romanovsky Committed by Jason Gunthorpe
Browse files

RDMA/nldev: Return port capability flag for IB only 

Port capability flag represents IBTA PortInfo:CapabilityMask,
but was mistakenly mixed with non-relevant fields. Return that
information for IB only.

Link: https://patchwork.kernel.org/patch/10386245/


Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent 82f82ceb

drivers/infiniband/core/nldev.c

+8 −8
Original line number Diff line number Diff line
@@ -237,15 +237,15 @@ static int fill_port_info(struct sk_buff *msg, 
	if (ret)

		return ret;



	if (rdma_protocol_ib(device, port)) {

		BUILD_BUG_ON(sizeof(attr.port_cap_flags) > sizeof(u64));

		if (nla_put_u64_64bit(msg, RDMA_NLDEV_ATTR_CAP_FLAGS,

			      (u64)attr.port_cap_flags, RDMA_NLDEV_ATTR_PAD))

				      (u64)attr.port_cap_flags,

				      RDMA_NLDEV_ATTR_PAD))

			return -EMSGSIZE;

	if (rdma_protocol_ib(device, port) &&

	    nla_put_u64_64bit(msg, RDMA_NLDEV_ATTR_SUBNET_PREFIX,

		if (nla_put_u64_64bit(msg, RDMA_NLDEV_ATTR_SUBNET_PREFIX,

				      attr.subnet_prefix, RDMA_NLDEV_ATTR_PAD))

			return -EMSGSIZE;

	if (rdma_protocol_ib(device, port)) {

		if (nla_put_u32(msg, RDMA_NLDEV_ATTR_LID, attr.lid))

			return -EMSGSIZE;

		if (nla_put_u32(msg, RDMA_NLDEV_ATTR_SM_LID, attr.sm_lid))