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

RDMA/uapi: Fix and re-organize the usage of rdma_driver_id

Fix 'enum rdma_driver_id' to preserve other driver values before that
RDMA_DRIVER_CXGB3 was deleted. As this value is UAPI we can't affect
other values as of a deletion of one driver id.

Fixes: 30e0f6cf5acb ("RDMA/iw_cxgb3: Remove the iw_cxgb3 module from kernel")
Signed-off-by: Yishai Hadas <yishaih@mellanox.com>
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
Link: https://lore.kernel.org/r/20191015075419.18185-2-leon@kernel.org
Signed-off-by: Doug Ledford <dledford@redhat.com>

authored by

Yishai Hadas and committed by
Doug Ledford
45b26854 03232cc4

+22 -21
+22
include/uapi/rdma/ib_user_ioctl_verbs.h
··· 173 173 __u8 reserved[6]; 174 174 }; 175 175 176 + enum rdma_driver_id { 177 + RDMA_DRIVER_UNKNOWN, 178 + RDMA_DRIVER_MLX5, 179 + RDMA_DRIVER_MLX4, 180 + RDMA_DRIVER_CXGB3, 181 + RDMA_DRIVER_CXGB4, 182 + RDMA_DRIVER_MTHCA, 183 + RDMA_DRIVER_BNXT_RE, 184 + RDMA_DRIVER_OCRDMA, 185 + RDMA_DRIVER_NES, 186 + RDMA_DRIVER_I40IW, 187 + RDMA_DRIVER_VMW_PVRDMA, 188 + RDMA_DRIVER_QEDR, 189 + RDMA_DRIVER_HNS, 190 + RDMA_DRIVER_USNIC, 191 + RDMA_DRIVER_RXE, 192 + RDMA_DRIVER_HFI1, 193 + RDMA_DRIVER_QIB, 194 + RDMA_DRIVER_EFA, 195 + RDMA_DRIVER_SIW, 196 + }; 197 + 176 198 #endif
-21
include/uapi/rdma/rdma_user_ioctl_cmds.h
··· 84 84 struct ib_uverbs_attr attrs[0]; 85 85 }; 86 86 87 - enum rdma_driver_id { 88 - RDMA_DRIVER_UNKNOWN, 89 - RDMA_DRIVER_MLX5, 90 - RDMA_DRIVER_MLX4, 91 - RDMA_DRIVER_CXGB4, 92 - RDMA_DRIVER_MTHCA, 93 - RDMA_DRIVER_BNXT_RE, 94 - RDMA_DRIVER_OCRDMA, 95 - RDMA_DRIVER_NES, 96 - RDMA_DRIVER_I40IW, 97 - RDMA_DRIVER_VMW_PVRDMA, 98 - RDMA_DRIVER_QEDR, 99 - RDMA_DRIVER_HNS, 100 - RDMA_DRIVER_USNIC, 101 - RDMA_DRIVER_RXE, 102 - RDMA_DRIVER_HFI1, 103 - RDMA_DRIVER_QIB, 104 - RDMA_DRIVER_EFA, 105 - RDMA_DRIVER_SIW, 106 - }; 107 - 108 87 #endif