Skip to content
Snippets Groups Projects
Commit c5816b71 authored by Gregory Nutt's avatar Gregory Nutt
Browse files

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

parents bc32eaa2 c9dc1d92
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment