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

This commit is contained in:
Gregory Nutt 2017-04-21 18:49:38 -06:00
commit 1ba7aa9935

View file

@ -1276,7 +1276,7 @@ int psock_ioctl(FAR struct socket *psock, int cmd, unsigned long arg)
{
FAR struct iwreq *wifrreq;
wifrreq = (FAR FAR struct iwreq *)((uintptr_t)arg);
wifrreq = (FAR struct iwreq *)((uintptr_t)arg);
ret = netdev_wifr_ioctl(psock, cmd, wifrreq);
}
#endif