Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754404Ab3F0WaO (ORCPT ); Thu, 27 Jun 2013 18:30:14 -0400 Received: from mail-la0-f46.google.com ([209.85.215.46]:33940 "EHLO mail-la0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754103Ab3F0WaM (ORCPT ); Thu, 27 Jun 2013 18:30:12 -0400 Message-ID: <51CCBCF2.5050007@cogentembedded.com> Date: Fri, 28 Jun 2013 02:30:10 +0400 From: Sergei Shtylyov Organization: Cogent Embedded User-Agent: Mozilla/5.0 (X11; Linux i686; 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> <51CC49C7.9010800@cogentembedded.com> In-Reply-To: <51CC49C7.9010800@cogentembedded.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: 1508 Lines: 55 On 06/27/2013 06:18 PM, Sergei Shtylyov 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 [...] >> @@ -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 Sorry, managed to miss #else... #if could be avoided anyway, tho this could require an extra patch. >> + 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/