From patchwork Mon May 2 22:42:27 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Guinot X-Patchwork-Id: 93725 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 3E29AB6F7B for ; Tue, 3 May 2011 08:43:29 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A338528188; Tue, 3 May 2011 00:42:59 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id GvRepTBJ8umJ; Tue, 3 May 2011 00:42:59 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id DB813281AD; Tue, 3 May 2011 00:42:38 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 6123528187 for ; Tue, 3 May 2011 00:42:34 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id gS+m8v1p+QPV for ; Tue, 3 May 2011 00:42:32 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from ns39351.ovh.net (ns39351.ovh.net [91.121.21.191]) by theia.denx.de (Postfix) with ESMTP id 7776328183 for ; Tue, 3 May 2011 00:42:32 +0200 (CEST) Received: from localhost (87-98-128-90.ovh.net [87.98.128.90]) by ns39351.ovh.net (Postfix) with ESMTPSA id 2380724DCF; Tue, 3 May 2011 00:42:32 +0200 (CEST) From: Simon Guinot To: Prafulla Wadaskar , Albert ARIBAUD , Wolfgang Denk , Mike Frysinger Date: Tue, 3 May 2011 00:42:27 +0200 Message-Id: <1304376148-6332-5-git-send-email-simon.guinot@sequanux.org> X-Mailer: git-send-email 1.6.3.1 In-Reply-To: References: Cc: u-boot@lists.denx.de, Simon Guinot Subject: [U-Boot] [PATCH v5 4/5] netconsole: remove `serverip' check X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.9 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de From: Simon Guinot Netconsole use the environment variable `ncip' to configure the destination IP. `serverip' don't need to be defined. Signed-off-by: Simon Guinot --- Changes for v2: - restore NetOurIP check Changes for v3: - add a "/* Fall through */" comment before the NETCONS case label Changes for v4,5: none net/net.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/net/net.c b/net/net.c index e50bdf1..19ac019 100644 --- a/net/net.c +++ b/net/net.c @@ -1718,7 +1718,6 @@ static int net_check_prereq (proto_t protocol) #if defined(CONFIG_CMD_NFS) case NFS: #endif - case NETCONS: case TFTP: if (NetServerIP == 0) { puts ("*** ERROR: `serverip' not set\n"); @@ -1728,7 +1727,9 @@ static int net_check_prereq (proto_t protocol) defined(CONFIG_CMD_DNS) common: #endif + /* Fall through */ + case NETCONS: if (NetOurIP == 0) { puts ("*** ERROR: `ipaddr' not set\n"); return (1);