diff options
| author | Christian Poessinger <christian@poessinger.com> | 2021-02-24 22:24:44 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2021-02-24 22:24:44 +0100 |
| commit | 159899ed9ba5661e4bdcfdadf1292e237f117063 (patch) | |
| tree | 82b10e18fdbee9fee9ccedb0d59b52ffab244124 /src/conf_mode | |
| parent | 25b86442d987bf57a801a607648527aaf6158d69 (diff) | |
| download | vyos-1x-159899ed9ba5661e4bdcfdadf1292e237f117063.tar.gz vyos-1x-159899ed9ba5661e4bdcfdadf1292e237f117063.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.
Diffstat (limited to 'src/conf_mode')
| -rwxr-xr-x | src/conf_mode/interfaces-ethernet.py | 5 |
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): |