From fc4e819d21577f09098acf82ef08d223e56135e1 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Fri, 21 Apr 2017 16:24:28 -0600
Subject: [PATCH] Various fixes for problems discovered in testing.

---
 netutils/netlib/netlib_getpanid.c                  | 2 +-
 netutils/netlib/netlib_setpanid.c                  | 3 ++-
 wireless/ieee802154/libradio/Makefile              | 2 +-
 wireless/ieee802154/libradio/ieee802154_setsaddr.c | 2 +-
 wireless/iwpan/src/Make.defs                       | 3 ---
 5 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/netutils/netlib/netlib_getpanid.c b/netutils/netlib/netlib_getpanid.c
index 07139b0bf..2efa430b4 100644
--- a/netutils/netlib/netlib_getpanid.c
+++ b/netutils/netlib/netlib_getpanid.c
@@ -83,7 +83,7 @@ int netlib_getpanid(FAR const char *ifname, FAR uint16_t *panid)
         {
           /* Use the helper provided in libradio */
 
-          ret = ieee802154_getpanid(sockfd, ifname, panid);
+          ret = sixlowpan_getpanid(sockfd, ifname, panid);
           close(sockfd);
         }
     }
diff --git a/netutils/netlib/netlib_setpanid.c b/netutils/netlib/netlib_setpanid.c
index 7dd4ff3ba..fb3277d49 100644
--- a/netutils/netlib/netlib_setpanid.c
+++ b/netutils/netlib/netlib_setpanid.c
@@ -46,6 +46,7 @@
 #include <string.h>
 #include <errno.h>
 
+#include "wireless/ieee802154.h"
 #include "netutils/netlib.h"
 
 #if defined(CONFIG_NET_6LOWPAN) && CONFIG_NSOCKET_DESCRIPTORS > 0
@@ -82,7 +83,7 @@ int netlib_setpanid(FAR const char *ifname, uint16_t panid)
         {
           /* Use the helper provided in libradio */
 
-          ret = ieee802154_setpanid(sockfd, ifname, panid);
+          ret = sixlowpan_setpanid(sockfd, ifname, panid);
           close(sockfd);
         }
     }
diff --git a/wireless/ieee802154/libradio/Makefile b/wireless/ieee802154/libradio/Makefile
index 4791f5825..12c47557c 100644
--- a/wireless/ieee802154/libradio/Makefile
+++ b/wireless/ieee802154/libradio/Makefile
@@ -51,7 +51,7 @@ CSRCS += ieee802154_setcca.c ieee802154_getcca.c
 CSRCS += ieee802154_energydetect.c
 
 ifeq ($(CONFIG_NET_6LOWPAN),y)
-CSRCS  = sixlowpan_setchan.c sixlowpan_getchan.c
+CSRCS += sixlowpan_setchan.c sixlowpan_getchan.c
 CSRCS += sixlowpan_setpanid.c sixlowpan_getpanid.c
 CSRCS += sixlowpan_setsaddr.c sixlowpan_getsaddr.c
 CSRCS += sixlowpan_seteaddr.c sixlowpan_geteaddr.c
diff --git a/wireless/ieee802154/libradio/ieee802154_setsaddr.c b/wireless/ieee802154/libradio/ieee802154_setsaddr.c
index b27d577ce..53f555f58 100644
--- a/wireless/ieee802154/libradio/ieee802154_setsaddr.c
+++ b/wireless/ieee802154/libradio/ieee802154_setsaddr.c
@@ -64,7 +64,7 @@ int ieee802154_setsaddr(int fd, uint16_t saddr)
   ret = ioctl(fd, PHY802154IOC_SET_SADDR, (unsigned long)((uintptr_t)&arg));
   if (ret < 0)
     {
-      errcode = errno;
+      int errcode = errno;
       printf("PHY802154IOC_SET_SADDR failed: %d\n", errcode);
     }
 
diff --git a/wireless/iwpan/src/Make.defs b/wireless/iwpan/src/Make.defs
index 072b246d4..e7577e3ac 100644
--- a/wireless/iwpan/src/Make.defs
+++ b/wireless/iwpan/src/Make.defs
@@ -37,10 +37,7 @@
 ifeq ($(CONFIG_WIRELESS_IWPAN),y)
 
 CSRCS = 
-
-ifeq ($(CONFIG_WIRELESS_IWPAN_CMDTOOL),y)
 MAINSRC = iwpan.c
-endif
 
 DEPPATH += --dep-path src
 VPATH += :src