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>

diff --git a/net/nft-qos/Makefile b/net/nft-qos/Makefile
index b6ad0fd327d38bdf690d2d5ff31629e5df6a545b..b2ff326bfa8671c139a5d4f3a03903f733ea0911 100644 (file)
--- a/net/nft-qos/Makefile
+++ b/net/nft-qos/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nft-qos
 PKG_VERSION:=1.0.6
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 PKG_LICENSE:=GPL-2.0
 
 PKG_MAINTAINER:=Rosy Song <rosysong@rosinson.com>

diff --git a/net/nft-qos/files/lib/priority.sh b/net/nft-qos/files/lib/priority.sh
index 081b13f48c7eabac4ff2b1b23cf6263691625657..7a6eb9c415f5835e02aa79355af508ae3a23455b 100644 (file)
--- 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