Merge pull request #603 from oliviertilmans/patch-1

TCIntf: Don't delete a non-existing root qdisc
2016-08-01 15:24:20 -07:00
parent 4fe5a19221 5cfc9f84b8
commit 5714495f8c
1 changed files with 1 additions and 1 deletions
@@ -330,7 +330,7 @@ class TCIntf( Intf ):

        # Clear existing configuration
        tcoutput = self.tc( '%s qdisc show dev %s' )
-        if "priomap" not in tcoutput:
+        if "priomap" not in tcoutput and "noqueue" not in tcoutput:
            cmds = [ '%s qdisc del dev %s root' ]
        else:
            cmds = []