summaryrefslogtreecommitdiff
path: root/src/migration-scripts/interfaces
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-08-30 21:36:52 +0200
committerChristian Poessinger <christian@poessinger.com>2021-08-30 21:45:37 +0200
commit705022319916222d78082114245c7639c073bd32 (patch)
treef814f8bff50065e99cfadb97c71087d8ab290308 /src/migration-scripts/interfaces
parentc1b298e5ec11313156eb3a9f871fe4f3cd4cbd64 (diff)
downloadvyos-1x-705022319916222d78082114245c7639c073bd32.tar.gz
vyos-1x-705022319916222d78082114245c7639c073bd32.zip
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."). (cherry picked from commit f5e46ee6cc2b6c1c1869e26beca4ccd5bf52b62f)
Diffstat (limited to 'src/migration-scripts/interfaces')
-rwxr-xr-xsrc/migration-scripts/interfaces/20-to-2112
1 files changed, 4 insertions, 8 deletions
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: