lede-packages-rs

commit 68d9435254dec92c6934adba5c38319bc0231a64
parent d8874f0f3cf39978f3189842abebf288427a4377
Author: Steven Barth <steven@midlink.org>
Date:   Thu, 15 Jan 2015 14:32:31 +0100

Merge pull request #781 from Adze1502/master

mwan3: update to version 1.5-10
Diffstat:
M
net/mwan3/Makefile
 | 
2
+-
M
net/mwan3/files/etc/hotplug.d/iface/15-mwan3
 | 
2
+-
M
net/mwan3/files/usr/sbin/mwan3
 | 
2
+-

3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/net/mwan3/Makefile b/net/mwan3/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mwan3
 PKG_VERSION:=1.5
-PKG_RELEASE:=9
+PKG_RELEASE:=10
 PKG_MAINTAINER:=Jeroen Louwes <jeroen.louwes@gmail.com>
 PKG_LICENSE:=GPLv2
 
diff --git a/net/mwan3/files/etc/hotplug.d/iface/15-mwan3 b/net/mwan3/files/etc/hotplug.d/iface/15-mwan3
@@ -314,7 +314,7 @@ mwan3_ifupdown()
 		done
 
 		route_args=$($IP route list dev $DEVICE default | head -1 | sed '/.*via \([^ ]*\) .*$/!d;s//via \1/;q' | egrep '[0-9]{1,3}(\.[0-9]{1,3}){3}')
-		route_args="nexthop $route_args dev $DEVICE"
+		route_args="$route_args dev $DEVICE"
 	fi
 
 	while [ "$(pgrep -f -o hotplug-call)" -ne $$ -a "$counter" -lt 60 ]; do
diff --git a/net/mwan3/files/usr/sbin/mwan3 b/net/mwan3/files/usr/sbin/mwan3
@@ -74,6 +74,7 @@ interfaces()
 	
 	check_iface_status()
 	{
+		let iface_id++
 		device=$(uci get -p /var/state network.$1.ifname) &> /dev/null
 
 		if [ -z "$device" ]; then
@@ -82,7 +83,6 @@ interfaces()
 		fi
 
 		config_get enabled "$1" enabled 0
-		let iface_id++
 
 		if [ -n "$(ps -w | grep mwan3track | grep -v grep | sed '/.*\/usr\/sbin\/mwan3track \([^ ]*\) .*$/!d;s//\1/' | awk '$1 == "'$1'"')" ]; then
 			tracking="active"