sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix some errors in the previous commit

Browse Source
This commit is contained in:
Gregory Nutt 2017-03-13 10:14:38 -06:00
parent b808084e57
commit 888cff30dc
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/nuttx/wireless/wireless.h
View File

@ -185,6 +185,12 @@
#define NRF24L01_FIRST (CC3000_FIRST + CC3000_NCMDS)
#define NRF24L01_NCMDS 14
/* Other Definitions ****************************************************************/
/* Maximum size of the ESSID and NICKN strings */
#define IW_ESSID_MAX_SIZE 32
/************************************************************************************
* Public Types
************************************************************************************/

12
net/netdev/netdev_ioctl.c
View File

@ -64,7 +64,7 @@
# include <nuttx/net/igmp.h>
#endif
#ifdef CONFIG_NETDEV_NETDEV_WIRELESS_IOCTL
#ifdef CONFIG_NETDEV_WIRELESS_IOCTL
# include <nuttx/wireless/wireless.h>
#endif
@ -329,7 +329,7 @@ static void ioctl_setipv6addr(FAR net_ipv6addr_t outaddr,
*
****************************************************************************/
#if defined(CONFIG_NETDEV_IOCTL) && defined(CONFIG_NETDEV_NETDEV_WIRELESS_IOCTL)
#if defined(CONFIG_NETDEV_IOCTL) && defined(CONFIG_NETDEV_WIRELESS_IOCTL)
static FAR struct net_driver_s *netdev_wifrdev(FAR struct iwreq *req)
{
if (req != NULL)
@ -363,7 +363,7 @@ static FAR struct net_driver_s *netdev_wifrdev(FAR struct iwreq *req)
*
****************************************************************************/
#if defined(CONFIG_NETDEV_IOCTL) && defined(CONFIG_NETDEV_NETDEV_WIRELESS_IOCTL)
#if defined(CONFIG_NETDEV_IOCTL) && defined(CONFIG_NETDEV_WIRELESS_IOCTL)
static int netdev_wifrioctl(FAR struct socket *psock, int cmd,
FAR struct iwreq *req)
{
@ -376,10 +376,10 @@ static int netdev_wifrioctl(FAR struct socket *psock, int cmd,
{
/* Get the wireless device associated with the IOCTL command */
dev = netdev_ifrdev(req);
dev = netdev_wifrdev(req);
if (dev)
{
/* For now, just forward the IOCTL to the wireless driver */
/* Just forward the IOCTL to the wireless driver */
ret = dev->d_ioctl(dev, cmd, ((long)(uintptr_t)req));
}
@ -1160,7 +1160,7 @@ int psock_ioctl(FAR struct socket *psock, int cmd, unsigned long arg)
ret = netdev_ifrioctl(psock, cmd, (FAR struct ifreq *)((uintptr_t)arg));
#if defined(CONFIG_NETDEV_IOCTL) && defined(CONFIG_NETDEV_NETDEV_WIRELESS_IOCTL)
#if defined(CONFIG_NETDEV_IOCTL) && defined(CONFIG_NETDEV_WIRELESS_IOCTL)
/* Check a wireless network command */
if (ret == -ENOTTY)