Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753473Ab3F0OSu (ORCPT ); Thu, 27 Jun 2013 10:18:50 -0400 Received: from mail-la0-f54.google.com ([209.85.215.54]:61961 "EHLO mail-la0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751569Ab3F0OSs (ORCPT ); Thu, 27 Jun 2013 10:18:48 -0400 Message-ID: <51CC49C7.9010800@cogentembedded.com> Date: Thu, 27 Jun 2013 18:18:47 +0400 From: Sergei Shtylyov User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:17.0) Gecko/20130620 Thunderbird/17.0.7 MIME-Version: 1.0 To: Cong Wang CC: netdev@vger.kernel.org, Daniel Borkmann , "David S. Miller" , Neil Horman , Jiri Pirko , Eric Dumazet , linux-kernel@vger.kernel.org Subject: Re: [RFC Patch net-next 2/5] net: introduce generic inet_pton() References: <1372315398-19683-1-git-send-email-amwang@redhat.com> <1372315398-19683-3-git-send-email-amwang@redhat.com> In-Reply-To: <1372315398-19683-3-git-send-email-amwang@redhat.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1473 Lines: 60 Hello. On 27-06-2013 10:43, Cong Wang wrote: > Signed-off-by: Cong Wang > --- > include/net/inet_addr.h | 20 ++++++++++++++++++++ > net/core/netpoll.c | 24 ++---------------------- > 2 files changed, 22 insertions(+), 22 deletions(-) > diff --git a/include/net/inet_addr.h b/include/net/inet_addr.h > index 66a16fe..1379287 100644 > --- a/include/net/inet_addr.h > +++ b/include/net/inet_addr.h > @@ -4,6 +4,7 @@ > #include > #include > #include > +#include > #include > > union inet_addr { > @@ -59,4 +60,23 @@ static inline bool inet_addr_multicast(const union inet_addr *ipa) > } > #endif > > +static inline int inet_pton(const char *str, union inet_addr *addr) > +{ > + const char *end; > + > + if (!strchr(str, ':') && > + in4_pton(str, -1, (void *)addr, -1, &end) > 0) { > + if (!*end) > + return 0; > + } > + if (in6_pton(str, -1, addr->sin6.sin6_addr.s6_addr, -1, &end) > 0) { > +#if IS_ENABLED(CONFIG_IPV6) > + if (!*end) How about: if (IS_ENABLED(CONFIG_IPV6) && !*end) > + return 1; > +#else > + return -1; > +#endif > + } > + return -1; > +} > #endif WBR, Sergei -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/