[backfire] merge r26740

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

diff --git a/package/firewall/Makefile b/package/firewall/Makefile
index 7103a176db965571b7d11227c4d68b08468871ee..d67d5d0cf460a0837ddee979ef9844856c990290 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:=24
+PKG_RELEASE:=25
 
 include $(INCLUDE_DIR)/package.mk
 

diff --git a/package/firewall/files/lib/core_interface.sh b/package/firewall/files/lib/core_interface.sh
index ed6a4b150fd9414f0a229903445d86b30fc1f375..bc9eb96ddedc2faa349ccc40d72fa63203229a00 100644 (file)
--- a/package/firewall/files/lib/core_interface.sh
+++ b/package/firewall/files/lib/core_interface.sh
@@ -8,6 +8,7 @@ fw__uci_state_add() {
        val="${val// $item / }"
        val="${val# }"
        val="${val% }"
+       uci_revert_state firewall core $var
        uci_set_state firewall core $var "${val:+$val }$item"
 }
 
@@ -19,6 +20,7 @@ fw__uci_state_del() {
        val="${val// $item / }"
        val="${val# }"
        val="${val% }"
+       uci_revert_state firewall core $var
        uci_set_state firewall core $var "$val"
 }