summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-12-21 23:17:35 +0100
committerGitHub <noreply@github.com>2021-12-21 23:17:35 +0100
commit07ccea8c761f664ead251b14c5a448755aa836ca (patch)
treea1c9e13d78a451eee993fc05c182d6e2434f9401
parent9275fd942cef387c1163bcdf5fff3a200f557f4c (diff)
parenteb478c15b4b8d091c1e2290fc5b20640636d0423 (diff)
downloadvyos-1x-07ccea8c761f664ead251b14c5a448755aa836ca.tar.gz
vyos-1x-07ccea8c761f664ead251b14c5a448755aa836ca.zip
Merge pull request #1117 from sever-sever/T4056
interface: T4056: Fix unexpected delete tc qdisc
-rwxr-xr-xpython/vyos/ifconfig/interface.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/python/vyos/ifconfig/interface.py b/python/vyos/ifconfig/interface.py
index bcb692697..5fdd27828 100755
--- a/python/vyos/ifconfig/interface.py
+++ b/python/vyos/ifconfig/interface.py
@@ -1304,8 +1304,8 @@ class Interface(Control):
source_if = next(iter(self._config['is_mirror_intf']))
config = self._config['is_mirror_intf'][source_if].get('mirror', None)
- # Check configuration stored by old perl code before delete T3782
- if not 'redirect' in self._config:
+ # Check configuration stored by old perl code before delete T3782/T4056
+ if not 'redirect' in self._config and not 'traffic_policy' in self._config:
# Please do not clear the 'set $? = 0 '. It's meant to force a return of 0
# Remove existing mirroring rules
delete_tc_cmd = f'tc qdisc del dev {source_if} handle ffff: ingress 2> /dev/null;'