From 36eece51e36a7a5f13e78e0751a0863bb4a5d3e2 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Wed, 9 May 2018 08:12:13 -0700 Subject: [PATCH] rdma: align headers with upstream This makes rdma/include/uapi/rdma headers align with those produced by doing make headers_install from upstream (Linus) tree. Signed-off-by: Stephen Hemminger --- rdma/include/uapi/rdma/rdma_netlink.h | 13 +++++++++++++ rdma/include/uapi/rdma/rdma_user_cm.h | 8 ++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/rdma/include/uapi/rdma/rdma_netlink.h b/rdma/include/uapi/rdma/rdma_netlink.h index 9446a721..60416ed7 100644 --- a/rdma/include/uapi/rdma/rdma_netlink.h +++ b/rdma/include/uapi/rdma/rdma_netlink.h @@ -388,6 +388,19 @@ enum rdma_nldev_attr { RDMA_NLDEV_ATTR_RES_LOCAL_DMA_LKEY, /* u32 */ RDMA_NLDEV_ATTR_RES_UNSAFE_GLOBAL_RKEY, /* u32 */ + /* + * Provides logical name and index of netdevice which is + * connected to physical port. This information is relevant + * for RoCE and iWARP. + * + * The netdevices which are associated with containers are + * supposed to be exported together with GID table once it + * will be exposed through the netlink. Because the + * associated netdevices are properties of GIDs. + */ + RDMA_NLDEV_ATTR_NDEV_INDEX, /* u32 */ + RDMA_NLDEV_ATTR_NDEV_NAME, /* string */ + RDMA_NLDEV_ATTR_MAX }; #endif /* _RDMA_NETLINK_H */ diff --git a/rdma/include/uapi/rdma/rdma_user_cm.h b/rdma/include/uapi/rdma/rdma_user_cm.h index da099af0..0d1e78eb 100644 --- a/rdma/include/uapi/rdma/rdma_user_cm.h +++ b/rdma/include/uapi/rdma/rdma_user_cm.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-2-Clause) */ +/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR Linux-OpenIB) */ /* * Copyright (c) 2005-2006 Intel Corporation. All rights reserved. * @@ -31,8 +31,8 @@ * SOFTWARE. */ -#ifndef _RDMA_USER_CM_H -#define _RDMA_USER_CM_H +#ifndef RDMA_USER_CM_H +#define RDMA_USER_CM_H #include #include @@ -321,4 +321,4 @@ struct rdma_ucm_migrate_resp { __u32 events_reported; }; -#endif /* _RDMA_USER_CM_H */ +#endif /* RDMA_USER_CM_H */ -- 2.39.5