compat: align defines after Linux 5.4 rc2 release

Linux 5.5-rc1 has been released. Bump the module version, we are working on 5.6 now. Prepare for 5.6-specific changes. Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com> Reviewed-by: John Hurley <john.hurley@netronome.com> Reviewed-by: Simon Horman <simon.horman@netronome.com>
Netronome · Dec 17, 2019 · 7ec15c4 · 7ec15c4
1 parent 9e533e8
commit 7ec15c4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/nfp_main.c b/src/nfp_main.c
@@ -1281,5 +1281,5 @@ MODULE_FIRMWARE("netronome/nic_AMDA0099-0001_1x10_1x25.nffw");
 MODULE_AUTHOR("Netronome Systems <oss-drivers@netronome.com>");
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("The Netronome Flow Processor (NFP) driver.");
-MODULE_VERSION("5.5.0");
+MODULE_VERSION("5.6.0");
 MODULE_INFO_NFP();
diff --git a/src/nfp_net_compat.h b/src/nfp_net_compat.h
@@ -45,9 +45,12 @@
 #endif
 
 /* Redefine LINUX_VERSION_CODE for *-next kernels */
-#ifdef SPEED_400000
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 12, 0)
+#include <net/af_vsock.h>
+#ifdef VSOCK_TRANSPORT_F_LOCAL
 #undef LINUX_VERSION_CODE
-#define LINUX_VERSION_CODE KERNEL_VERSION(5, 5, 0)
+#define LINUX_VERSION_CODE KERNEL_VERSION(5, 6, 0)
+#endif
 #endif
 
 #if (defined(COMPAT__HAVE_METADATA_IP_TUNNEL) ||	\