summaryrefslogtreecommitdiff
path: root/src/conf_mode
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-02-24 22:24:44 +0100
committerChristian Poessinger <christian@poessinger.com>2021-02-24 22:30:40 +0100
commit249c8ad37e5ee7eae886aa7ebae64e32a40e5ff3 (patch)
tree45aa62a96b8449f9a47ea9e186e8554e33fe5b99 /src/conf_mode
parentede8217b6345b58da85f68ca024b54e04fd6348c (diff)
downloadvyos-1x-249c8ad37e5ee7eae886aa7ebae64e32a40e5ff3.tar.gz
vyos-1x-249c8ad37e5ee7eae886aa7ebae64e32a40e5ff3.zip
ethernet: T3163: not all NIC drivers support ring-buffer configuration
In addition to commit cf1156a60e ("ethernet: T3163: probe driver for maximum rx/tx ring-buffer size") this extends the logic in a way as not every driver supports setting the buffers at all so it will properly error out. When invoking "ethtool -g" both stdout and stderr are captured and no exception is raised if it's an unsupported driver feature. The verify() section will inform the user about the illegal operation. (cherry picked from commit 159899ed9ba5661e4bdcfdadf1292e237f117063)
Diffstat (limited to 'src/conf_mode')
-rwxr-xr-xsrc/conf_mode/interfaces-ethernet.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/conf_mode/interfaces-ethernet.py b/src/conf_mode/interfaces-ethernet.py
index e82a3e0f1..378f400b8 100755
--- a/src/conf_mode/interfaces-ethernet.py
+++ b/src/conf_mode/interfaces-ethernet.py
@@ -91,7 +91,12 @@ def verify(ethernet):
ethtool = Ethtool(ifname)
if 'ring_buffer' in ethernet:
max_rx = ethtool.get_rx_buffer()
+ if not max_rx:
+ raise ConfigError('Driver does not support RX ring-buffer configuration!')
+
max_tx = ethtool.get_tx_buffer()
+ if not max_tx:
+ raise ConfigError('Driver does not support TX ring-buffer configuration!')
rx = dict_search('ring_buffer.rx', ethernet)
if rx and int(rx) > int(max_rx):