aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2011-10-22 19:50:35 +0000
committerJo-Philipp Wich <jow@openwrt.org>2011-10-22 19:50:35 +0000
commite0e73928da09c2fcc075fa1da22179468ef311f2 (patch)
treed2eba2e2bd8ffff5391545c31912cfd5786ab2cf /package
parentb0d9bccafc87b6b60abb02d3dd6b491314d37038 (diff)
downloadupstream-e0e73928da09c2fcc075fa1da22179468ef311f2.tar.gz
upstream-e0e73928da09c2fcc075fa1da22179468ef311f2.tar.bz2
upstream-e0e73928da09c2fcc075fa1da22179468ef311f2.zip
firewall: do not check for module availability, let iptables fail if a feature is not present (#7610)
SVN-Revision: 28525
Diffstat (limited to 'package')
-rw-r--r--package/firewall/Makefile2
-rw-r--r--package/firewall/files/lib/fw.sh16
2 files changed, 2 insertions, 16 deletions
diff --git a/package/firewall/Makefile b/package/firewall/Makefile
index 597a37e140..749f04a4b1 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:=35
+PKG_RELEASE:=36
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() {