From 6ad4df7ea0f6e001e6d4d66b1d4e092dd2939205 Mon Sep 17 00:00:00 2001
From: vdutta <vivek.dutta@iopsys.eu>
Date: Fri, 28 Feb 2020 13:51:47 +0530
Subject: [PATCH] ieee1905: wfamap: Multiple fixes

 - Fix typos
 - Integrate libwifi
 - Integrate libeasy
 - Cleanup
 - Get APIs for tlvs
---
 ieee1905/Makefile                  | 6 +++---
 ieee1905/files/etc/init.d/ieee1905 | 5 ++---
 wfamap/Makefile                    | 6 +++---
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/ieee1905/Makefile b/ieee1905/Makefile
index 3b677f9ec..3092f6f7a 100644
--- a/ieee1905/Makefile
+++ b/ieee1905/Makefile
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ieee1905
-PKG_VERSION:=2.0.11
+PKG_VERSION:=2.0.12
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=287f16bd062a2e819009c940427887b80b552758
+PKG_SOURCE_VERSION:=bb52164248953882b1fa9d76df0027bb4f2b7617
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/ieee1905.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 endif
@@ -38,7 +38,7 @@ define Package/lib1905al
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=IEEE1905 stack library
-  DEPENDS:= +libpcap +libopenssl 
+  DEPENDS:= +libpcap +libopenssl +libwifi +libeasy
 endef
 
 define Package/lib1905ubus
diff --git a/ieee1905/files/etc/init.d/ieee1905 b/ieee1905/files/etc/init.d/ieee1905
index e2142635a..99dcb4f48 100644
--- a/ieee1905/files/etc/init.d/ieee1905
+++ b/ieee1905/files/etc/init.d/ieee1905
@@ -74,13 +74,12 @@ configure_interface()
 	fi
 
 	local uuid=$(cat /proc/sys/kernel/random/uuid)
-	local ifindex=$(cat /sys/class/net/${ifname}/upper_*/ifindex 2>/dev/null)
+	local ifindex=$(cat /sys/class/net/${ifname}/ifindex 2>/dev/null)
+	#local ifindex=$(cat /sys/class/net/${ifname}/upper_*/ifindex 2>/dev/null)
 	if [ -z ${ifindex} ]; then
 		ifindex=$(cat /sys/class/net/${ifname}/ifindex)
 	fi
 
-	echo "Interface ${ifname} ifindex |${ifindex}|" >>/dev/console
-
 	json_add_object
 	json_add_string ifname ${ifname}
 	json_add_string media ${media}
diff --git a/wfamap/Makefile b/wfamap/Makefile
index 1dd50f04d..54d28d47b 100644
--- a/wfamap/Makefile
+++ b/wfamap/Makefile
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wfamap
-PKG_VERSION:=1.0.6
+PKG_VERSION:=1.0.7
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=6aa80482d4204363eed3f1a5d053f565ef98f91a
+PKG_SOURCE_VERSION:=e6df92d0b639d3d56b6dde20bd9458ebc541dc8b
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/wfamap.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 endif
@@ -23,7 +23,7 @@ define Package/wfamap
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:= MultiAP Stack
-  DEPENDS:= +ubox +lib1905al
+  DEPENDS:= +ubox +lib1905al +libwifi
 endef
 
 define Package/wfamap/description