From patchwork Thu Nov 14 19:57:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1195181 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="MUAlfF8x"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 47DXfb3DwPz9sQw for ; Fri, 15 Nov 2019 07:10:47 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 0E46DC21DD3; Thu, 14 Nov 2019 20:03:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 3FE2EC21E47; Thu, 14 Nov 2019 19:58:38 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 9794DC21DED; Thu, 14 Nov 2019 19:58:35 +0000 (UTC) Received: from mail-io1-f67.google.com (mail-io1-f67.google.com [209.85.166.67]) by lists.denx.de (Postfix) with ESMTPS id CB8E1C21E12 for ; Thu, 14 Nov 2019 19:58:23 +0000 (UTC) Received: by mail-io1-f67.google.com with SMTP id i11so8173766iol.13 for ; Thu, 14 Nov 2019 11:58:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4dh+z5aTervYeGZkwBpFkSZHvYQ0/eH3vtHkjdNO5Ig=; b=MUAlfF8xbuhtfkeVG+AzYYqs79pnUfhxu6ItSlY/ktF8f1O4OQgQZonhEZI8Jz/QYm vKHSGvVTT9nxfJX6fCQ/R2yp8W8z033G33FLtrQYQ3Qn65G7I6z5gajsDjmgHULo7q/w 6ho1owtD6biWoywpJPO1DbNvdada1ZXcWS3qw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4dh+z5aTervYeGZkwBpFkSZHvYQ0/eH3vtHkjdNO5Ig=; b=D8FFnd+L3tZSYnIMGRv67K02kO0YgrNPfNjxKsk1T65u3ot+5oXrZq0eYnGEAEgP5q X5C3ysoWbS+OTahcgo8nAdcAaYN8qMHIAtyr7BRVtqMxAlfm87HFfxeKhhMrZb0LnrAJ gr+iNBpQk9yCZkYgE+zej82+ven/pjHLPbjT+u/zqr7LtOYNLbqetn6otjbkrq00Ls5C 5oNi/zYMgLIMCIMBNcTlfxZUyKafjT4N+N7j7bUeHB+Xt1RPNW/1jqxZ1QtWfzTtSdql Jub1uRS31PCw3T8QSv5eVk0HBtvI8zruZ0XFfNFVHT3oT04mulJaVbXkVHf5tt9LgGlX HXVA== X-Gm-Message-State: APjAAAXWThF+KlJUkU3oojFys4/EkbmiyHS/qnZOzcfWy4Cdi/ujepM6 NM0bJwKcErSbORmDUGAJBh/LuezVdjs= X-Google-Smtp-Source: APXvYqzdNYVkbL81ZxiPKQbQbHAr3kDTf+QJjwrOr4fkdXVpXv29Eqc1mVvWKgDgWL9wHxGOEzBbcA== X-Received: by 2002:a6b:dd16:: with SMTP id f22mr9869757ioc.272.1573761502483; Thu, 14 Nov 2019 11:58:22 -0800 (PST) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id c83sm652546iof.48.2019.11.14.11.58.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Nov 2019 11:58:22 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Date: Thu, 14 Nov 2019 12:57:21 -0700 Message-Id: <20191114125724.v4.13.I6da24bfbaae4b2e00bb4f86b6ed687e364f02c3d@changeid> X-Mailer: git-send-email 2.24.0.rc1.363.gb1bccd3e3d-goog In-Reply-To: <20191114195751.30357-1-sjg@chromium.org> References: <20191114195751.30357-1-sjg@chromium.org> MIME-Version: 1.0 Cc: Tom Rini Subject: [U-Boot] [PATCH v4 13/42] common: Move env_get_ip() to net.h X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" This function relates to networking, so move it out of the common.h header file. Signed-off-by: Simon Glass Reviewed-by: Tom Rini Acked-by: Joe Hershberger --- Changes in v4: None Changes in v3: None Changes in v2: None include/common.h | 4 ---- include/net.h | 21 ++++++++++++++++++++- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/include/common.h b/include/common.h index f993e4bef3..4fda40cc1d 100644 --- a/include/common.h +++ b/include/common.h @@ -319,10 +319,6 @@ int serial_printf (const char *fmt, ...) /* lib/net_utils.c */ #include -static inline struct in_addr env_get_ip(char *var) -{ - return string_to_ip(env_get(var)); -} #include diff --git a/include/net.h b/include/net.h index d8d187d8af..11eca1bc6c 100644 --- a/include/net.h +++ b/include/net.h @@ -829,7 +829,13 @@ static inline void net_random_ethaddr(uchar *addr) /* Convert an IP address to a string */ void ip_to_string(struct in_addr x, char *s); -/* Convert a string to ip address */ +/** + * string_to_ip() - Convert a string to ip address + * + * @s: String to conver, in the format format a.b.c.d, where each value is a + * decimal number from 0 to 255 + * @return IP address, or 0 if invalid + */ struct in_addr string_to_ip(const char *s); /* Convert a VLAN id to a string */ @@ -887,4 +893,17 @@ int update_tftp(ulong addr, char *interface, char *devstring); */ void eth_parse_enetaddr(const char *addr, uint8_t *enetaddr); +/** + * env_get_ip() - Convert an environment value to to an ip address + * + * @var: Environment variable to convert. The value of this variable must be + * in the format format a.b.c.d, where each value is a decimal number from + * 0 to 255 + * @return IP address, or 0 if invalid + */ +static inline struct in_addr env_get_ip(char *var) +{ + return string_to_ip(env_get(var)); +} + #endif /* __NET_H__ */