From 03a9ab5e492cb145bc2bef28a254b7bb2137843e Mon Sep 17 00:00:00 2001
From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Thu, 7 Oct 2010 15:18:00 +0000
Subject: [PATCH] [backfire] merge r23227 and r23238

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@23297 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/qos-scripts/Makefile                      | 8 ++++++--
 package/qos-scripts/files/usr/lib/qos/generate.sh | 7 ++++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/package/qos-scripts/Makefile b/package/qos-scripts/Makefile
index 253e65dc4..7a374697e 100644
--- a/package/qos-scripts/Makefile
+++ b/package/qos-scripts/Makefile
@@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006-2008 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=qos-scripts
 PKG_VERSION:=1.2.1
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 
@@ -29,6 +29,10 @@ define Package/qos-scripts/description
  entries.
 endef
 
+define Package/qos-scripts/conffiles
+/etc/config/qos
+endef
+
 define Build/Prepare
 endef
 
diff --git a/package/qos-scripts/files/usr/lib/qos/generate.sh b/package/qos-scripts/files/usr/lib/qos/generate.sh
index 02c3933d1..6b5db3d7d 100755
--- a/package/qos-scripts/files/usr/lib/qos/generate.sh
+++ b/package/qos-scripts/files/usr/lib/qos/generate.sh
@@ -380,7 +380,6 @@ start_cg() {
 	local iptrules
 	local pktrules
 	local sizerules
-	local download
 	enum_classes "$cg"
 	add_rules iptrules "$ctrules" "iptables -t mangle -A ${cg}_ct"
 	config_get classes "$cg" classes
@@ -397,12 +396,14 @@ start_cg() {
 		config_get classgroup "$iface" classgroup
 		config_get device "$iface" device
 		config_get imqdev "$iface" imqdev
-		config_get dl "$iface" download
+		config_get upload "$iface" upload
+		config_get download "$iface" download
 		config_get halfduplex "$iface" halfduplex
+		download="${download:-${halfduplex:+$upload}}"
 		add_insmod ipt_IMQ
 		append up "iptables -t mangle -A OUTPUT -o $device -j ${cg}" "$N"
 		append up "iptables -t mangle -A FORWARD -o $device -j ${cg}" "$N"
-		[ -z "$dl" ] || {
+		[ -z "$download" ] || {
 			append down "iptables -t mangle -A POSTROUTING -o $device -j ${cg}" "$N"
 			[ -z "$halfduplex" ] || {
 				append down "iptables -t mangle -A POSTROUTING -o $device -j IMQ --todev $imqdev" "$N"