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

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

Browse Source
This commit is contained in:
Gregory Nutt 2017-05-19 15:51:02 -06:00
commit c5816b719f
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
net/netdev/netdev_ioctl.c
View File

@ -506,9 +506,7 @@ static int netdev_ifr_ioctl(FAR struct socket *psock, int cmd,
dev = netdev_ifr_dev(req);
if (dev)
{
netdev_ifdown(dev);
ioctl_set_ipv4addr(&dev->d_ipaddr, &req->ifr_addr);
netdev_ifup(dev);
ret = OK;
}
}
@ -599,9 +597,7 @@ static int netdev_ifr_ioctl(FAR struct socket *psock, int cmd,
{
FAR struct lifreq *lreq = (FAR struct lifreq *)req;
netdev_ifdown(dev);
ioctl_set_ipv6addr(dev->d_ipv6addr, &lreq->lifr_addr);
netdev_ifup(dev);
ret = OK;
}
}
@ -830,7 +826,6 @@ static int netdev_ifr_ioctl(FAR struct socket *psock, int cmd,
dev = netdev_ifr_dev(req);
if (dev)
{
netdev_ifdown(dev);
#ifdef CONFIG_NET_IPv4
dev->d_ipaddr = 0;
#endif