From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sat, 22 Oct 2011 19:59:31 +0000 (+0000)
Subject: firewall: merge r28525
X-Git-Tag: backfire_10.03.1~95
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=fd005b853d67aa602ad9fed36ea7702289d37e97;p=openwrt%2Fsvn-archive%2Fopenwrt.git

firewall: merge r28525

SVN-Revision: 28526
---

diff --git a/package/firewall/Makefile b/package/firewall/Makefile
index 5924b3582d..859b5541fa 100644
--- a/package/firewall/Makefile
+++ b/package/firewall/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=firewall
 
 PKG_VERSION:=2
-PKG_RELEASE:=34
+PKG_RELEASE:=34.1
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/package/firewall/files/lib/fw.sh b/package/firewall/files/lib/fw.sh
index a13eb7eb13..bf7156e8ce 100644
--- a/package/firewall/files/lib/fw.sh
+++ b/package/firewall/files/lib/fw.sh
@@ -74,21 +74,7 @@ fw__exec() { # <action> <family> <table> <chain> <target> <position> { <rules> }
 			fw__rc $(($? & 1))
 			return
 		fi
-		local mod
-		eval "mod=\$FW_${fam#G}_${tab}"
-		if [ "$mod" ]; then
-			fw__rc $mod
-			return
-		fi
-		case "$fam" in
-			*4) mod=iptable_${tab} ;;
-			*6) mod=ip6table_${tab} ;;
-			*) mod=. ;;
-		esac
-		grep -q "^${mod} " /proc/modules
-		mod=$?
-		export FW_${fam}_${tab}=$mod
-		fw__rc $mod
+		fw__rc 0
 	}
 
 	fw__err() {