fix netifd

netifd/Makefile

@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=netifd
-PKG_RELEASE:=3
+PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/netifd.git

netifd/files/lib/netifd/dhcp.script

@@ -13,12 +13,11 @@ 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
 	local ip_net IP PREFIX NETWORK NETMASK BROADCAST
 	ipcalc "$ip/$mask" && ip_net="$NETWORK"
 
@@ -28,7 +27,6 @@ setup_interface() {
 		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