Add support for kernel 6.2 and 6.3

NICMx · May 27, 2023 · 469c2c2 · 469c2c2
1 parent cbaf33d
commit 469c2c2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/docs/en/intro-jool.md b/docs/en/intro-jool.md
@@ -50,7 +50,8 @@ Please [let us know]({{ site.repository-url }}/issues) if you find additional co
 
 | Jool version                        | Supported Linux kernels (mainline)   | Supported Linux kernels (RHEL) |
 |-------------------------------------|--------------------------------------|--------------------------------|
-| [main]({{ site.repository-url }}),<br />[4.1.9](download.html#41x) | 4.9 - 4.20,<br />5.0 - 5.19,<br />6.0 - 6.1 | RHEL 8.6 - 8.7,<br />RHEL 9.0 - 9.1 |
+| [main]({{ site.repository-url }}) | 4.9 - 4.20,<br />5.0 - 5.19,<br />6.0 - 6.3 | RHEL 8.6 - 8.7,<br />RHEL 9.0 - 9.1 |
+| [4.1.9](download.html#41x) | 4.9 - 4.20,<br />5.0 - 5.19,<br />6.0 - 6.1 | RHEL 8.6 - 8.7,<br />RHEL 9.0 - 9.1 |
 | [4.1.8](download.html#41x) | 4.9 - 4.20,<br />5.0 - 5.16 | RHEL 8.5 |
 | [4.1.6](download.html#41x),<br />[4.1.7](download.html#41x) | 4.4 - 4.20,<br />5.0 - 5.15 | RHEL 8.5 |
 | [4.1.5](download.html#41x) | 3.16 - 3.19,<br />4.0 - 4.20,<br />5.0 - 5.11 | RHEL 7.6 - RHEL 7.7,<br />RHEL 8.0 |

diff --git a/src/mod/common/nl/nl_handler.c b/src/mod/common/nl/nl_handler.c
@@ -22,15 +22,21 @@
 #include "mod/common/nl/session.h"
 #include "mod/common/nl/stats.h"
 
-static int pre_handle_request(const struct genl_ops *ops, struct sk_buff *skb,
-		struct genl_info *info)
+#if LINUX_VERSION_AT_LEAST(6, 2, 0, 9999, 0)
+#define GENL_OPS_ARG_TYPE genl_split_ops
+#else
+#define GENL_OPS_ARG_TYPE genl_ops
+#endif
+
+static int pre_handle_request(const struct GENL_OPS_ARG_TYPE *ops,
+		struct sk_buff *skb, struct genl_info *info)
 {
 	error_pool_activate();
 	return 0;
 }
 
-static void post_handle_request(const struct genl_ops *ops, struct sk_buff *skb,
-		struct genl_info *info)
+static void post_handle_request(const struct GENL_OPS_ARG_TYPE *ops,
+		struct sk_buff *skb, struct genl_info *info)
 {
 	error_pool_deactivate();
 }