diff --git a/include/nuttx/wireless/wireless.h b/include/nuttx/wireless/wireless.h index cc5df1e309d..a09c2bb1488 100644 --- a/include/nuttx/wireless/wireless.h +++ b/include/nuttx/wireless/wireless.h @@ -170,7 +170,7 @@ * of the address is driver specific */ #define WLIOC_GETADDR _WLIOC(0x0036) /* arg: Pointer to address value, format * of the address is driver specific */ -#define WLIOC_SETTXPOWER _WLIOC(0x0036) /* arg: Pointer to int32_t, output power +#define WLIOC_SETTXPOWER _WLIOC(0x0037) /* arg: Pointer to int32_t, output power * (in dBm) */ #define WLIOC_GETTXPOWER _WLIOC(0x0038) /* arg: Pointer to int32_t, output power * (in dBm) */ diff --git a/net/netdev/netdev_ioctl.c b/net/netdev/netdev_ioctl.c index 41014ce5efe..20a3cb662bb 100644 --- a/net/netdev/netdev_ioctl.c +++ b/net/netdev/netdev_ioctl.c @@ -61,7 +61,6 @@ #ifdef CONFIG_NET_6LOWPAN # include -# include #endif #ifdef CONFIG_NET_IGMP @@ -757,7 +756,9 @@ static int netdev_ifr_ioctl(FAR struct socket *psock, int cmd, } break; - /* MAC address operations only make sense if Ethernet is supported */ + /* MAC address operations only make sense if Ethernet or 6loWPAN are + * supported. + */ #if defined(CONFIG_NET_ETHERNET) || defined(CONFIG_NET_6LOWPAN) case SIOCGIFHWADDR: /* Get hardware address */ @@ -1275,7 +1276,7 @@ int psock_ioctl(FAR struct socket *psock, int cmd, unsigned long arg) { FAR struct iwreq *wifrreq; - wifrreq = (FAR struct sixlowpan_req_s *)((uintptr_t)arg); + wifrreq = (FAR FAR struct iwreq *)((uintptr_t)arg); ret = netdev_wifr_ioctl(psock, cmd, wifrreq); } #endif