Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
make openwrt compatible
- Loading branch information
Dave Taht
committed
Feb 19, 2015
1 parent
c2e0539
commit 5b3eecd
Showing
1 changed file
with
8 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,16 @@ | ||
|
|
||
| config queue 'ge00' | ||
| config queue 'eth1' | ||
| option enabled '0' | ||
| option interface 'ge00' | ||
| option download '20000' | ||
| option upload '4000' | ||
| option interface 'eth1' | ||
| option download '85000' | ||
| option upload '10000' | ||
| option qdisc 'fq_codel' | ||
| option script 'simple.qos' | ||
| option qdisc_advanced '1' | ||
| option qdisc_advanced '0' | ||
| option ingress_ecn 'ECN' | ||
| option egress_ecn 'NOECN' | ||
| option qdisc_really_really_advanced '1' | ||
| option egress_ecn 'ECN' | ||
| option qdisc_really_really_advanced '0' | ||
| option itarget 'auto' | ||
| option etarget 'auto' | ||
| option linklayer 'none' | ||
|
|
5b3eecdThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@moeller0 This breaks the default in the previous commit, "Change the default target calculation to auto" 128d4b6.
It appears to work because sqm-scripts don't check qdisc_advanced and qdisc_really_really_advanced. They're purely for the GUI... (luci-app-) But this means if you look at the GUI, setup your interface & speed & click "save and apply", the GUI kills the "auto" target settings and just uses 5ms.
5b3eecdThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@moeller0 @tohojo Actually I found the problem in the OpenWRT tree, but this tree has better history for me to comment on :).
5b3eecdThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So because the *_advanced flags are unset, when the GUI re-saves, it will discard the itarget and etarget lines completely?
5b3eecdThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Mmm, I didn't double-check the config file. I just looked at the
tc qdiscoutput. I assume that's what's happening though.5b3eecdThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Certainly when I re-enabled the _advanced option, the fields were shown as blank, it had discarded the "auto" values.
5b3eecdThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Right, well I guess the right thing to do is treat missing values the same as 'auto' in the backend... Unless we can somehow persuade the GUI to write specific values to the config file when the fields are deselected, but I'm guessing not...
5b3eecdThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
5b3eecdThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hmm, right, well Sebastian did that part of the GUI, so I guess I'll defer to him in what the right way to fix this is... @moeller0 ? :)
5b3eecdThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
5b3eecdThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.