Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-28 20:08:15 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into ieee802154

Browse Source
This commit is contained in:
Gregory Nutt
2017-04-21 18:40:47 -06:00
parent d884958a2e 7c6f2c3c9a
commit e66caaf960
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/nuttx/wireless/wireless.h
+1 -1
View File
@@ -170,7 +170,7 @@
* of the address is driver specific */ * of the address is driver specific */
#define WLIOC_GETADDR _WLIOC(0x0036) /* arg: Pointer to address value, format #define WLIOC_GETADDR _WLIOC(0x0036) /* arg: Pointer to address value, format
* of the address is driver specific */ * 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) */ * (in dBm) */
#define WLIOC_GETTXPOWER _WLIOC(0x0038) /* arg: Pointer to int32_t, output power #define WLIOC_GETTXPOWER _WLIOC(0x0038) /* arg: Pointer to int32_t, output power
* (in dBm) */ * (in dBm) */
net/netdev/netdev_ioctl.c
+4 -3
View File
@@ -61,7 +61,6 @@
#ifdef CONFIG_NET_6LOWPAN #ifdef CONFIG_NET_6LOWPAN
# include <nuttx/net/sixlowpan.h> # include <nuttx/net/sixlowpan.h>
# include <nuttx/wireless/wireless.h>
#endif #endif
#ifdef CONFIG_NET_IGMP #ifdef CONFIG_NET_IGMP
@@ -757,7 +756,9 @@ static int netdev_ifr_ioctl(FAR struct socket *psock, int cmd,
} }
break; 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) #if defined(CONFIG_NET_ETHERNET) || defined(CONFIG_NET_6LOWPAN)
case SIOCGIFHWADDR: /* Get hardware address */ 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; 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); ret = netdev_wifr_ioctl(psock, cmd, wifrreq);
} }
#endif #endif