From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 7 Feb 2012 18:36:51 +0000 (+0000)
Subject: [backfire] firewall: merge r30363
X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=commitdiff_plain;h=fd5b72d9964fb48a9b4e51e7c45c036161efb217

[backfire] firewall: merge r30363

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

diff --git a/package/firewall/Makefile b/package/firewall/Makefile
index 5b8711428..406947a82 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.8
+PKG_RELEASE:=34.9
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/package/firewall/files/lib/fw.sh b/package/firewall/files/lib/fw.sh
index 0814ffc31..76e294f56 100644
--- a/package/firewall/files/lib/fw.sh
+++ b/package/firewall/files/lib/fw.sh
@@ -275,10 +275,7 @@ fw_check_icmptype4() {
 		export FW_ICMP4_TYPES=$(
 			iptables -p icmp -h 2>/dev/null | \
 			sed -n -e '/^Valid ICMP Types:/ {
-				n; :r;
-				/router-advertisement/d;
-				/router-solicitation/d;
-				s/[()]/ /g; s/[[:space:]]\+/\n/g; p; n; b r
+				n; :r; s/[()]/ /g; s/[[:space:]]\+/\n/g; p; n; b r
 			}' | sort -u
 		)