Revert "fix"

This reverts commit 97732c0cec.

netifd/Makefile

@@ -1,13 +1,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=netifd
-PKG_RELEASE:=3
+PKG_RELEASE:=2
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/netifd.git
-PKG_SOURCE_DATE:=2023-08-31
-PKG_SOURCE_VERSION:=1a07f1dff32b3af49e39533e33e8964b59535662
-PKG_MIRROR_HASH:=dc621dd04c3c9631002f929cf10a4620f57af8b0baf614c590bda17957fa6201
+PKG_SOURCE_DATE:=2023-10-20
+PKG_SOURCE_VERSION:=5590a80e2566d378be955f61c287a63fb3bdf329
+PKG_MIRROR_HASH:=eef792b4e9fa7a5227cf8c2ec4ed5e6558dd04c119cd9f97561923821fd1aa92
 PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 
 PKG_LICENSE:=GPL-2.0

netifd/files/lib/netifd/dhcp.script

@@ -13,21 +13,20 @@ set_classless_routes() {
 	done
 }
 
-setup_interface() {
+setup_interface () {
 	proto_init_update "*" 1
 	proto_add_ipv4_address "$ip" "${subnet:-255.255.255.0}"
 	# TODO: apply $broadcast
 
-	local ip_net
-	eval "$(ipcalc.sh "$ip/$mask")";ip_net="$NETWORK"
+	local ip_net IP PREFIX NETWORK NETMASK BROADCAST
+	ipcalc "$ip/$mask" && ip_net="$NETWORK"
 
 	local i
 	for i in $router; do
 		local gw_net
-		eval "$(ipcalc.sh "$i/$mask")";gw_net="$NETWORK"
+		ipcalc "$i/$mask" && gw_net="$NETWORK"
 
 		[ "$ip_net" != "$gw_net" ] && proto_add_ipv4_route "$i" 32 "" "$ip"
-		#[ "$DEFAULTROUTE" = 0 ] || proto_add_ipv4_route 0.0.0.0 0 "$i" "$ip"
 		proto_add_ipv4_route 0.0.0.0 0 "$i" "$ip"
 
 		local r

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

netifd/patches/001-init-pause.patch

@@ -1,13 +0,0 @@
---- a/system-linux.c	2023-09-13 10:44:22.163111635 +0200
-+++ b/system-linux.c	2023-09-13 10:44:47.562696256 +0200
-@@ -2720,7 +2720,9 @@
- system_if_dump_info(struct device *dev, struct blob_buf *b)
- {
- 	__u32 *supported, *advertising, *lp_advertising;
--	bool rx_pause, tx_pause, pause_autoneg;
-+	bool rx_pause = false;
-+	bool tx_pause = false;
-+	bool pause_autoneg = false;
- 	struct {
- 		struct ethtool_link_settings req;
- 		__u32 link_mode_data[3 * 127];