[backfire] firewall: merge r28525

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@28526 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/firewall/Makefile b/package/firewall/Makefile
index 5924b3582d4d21e73478a29f2b7f745d680dd6e3..859b5541fa9c4aeaa5c24fa8ad75498dde95cc59 100644 (file)
--- 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 a13eb7eb13ff782faadf07ae5f97701dc135a255..bf7156e8cefebd4499bbc0534d9fb00922e09188 100644 (file)
--- 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() {