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 <stephen@networkplumber.org>

diff --git a/rdma/include/uapi/rdma/rdma_netlink.h b/rdma/include/uapi/rdma/rdma_netlink.h
index 9446a72136e859a8d51c6ca2f4457fffb51d41dd..60416ed71c0fcc093ba6a8ad35f3fe405edb331b 100644 (file)
--- 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 da099af0ace7b4852c4cad6586ff8750237390f5..0d1e78ebad05154097ffa8b3bfb8708f5c7a0cb3 100644 (file)
--- 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 <linux/types.h>
 #include <linux/socket.h>
@@ -321,4 +321,4 @@ struct rdma_ucm_migrate_resp {
        __u32 events_reported;
 };
 
-#endif /* _RDMA_USER_CM_H */
+#endif /* RDMA_USER_CM_H */