ethernet: T3787: remove deprecated UDP fragmentation offloading option

Deprecated in the Linux Kernel by commit 08a00fea6de277df12ccfadc21 ("net:
Remove references to NETIF_F_UFO from ethtool.").

4 files changed, 4 insertions, 45 deletions

diff --git a/interface-definitions/interfaces-ethernet.xml.in b/interface-definitions/interfaces-ethernet.xml.in
index ec20bca8d..27d555552 100644
--- a/interface-definitions/interfaces-ethernet.xml.in
+++ b/interface-definitions/interfaces-ethernet.xml.in
@@ -101,12 +101,6 @@
                   <valueless/>
                 </properties>
               </leafNode>
-              <leafNode name="ufo">
-                <properties>
-                  <help>Enable UDP Fragmentation Offloading</help>
-                  <valueless/>
-                </properties>
-              </leafNode>
             </children>
           </node>
           <leafNode name="speed">
diff --git a/python/vyos/ethtool.py b/python/vyos/ethtool.py
index a81ddac31..397be6bb2 100644
--- a/python/vyos/ethtool.py
+++ b/python/vyos/ethtool.py
@@ -122,9 +122,6 @@ class Ethtool:
     def get_tcp_segmentation_offload(self):
         return self._get_generic('tcp-segmentation-offload')
 
-    def get_udp_fragmentation_offload(self):
-        return self._get_generic('udp-fragmentation-offload')
-
     def get_rx_buffer(self):
         # Configuration of RX ring-buffers is not supported on every device,
         # thus when it's impossible return None
diff --git a/python/vyos/ifconfig/ethernet.py b/python/vyos/ifconfig/ethernet.py
index cb03a006c..a6c7f5f25 100644
--- a/python/vyos/ifconfig/ethernet.py
+++ b/python/vyos/ifconfig/ethernet.py
@@ -72,11 +72,6 @@ class EthernetIf(Interface):
             'possible': lambda i, v: EthernetIf.feature(i, 'tso', v),
             # 'shellcmd': 'ethtool -K {ifname} tso {value}',
         },
-        'ufo': {
-            'validate': lambda v: assert_list(v, ['on', 'off']),
-            'possible': lambda i, v: EthernetIf.feature(i, 'ufo', v),
-            # 'shellcmd': 'ethtool -K {ifname} ufo {value}',
-        },
     }}
 
     _sysfs_set = {**Interface._sysfs_set, **{
@@ -339,26 +334,6 @@ class EthernetIf(Interface):
                 print('Adapter does not support changing tcp-segmentation-offload settings!')
         return False
 
-    def set_ufo(self, state):
-        """
-        Enable UDP fragmentation offloading. State can be either True or False.
-
-        Example:
-        >>> from vyos.ifconfig import EthernetIf
-        >>> i = EthernetIf('eth0')
-        >>> i.set_udp_offload(True)
-        """
-        if not isinstance(state, bool):
-            raise ValueError('Value out of range')
-
-        enabled, fixed = self.ethtool.get_udp_fragmentation_offload()
-        if enabled != state:
-            if not fixed:
-                return self.set_interface('gro', 'on' if state else 'off')
-            else:
-                print('Adapter does not support changing udp-fragmentation-offload settings!')
-        return False
-
     def set_ring_buffer(self, b_type, b_size):
         """
         Example:
@@ -404,9 +379,6 @@ class EthernetIf(Interface):
         # TSO (TCP segmentation offloading)
         self.set_tso(dict_search('offload.tso', config) != None)
 
-        # UDP fragmentation offloading
-        self.set_ufo(dict_search('offload.ufo', config) != None)
-
         # Set physical interface speed and duplex
         if {'speed', 'duplex'} <= set(config):
             speed = config.get('speed')
diff --git a/src/migration-scripts/interfaces/20-to-21 b/src/migration-scripts/interfaces/20-to-21
index 9210330d6..4b0e70d35 100755
--- a/src/migration-scripts/interfaces/20-to-21
+++ b/src/migration-scripts/interfaces/20-to-21
@@ -15,7 +15,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # T3619: mirror Linux Kernel defaults for ethernet offloading options into VyOS
-# CLI. See https://phabricator.vyos.net/T3619#102254 for all the details.
+#        CLI. See https://phabricator.vyos.net/T3619#102254 for all the details.
+# T3787: Remove deprecated UDP fragmentation offloading option
 
 from sys import argv
 
@@ -84,14 +85,9 @@ for ifname in config.list_nodes(base):
     elif enabled and not fixed:
         config.set(base + [ifname, 'offload', 'tso'])
 
-    # If UFO is enabled by the Kernel - we reflect this on the CLI. If UFO is
-    # enabled via CLI but not supported by the NIC - we remove it from the CLI
-    configured = config.exists(base + [ifname, 'offload', 'ufo'])
-    enabled, fixed = eth.get_udp_fragmentation_offload()
-    if configured and fixed:
+    # Remove deprecated UDP fragmentation offloading option
+    if config.exists(base + [ifname, 'offload', 'ufo']):
         config.delete(base + [ifname, 'offload', 'ufo'])
-    elif enabled and not fixed:
-        config.set(base + [ifname, 'offload', 'ufo'])
 
 try:
     with open(file_name, 'w') as f: