T6716: don't automatically set ethernet offload

Remove the lines of code that checked if the kernel had offloading
enabled and was then forcing the config to set it to "on." The
behavior now mirrors the config and offloading will only be enabled
if the config is explicitly set to enabled.

Note: the code is still present to disable the offloading, in the
config, if the kernel doesn't support it.

Author: Dave Vogel

src/activation-scripts/20-ethernet_offload.py

@@ -17,7 +17,8 @@
 #        CLI. See https://vyos.dev/T3619#102254 for all the details.
 # T3787: Remove deprecated UDP fragmentation offloading option
 # T6006: add to activation-scripts: migration-scripts/interfaces/20-to-21
-
+# T6716: Honor the configured offload settings and don't automacially add
+#        them to the config if the kernel has them set.
 from vyos.ethtool import Ethtool
 from vyos.configtree import ConfigTree
 
@@ -36,44 +37,34 @@ def activate(config: ConfigTree):
         enabled, fixed = eth.get_generic_receive_offload()
         if configured and fixed:
             config.delete(base + [ifname, 'offload', 'gro'])
-        elif enabled and not fixed:
-            config.set(base + [ifname, 'offload', 'gro'])
 
         # If GSO is enabled by the Kernel - we reflect this on the CLI. If GSO is
         # enabled via CLI but not supported by the NIC - we remove it from the CLI
         configured = config.exists(base + [ifname, 'offload', 'gso'])
         enabled, fixed = eth.get_generic_segmentation_offload()
         if configured and fixed:
             config.delete(base + [ifname, 'offload', 'gso'])
-        elif enabled and not fixed:
-            config.set(base + [ifname, 'offload', 'gso'])
 
         # If LRO is enabled by the Kernel - we reflect this on the CLI. If LRO is
         # enabled via CLI but not supported by the NIC - we remove it from the CLI
         configured = config.exists(base + [ifname, 'offload', 'lro'])
         enabled, fixed = eth.get_large_receive_offload()
         if configured and fixed:
             config.delete(base + [ifname, 'offload', 'lro'])
-        elif enabled and not fixed:
-            config.set(base + [ifname, 'offload', 'lro'])
 
         # If SG is enabled by the Kernel - we reflect this on the CLI. If SG is
         # enabled via CLI but not supported by the NIC - we remove it from the CLI
         configured = config.exists(base + [ifname, 'offload', 'sg'])
         enabled, fixed = eth.get_scatter_gather()
         if configured and fixed:
             config.delete(base + [ifname, 'offload', 'sg'])
-        elif enabled and not fixed:
-            config.set(base + [ifname, 'offload', 'sg'])
 
         # If TSO is enabled by the Kernel - we reflect this on the CLI. If TSO is
         # enabled via CLI but not supported by the NIC - we remove it from the CLI
         configured = config.exists(base + [ifname, 'offload', 'tso'])
         enabled, fixed = eth.get_tcp_segmentation_offload()
         if configured and fixed:
             config.delete(base + [ifname, 'offload', 'tso'])
-        elif enabled and not fixed:
-            config.set(base + [ifname, 'offload', 'tso'])
 
         # Remove deprecated UDP fragmentation offloading option
         if config.exists(base + [ifname, 'offload', 'ufo']):