Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

smc_diag.h: fix include from userland

This patch prepares the uapi export by fixing the following error:

.../linux/smc_diag.h:6:27: fatal error: rdma/ib_verbs.h: No such file or directory
#include <rdma/ib_verbs.h>

Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

authored by

Nicolas Dichtel and committed by
Masahiro Yamada
ea6819e1 3a4e7f56

+4 -3
+1 -2
include/rdma/ib_verbs.h
··· 62 62 #include <linux/mmu_notifier.h> 63 63 #include <linux/uaccess.h> 64 64 #include <linux/cgroup_rdma.h> 65 + #include <uapi/rdma/ib_user_verbs.h> 65 66 66 67 extern struct workqueue_struct *ib_wq; 67 68 extern struct workqueue_struct *ib_comp_wq; ··· 1889 1888 IB_MAD_RESULT_REPLY = 1 << 1, /* Reply packet needs to be sent */ 1890 1889 IB_MAD_RESULT_CONSUMED = 1 << 2 /* Packet consumed: stop processing */ 1891 1890 }; 1892 - 1893 - #define IB_DEVICE_NAME_MAX 64 1894 1891 1895 1892 struct ib_port_cache { 1896 1893 struct ib_pkey_cache *pkey;
+1 -1
include/uapi/linux/smc_diag.h
··· 3 3 4 4 #include <linux/types.h> 5 5 #include <linux/inet_diag.h> 6 - #include <rdma/ib_verbs.h> 6 + #include <rdma/ib_user_verbs.h> 7 7 8 8 /* Request structure */ 9 9 struct smc_diag_req {
+2
include/uapi/rdma/ib_user_verbs.h
··· 1135 1135 __u32 ind_tbl_handle; 1136 1136 }; 1137 1137 1138 + #define IB_DEVICE_NAME_MAX 64 1139 + 1138 1140 #endif /* IB_USER_VERBS_H */