Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

nft-qos: simplify ifname retrieval

Browse source 
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>
(cherry picked from commit 76b750d720)
This commit is contained in:
Etienne Champetier 2021-08-12 17:35:44 -04:00 committed by Josef Schlehofer
parent d5738504d0
commit 50547b6d51
No known key found for this signature in database
GPG key ID: B950216FE4329F4C
2 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/nft-qos/Makefile
View file

@ -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>

18
net/nft-qos/files/lib/priority.sh
View file

@ -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