diff options
| author | Christian Breunig <christian@breunig.cc> | 2023-11-22 11:40:29 +0100 |
|---|---|---|
| committer | Mergify <37929162+mergify[bot]@users.noreply.github.com> | 2023-11-22 12:23:58 +0000 |
| commit | 2dd0aa94e080e3138e11969b10b76329063b31ce (patch) | |
| tree | d8b4061aefa260708fed0b1eaaca29f7b5e1e217 /src/conf_mode | |
| parent | b1ef7ba3e5f66d446cd83609b25e05ab47f92060 (diff) | |
| download | vyos-1x-2dd0aa94e080e3138e11969b10b76329063b31ce.tar.gz vyos-1x-2dd0aa94e080e3138e11969b10b76329063b31ce.zip | |
pppoe: T5630: make MRU default to MTU if unspecified
This fixes the implementation in e062a8c11 ("pppoe: T5630: allow to specify MRU
in addition to already configurable MTU") and restores the bahavior that MRU
defaults to MTU if MRU is not explicitly set.
This was the behavior in VyOS 1.3.3 and below before we added ability to define
the MRU value.
(cherry picked from commit ffd7339e2ea3eafdd97ac0763ca4a3913fe71bf3)
Diffstat (limited to 'src/conf_mode')
| -rwxr-xr-x | src/conf_mode/interfaces-pppoe.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/conf_mode/interfaces-pppoe.py b/src/conf_mode/interfaces-pppoe.py index 0a03a172c..42f084309 100755 --- a/src/conf_mode/interfaces-pppoe.py +++ b/src/conf_mode/interfaces-pppoe.py @@ -61,6 +61,12 @@ def get_config(config=None): # bail out early - no need to further process other nodes break + if 'deleted' not in pppoe: + # We always set the MRU value to the MTU size. This code path only re-creates + # the old behavior if MRU is not set on the CLI. + if 'mru' not in pppoe: + pppoe['mru'] = pppoe['mtu'] + return pppoe def verify(pppoe): |