diff options
| author | Etienne Champetier <champetier.etienne@gmail.com> | 2021-08-12 17:35:44 -0400 |
|---|---|---|
| committer | Etienne Champetier <champetier.etienne@gmail.com> | 2021-09-16 18:14:23 -0400 |
| commit | 76b750d7201e953b99b5f2600d2f616acf226405 (patch) | |
| tree | 0acdcdab09ede33939aacb3be55db62bf8bba9ef /net/nft-qos/files | |
| parent | c0742dfbe58e83a3c5e8bbb79088bf090cf937ba (diff) | |
nft-qos: simplify ifname retrieval
network_get_device should be enough, and since https://git.openwrt.org/?p=openwrt/openwrt.git;a=commitdiff;h=4b9a67362d70c544b85078b8d5c661f43f7472d9
uci network config interface sections use 'device' instead of 'ifname',
rendering the fallback useless
Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
Diffstat (limited to 'net/nft-qos/files')
| -rw-r--r-- | net/nft-qos/files/lib/priority.sh | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/net/nft-qos/files/lib/priority.sh b/net/nft-qos/files/lib/priority.sh index 081b13f48..7a6eb9c41 100644 --- a/net/nft-qos/files/lib/priority.sh +++ b/net/nft-qos/files/lib/priority.sh @@ -67,8 +67,6 @@ qosdef_remove_priority() { # init traffic priority qosdef_init_priority() { - local ifname="br-lan" - [ "$2" = 0 ] || { logger -t nft-qos-priority "validation failed" return 1 @@ -76,16 +74,12 @@ qosdef_init_priority() { [ $priority_enable -eq 0 ] && return 1 - case "$priority_netdev" in - lan) [ "$(uci_get network.lan.type)" != "bridge" ] && { - network_get_device ifname "$priority_netdev" || \ - ifname="$(uci_get network.lan.ifname)" - } - ;; - wan*) network_get_device ifname "$priority_netdev" || \ - ifname="$(uci_get network.$priority_netdev.ifname)" - ;; - esac + local ifname + network_get_device ifname "$priority_netdev" + [ -n "$ifname" ] || { + logger -t nft-qos-priority "unable to get ifname for $priority_netdev" + return 1 + } qosdef_appendx "table netdev nft-qos-priority {\n" qosdef_append_chain_priority filter priority $ifname |