From d5a7d772db2eebd0f688f543116ca8d9ece94c27 Mon Sep 17 00:00:00 2001
From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sat, 22 Oct 2011 19:59:31 +0000
Subject: [PATCH] [backfire] firewall: merge r28525

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@28526 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/firewall/Makefile        |  2 +-
 package/firewall/files/lib/fw.sh | 16 +---------------
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/package/firewall/Makefile b/package/firewall/Makefile
index 5924b3582..859b5541f 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 a13eb7eb1..bf7156e8c 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() {
-- 
2.35.1