From: Felix Fietkau Date: Fri, 15 Sep 2023 18:40:59 +0000 (+0200) Subject: netifd: update to the latest version X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=a33f1d35155cf9579065ed76bd17e991d165170e;p=openwrt%2Fstaging%2Fblocktrron.git netifd: update to the latest version 88a3a9e2be07 wireless: clean up prev_config handling afcd3825dad9 wireless: dynamically enable/disable virtual interfaces base on network interface autostart Signed-off-by: Felix Fietkau --- diff --git a/package/network/config/netifd/Makefile b/package/network/config/netifd/Makefile index 192dc0ca59..e70fd183ee 100644 --- a/package/network/config/netifd/Makefile +++ b/package/network/config/netifd/Makefile @@ -5,9 +5,9 @@ PKG_RELEASE:=3 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/netifd.git -PKG_SOURCE_DATE:=2023-09-15 -PKG_SOURCE_VERSION:=3d425f16d6a69f602e25d7ec19734bb2c8de1588 -PKG_MIRROR_HASH:=6e8210ec376aa9f2b4c948d5f2ab8ca3fd35ab54e790c23b86fe79afdbc8e35a +PKG_SOURCE_DATE:=2023-09-15.1 +PKG_SOURCE_VERSION:=afcd3825dad9b6a6712fbf6ed8e4434819a34009 +PKG_MIRROR_HASH:=d389db5dec7140fc12f69e8d679b9242c72d27b35c789b12adc6ebdf16913a85 PKG_MAINTAINER:=Felix Fietkau PKG_LICENSE:=GPL-2.0 diff --git a/package/network/config/netifd/files/sbin/ifup b/package/network/config/netifd/files/sbin/ifup index 15be535bbf..fbf2fd80c7 100755 --- a/package/network/config/netifd/files/sbin/ifup +++ b/package/network/config/netifd/files/sbin/ifup @@ -1,7 +1,6 @@ #!/bin/sh ifup_all= -setup_wifi= if_call() { local interface="$1" @@ -14,7 +13,6 @@ case "$0" in *ifdown) modes=down;; *ifup) modes="down up" - setup_wifi=1 ;; *) echo "Invalid command: $0";; esac @@ -25,10 +23,6 @@ while :; do ifup_all=1 shift ;; - -w) - setup_wifi= - shift - ;; *) break ;; @@ -40,7 +34,6 @@ if [ -n "$ifup_all" ]; then for interface in $(ubus -S list 'network.interface.*'); do if_call "${interface##network.interface.}" done - [ -n "$setup_wifi" ] && /sbin/wifi up exit else ubus -S list "network.interface.$1" > /dev/null || { @@ -49,29 +42,3 @@ else } if_call "$1" fi - -if [ -n "$setup_wifi" ] && grep -sq config /etc/config/wireless; then - . /lib/functions.sh - - find_related_radios() { - local wdev wnet - config_get wdev "$1" device - config_get wnet "$1" network - - if [ -n "$wdev" ]; then - for wnet in $wnet; do - if [ "$wnet" = "$network" ]; then - append radio_devs "$wdev" "$N" - fi - done - fi - } - - network="$1" - config_load wireless - config_foreach find_related_radios wifi-iface - - for dev in $(echo "$radio_devs" | sort -u); do - /sbin/wifi up "$dev" - done -fi