Merge branch 'svn-trunk'

This commit is contained in:
Bart Van Assche
2021-07-08 21:33:20 -07:00
+2 -1
View File
@@ -1597,7 +1597,8 @@ out:
return ret;
}
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 2, 0)
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 2, 0) && \
(!defined(RHEL_MAJOR) || RHEL_MAJOR -0 < 7)
static const char *const cma_events[] = {
[RDMA_CM_EVENT_ADDR_RESOLVED] = "address resolved",
[RDMA_CM_EVENT_ADDR_ERROR] = "address error",