Merge pull request #5159 from c-po/kernel-6.18

T8147: Update Linux Kernel to 6.18

6 files changed, 36 insertions, 8 deletions

diff --git a/debian/control b/debian/control
index ba059ae0b..3e2b41ca6 100644
--- a/debian/control
+++ b/debian/control
@@ -172,7 +172,6 @@ Depends:
   openvpn-auth-ldap,
   openvpn-auth-radius,
   openvpn-otp,
-  openvpn-dco,
   libpam-google-authenticator,
 # End "interfaces openvpn"
 # For "interfaces wireguard"
diff --git a/smoketest/scripts/cli/test_interfaces_ethernet.py b/smoketest/scripts/cli/test_interfaces_ethernet.py
index 7e0da2079..06253cf9e 100755
--- a/smoketest/scripts/cli/test_interfaces_ethernet.py
+++ b/smoketest/scripts/cli/test_interfaces_ethernet.py
@@ -234,8 +234,8 @@ class EthernetInterfaceTest(BasicInterfaceTest.TestCase):
                 # To find out the supported features
                 supported_rx_usecs = ethtool.check_coalesce('rx_usecs')
                 supported_tx_usecs = ethtool.check_coalesce('tx_usecs')
-                supported_adaptive_rx = ethtool.check_coalesce('adaptive_rx')
-                supported_adaptive_tx = ethtool.check_coalesce('adaptive_tx')
+                supported_adaptive_rx = ethtool.check_coalesce('adaptive_rx') and not is_virtio
+                supported_adaptive_tx = ethtool.check_coalesce('adaptive_tx') and not is_virtio
 
                 # Disabled adaptive modes and set custom values
                 if supported_rx_usecs:
diff --git a/smoketest/scripts/system/test_kernel_options.py b/smoketest/scripts/system/test_kernel_options.py
index 2f3c54c79..d9b7740c1 100755
--- a/smoketest/scripts/system/test_kernel_options.py
+++ b/smoketest/scripts/system/test_kernel_options.py
@@ -52,7 +52,7 @@ class TestKernelModules(unittest.TestCase):
 
     def test_bridge_interface(self):
         # The bridge interface must be enabled in the OS Kernel
-        for option in ['CONFIG_BRIDGE',
+        for option in ['CONFIG_STP', 'CONFIG_BRIDGE',
                        'CONFIG_BRIDGE_IGMP_SNOOPING',
                        'CONFIG_BRIDGE_VLAN_FILTERING']:
             tmp = re.findall(f'{option}=(y|m)', self._config_data)
@@ -146,7 +146,7 @@ class TestKernelModules(unittest.TestCase):
             self.assertTrue(tmp)
 
     def test_inotify_stackfs(self):
-        for option in ['CONFIG_INOTIFY_USER', 'CONFIG_INOTIFY_STACKFS']:
+        for option in ['CONFIG_INOTIFY_USER']:
             tmp = re.findall(f'{option}=y', self._config_data)
             self.assertTrue(tmp)
 
@@ -173,6 +173,36 @@ class TestKernelModules(unittest.TestCase):
             tmp = re.findall(f'{option}=y', self._config_data)
             self.assertTrue(tmp)
 
+    def test_openvpn_dco(self):
+        options_to_check = ['CONFIG_OVPN']
+        for option in options_to_check:
+            tmp = re.findall(f'{option}=(y|m)', self._config_data)
+            self.assertTrue(tmp)
+
+    def test_wireguard(self):
+        options_to_check = ['CONFIG_WIREGUARD']
+        for option in options_to_check:
+            tmp = re.findall(f'{option}=(y|m)', self._config_data)
+            self.assertTrue(tmp)
+
+    def test_vxlan(self):
+        options_to_check = ['CONFIG_VXLAN']
+        for option in options_to_check:
+            tmp = re.findall(f'{option}=(y|m)', self._config_data)
+            self.assertTrue(tmp)
+
+    def test_macvlan(self):
+        options_to_check = ['CONFIG_MACVLAN', 'CONFIG_MACVTAP']
+        for option in options_to_check:
+            tmp = re.findall(f'{option}=(y|m)', self._config_data)
+            self.assertTrue(tmp)
+
+    def test_dummy(self):
+        options_to_check = ['CONFIG_DUMMY']
+        for option in options_to_check:
+            tmp = re.findall(f'{option}=(y|m)', self._config_data)
+            self.assertTrue(tmp)
+
     def test_arm64(self):
         # Only required on arm64 platforms
         if not IS_ARM64:
diff --git a/smoketest/scripts/system/test_module_load.py b/smoketest/scripts/system/test_module_load.py
index 29fbb407d..5570d74df 100755
--- a/smoketest/scripts/system/test_module_load.py
+++ b/smoketest/scripts/system/test_module_load.py
@@ -24,7 +24,6 @@ modules = {
                   "qat_c62x", "qat_c62xvf", "qat_d15xx", "qat_d15xxvf",
                   "qat_dh895xcc", "qat_dh895xccvf"],
     "accel_ppp": ["ipoe", "vlan_mon"],
-    "openvpn": ["ovpn-dco-v2"]
 }
 
 class TestKernelModules(unittest.TestCase):
diff --git a/src/conf_mode/interfaces_openvpn.py b/src/conf_mode/interfaces_openvpn.py
index 16a4ed0b5..ab27fe66e 100755
--- a/src/conf_mode/interfaces_openvpn.py
+++ b/src/conf_mode/interfaces_openvpn.py
@@ -798,7 +798,7 @@ def apply(openvpn):
             VTunIf(interface).remove()
 
     # dynamically load/unload DCO Kernel extension if requested
-    dco_module = 'ovpn_dco_v2'
+    dco_module = 'ovpn'
     if 'module_load_dco' in openvpn:
         check_kmod(dco_module)
     else:
diff --git a/src/etc/modprobe.d/openvpn.conf b/src/etc/modprobe.d/openvpn.conf
index a9259fea2..db965e61a 100644
--- a/src/etc/modprobe.d/openvpn.conf
+++ b/src/etc/modprobe.d/openvpn.conf
@@ -1 +1 @@
-blacklist ovpn-dco-v2
+blacklist ovpn