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

Networking: Fix some errors that crept in with IPv6

Browse Source
This commit is contained in:
Gregory Nutt 2015-02-06 13:34:19 -06:00
parent f1a524e9ee
commit 1928feafca
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
net/netdev/netdev_ioctl.c
View File

@ -846,28 +846,28 @@ static int netdev_rtioctl(FAR struct socket *psock, int cmd,
{ {
/* The target address and the netmask are required values */ /* The target address and the netmask are required values */
if (!retentry || !rtentry->rt_target || !rtentry->rt_netmask) if (!rtentry || !rtentry->rt_target || !rtentry->rt_netmask)
{ {
return -EINVAL; return -EINVAL;
} }
#ifdef CONFIG_NET_IPv4 #ifdef CONFIG_NET_IPv4
if (rtentry->rt_target.ss_family == AF_INET)
#ifdef CONFIG_NET_IPv6 #ifdef CONFIG_NET_IPv6
if (rtentry->rt_target->ss_family == AF_INET)
#endif #endif
{ {
ret = ioctl_addipv4route(rtentry); ret = ioctl_addipv4route(rtentry);
} }
#endif /* CONFIG_NET_IPv4 */ #endif /* CONFIG_NET_IPv4 */
#ifdef CONFIG_NET_IPv4
#ifdef CONFIG_NET_IPv6 #ifdef CONFIG_NET_IPv6
#ifdef CONFIG_NET_IPv4
else else
#endif #endif
{ {
ret = ioctl_addipv6route(rtentry); ret = ioctl_addipv6route(rtentry);
} }
#endif /* CONFIG_NET_IPv4 */ #endif /* CONFIG_NET_IPv6 */
} }
break; break;
@ -875,28 +875,28 @@ static int netdev_rtioctl(FAR struct socket *psock, int cmd,
{ {
/* The target address and the netmask are required values */ /* The target address and the netmask are required values */
if (!retentry || !rtentry->rt_target || !rtentry->rt_netmask) if (!rtentry || !rtentry->rt_target || !rtentry->rt_netmask)
{ {
return -EINVAL; return -EINVAL;
} }
#ifdef CONFIG_NET_IPv4 #ifdef CONFIG_NET_IPv4
if (rtentry->rt_target.ss_family == AF_INET)
#ifdef CONFIG_NET_IPv6 #ifdef CONFIG_NET_IPv6
if (rtentry->rt_target->ss_family == AF_INET)
#endif #endif
{ {
ret = ioctl_delipv4route(rtentry); ret = ioctl_delipv4route(rtentry);
} }
#endif /* CONFIG_NET_IPv4 */ #endif /* CONFIG_NET_IPv4 */
#ifdef CONFIG_NET_IPv4
#ifdef CONFIG_NET_IPv6 #ifdef CONFIG_NET_IPv6
#ifdef CONFIG_NET_IPv4
else else
#endif #endif
{ {
ret = ioctl_delipv6route(rtentry); ret = ioctl_delipv6route(rtentry);
} }
#endif /* CONFIG_NET_IPv4 */ #endif /* CONFIG_NET_IPv6 */
} }
break; break;