From 1928feafcab6d0502c663ca5843cdb7489048fbf Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Fri, 6 Feb 2015 13:34:19 -0600 Subject: [PATCH] Networking: Fix some errors that crept in with IPv6 --- net/netdev/netdev_ioctl.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/net/netdev/netdev_ioctl.c b/net/netdev/netdev_ioctl.c index 5eae3b8164..c06c618d0d 100644 --- a/net/netdev/netdev_ioctl.c +++ b/net/netdev/netdev_ioctl.c @@ -846,28 +846,28 @@ static int netdev_rtioctl(FAR struct socket *psock, int cmd, { /* 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; } #ifdef CONFIG_NET_IPv4 - if (rtentry->rt_target.ss_family == AF_INET) #ifdef CONFIG_NET_IPv6 + if (rtentry->rt_target->ss_family == AF_INET) #endif { ret = ioctl_addipv4route(rtentry); } #endif /* CONFIG_NET_IPv4 */ -#ifdef CONFIG_NET_IPv4 #ifdef CONFIG_NET_IPv6 +#ifdef CONFIG_NET_IPv4 else #endif { ret = ioctl_addipv6route(rtentry); } -#endif /* CONFIG_NET_IPv4 */ +#endif /* CONFIG_NET_IPv6 */ } break; @@ -875,28 +875,28 @@ static int netdev_rtioctl(FAR struct socket *psock, int cmd, { /* 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; } #ifdef CONFIG_NET_IPv4 - if (rtentry->rt_target.ss_family == AF_INET) #ifdef CONFIG_NET_IPv6 + if (rtentry->rt_target->ss_family == AF_INET) #endif { ret = ioctl_delipv4route(rtentry); } #endif /* CONFIG_NET_IPv4 */ -#ifdef CONFIG_NET_IPv4 #ifdef CONFIG_NET_IPv6 +#ifdef CONFIG_NET_IPv4 else #endif { ret = ioctl_delipv6route(rtentry); } -#endif /* CONFIG_NET_IPv4 */ +#endif /* CONFIG_NET_IPv6 */ } break;