From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sat, 15 Oct 2011 18:55:54 +0000 (+0000)
Subject: [backfire/packages] merge r28460
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=9b84395f51780764e226cb6eca97280d433f2139;p=openwrt%2Fsvn-archive%2Farchive.git

[backfire/packages] merge r28460

SVN-Revision: 28461
---

diff --git a/net/wshaper/Makefile b/net/wshaper/Makefile
index e968fca8b2..f6c1e07164 100644
--- a/net/wshaper/Makefile
+++ b/net/wshaper/Makefile
@@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2007 OpenWrt.org
+# Copyright (C) 2007-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
diff --git a/net/wshaper/files/wshaper.htb b/net/wshaper/files/wshaper.htb
index 96f29cc469..d8e35adb31 100755
--- a/net/wshaper/files/wshaper.htb
+++ b/net/wshaper/files/wshaper.htb
@@ -13,7 +13,7 @@ for s in downlink uplink network nopriohostdst nopriohostsrc noprioportdst nopri
 	config_get $s settings $s
 done
 
-device=$(uci_get_state network "$network" device)
+device=$(uci_get_state network "$network" ifname "$network")
 [ -z "$device" ] && logger -t wondershaper "Error: Could not find the device for network $network, aborting." && exit 1
 [ -z "$downlink" ] && logger -t wondershaper "Error: Downlink speed not set, aborting." && exit 1
 [ -z "$uplink" ] && logger -t wondershaper "Error: Uplink speed not set, aborting." && exit 1