From: Jo-Philipp Wich <jow@openwrt.org>
Date: Wed, 6 May 2009 18:25:05 +0000 (+0000)
Subject: luci-0.8: merge r4474
X-Git-Tag: 0.8.7~49
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=c2aada24ac7246583d83ec6f12a17bf87e20210a;p=project%2Fluci.git

luci-0.8: merge r4474
---

diff --git a/contrib/package/freifunk-watchdog/Makefile b/contrib/package/freifunk-watchdog/Makefile
index 6d36d0958e..403fb9c97d 100644
--- a/contrib/package/freifunk-watchdog/Makefile
+++ b/contrib/package/freifunk-watchdog/Makefile
@@ -11,6 +11,7 @@ PKG_NAME:=freifunk-watchdog
 PKG_RELEASE:=1
 
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+PKG_BUILD_DEPENDS := uci
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -18,6 +19,7 @@ define Package/freifunk-watchdog
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=Freifunk Ad-Hoc watchdog daemon
+  DEPENDS:=libuci
 endef
 
 define Package/freifunk-watchdog/description
diff --git a/contrib/package/freifunk-watchdog/src/watchdog.c b/contrib/package/freifunk-watchdog/src/watchdog.c
index b431b6dae4..d4ccff8221 100644
--- a/contrib/package/freifunk-watchdog/src/watchdog.c
+++ b/contrib/package/freifunk-watchdog/src/watchdog.c
@@ -69,7 +69,7 @@ static int iw_get_channel(int iwfd, const char *ifname, int *channel)
 		}
 
 		for(i = 0; i < range->num_frequency; i++)
-	    {
+		{
 			cmp_freq = ((double)range->freq[i].m) * pow(10, range->freq[i].e);
 			if( cmp_freq == cur_freq )
 			{
@@ -302,7 +302,7 @@ static int do_daemon(void)
 				}
 
 				/* Check channel */
-				if( channel != curif->channel )
+				else if( channel != curif->channel )
 				{
 					syslog(LOG_WARNING, "Channel mismatch on %s: current=%d wanted=%d",
 						curif->ifname, channel, curif->channel);