Message ID | 1316435462-27241-1-git-send-email-helmut.raiger@hale.at |
---|---|
State | Accepted |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> 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 1090EB7090 for <incoming@patchwork.ozlabs.org>; Mon, 19 Sep 2011 22:31:33 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id ED50C2825C; Mon, 19 Sep 2011 14:31:30 +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 MVrq38XZYs6w; Mon, 19 Sep 2011 14:31:30 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id BED8128250; Mon, 19 Sep 2011 14:31:27 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 4290128250 for <u-boot@lists.denx.de>; Mon, 19 Sep 2011 14:31:26 +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 reEvBRZt-Awv for <u-boot@lists.denx.de>; Mon, 19 Sep 2011 14:31:25 +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 mx.inode.at (mx05.lb01.inode.at [62.99.145.5]) by theia.denx.de (Postfix) with ESMTPS id 57F1B28206 for <u-boot@lists.denx.de>; Mon, 19 Sep 2011 14:31:24 +0200 (CEST) Received: from [83.64.51.210] (port=7411 helo=gateway1.hale) by smartmx-05.inode.at with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from <helmut.raiger@hale.at>) id 1R5d0M-0003tx-HT; Mon, 19 Sep 2011 14:31:22 +0200 Received: from mail1.hale.at (mail2.hale [192.168.100.12]) by gateway1.hale (8.13.8/8.13.7) with ESMTP id p8JCVEuN005466; Mon, 19 Sep 2011 14:31:14 +0200 Received: from uni24.HALE ([192.168.100.40]) by hale.at with MailEnable ESMTP; Mon, 19 Sep 2011 14:31:08 +0200 From: Helmut Raiger <helmut.raiger@hale.at> To: u-boot@lists.denx.de Date: Mon, 19 Sep 2011 14:31:02 +0200 Message-Id: <1316435462-27241-1-git-send-email-helmut.raiger@hale.at> X-Mailer: git-send-email 1.7.4.4 In-Reply-To: <4E772A3F.705@hale.at> References: <4E772A3F.705@hale.at> MIME-Version: 1.0 X-HALE-MailScanner-Information: Please contact the ISP for more information X-MailScanner-ID: p8JCVEuN005466 X-HALE-MailScanner: Found to be clean X-HALE-MailScanner-From: helmut.raiger@hale.at MailScanner-NULL-Check: 1317040277.6589@EKbxSPerPykRQRUZAP2UzA Subject: [U-Boot] [PATCH] net: fix a regression in bootp.c X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.9 Precedence: list List-Id: U-Boot discussion <u-boot.lists.denx.de> List-Unsubscribe: <http://lists.denx.de/mailman/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <http://lists.denx.de/pipermail/u-boot> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <http://lists.denx.de/mailman/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de |
diff --git a/net/bootp.c b/net/bootp.c index 3db08ea..3157548 100644 --- a/net/bootp.c +++ b/net/bootp.c @@ -164,8 +164,9 @@ static void auto_load(void) return; } #endif - TftpStart(); } + + TftpStart(); } #if !defined(CONFIG_CMD_DHCP)
This fixes a bug introduced by 093498669e77597635a24f326f11efeab213d394. TftpStart() was not called unless the 'autoload' environment variable was set. Signed-off-by: Helmut Raiger <helmut.raiger@hale.at> --- net/bootp.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)