From dfa9c366bc8f7be90e19d929516e3021dcf87a4e Mon Sep 17 00:00:00 2001
From: kerneis <kerneis@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sat, 1 Oct 2011 11:30:03 +0000
Subject: [PATCH] [packages] ahcpd: avoid half-configured ahcpd interfaces

git-svn-id: svn://svn.openwrt.org/openwrt/packages@28351 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 ipv6/ahcpd/Makefile      | 2 +-
 ipv6/ahcpd/files/ahcp.sh | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ipv6/ahcpd/Makefile b/ipv6/ahcpd/Makefile
index dbaa664b2..19beb3074 100644
--- a/ipv6/ahcpd/Makefile
+++ b/ipv6/ahcpd/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ahcpd
 PKG_VERSION:=0.52
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.pps.jussieu.fr/~jch/software/files/
diff --git a/ipv6/ahcpd/files/ahcp.sh b/ipv6/ahcpd/files/ahcp.sh
index 6dc8c9758..11788e29f 100644
--- a/ipv6/ahcpd/files/ahcp.sh
+++ b/ipv6/ahcpd/files/ahcp.sh
@@ -2,12 +2,13 @@ setup_interface_ahcp() {
 	local interface="$1"
 	local config="$2"
 
+	setup_interface_none "$interface" "$config"
+
 	local mode=$(uci_get_state ahcpd "@ahcpd[0]" mode "client")
 	if [ "$mode" != "client" ]; then
 		echo "Warning: ahcp ignored for $interface (mode is $mode, should be client)."
 		echo "Fix ahcp mode in /etc/config/ahcpd."
-		return
+	else
+		/etc/init.d/ahcpd restart
 	fi
-	setup_interface_none "$interface" "$config"
-	/etc/init.d/ahcpd restart
 }
-- 
2.11.0