From patchwork Tue Dec 20 08:58:04 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerlando Falauto X-Patchwork-Id: 132377 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 7D008B7038 for ; Tue, 20 Dec 2011 20:11:58 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752459Ab1LTJLa (ORCPT ); Tue, 20 Dec 2011 04:11:30 -0500 Received: from mail.de.keymile.com ([195.8.104.1]:52336 "HELO mail.de.keymile.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1751510Ab1LTJL2 (ORCPT ); Tue, 20 Dec 2011 04:11:28 -0500 X-Greylist: delayed 667 seconds by postgrey-1.27 at vger.kernel.org; Tue, 20 Dec 2011 04:11:27 EST Received: from mailrelay.de.keymile.net ([10.9.1.54]) by eSafe SMTP Relay 1321520839; Tue, 20 Dec 2011 09:59:23 +0100 Received: from chber1-10555x.ch.keymile.net (chber1-10555x.ch.keymile.net [172.31.31.112]) by mailrelay.de.keymile.net (8.12.2/8.12.2) with ESMTP id pBK8wsjO002966; Tue, 20 Dec 2011 09:58:54 +0100 (MET) From: Gerlando Falauto Cc: Gerlando Falauto , Micha Nelissen , Holger Brunck , "David S. Miller" (maintainer:NETWORKING [IPv4/...), Alexey Kuznetsov (maintainer:NETWORKING [IPv4/...), "Pekka Savola (ipv6)" (maintainer:NETWORKING [IPv4/...), James Morris (maintainer:NETWORKING [IPv4/...), Hideaki YOSHIFUJI (maintainer:NETWORKING [IPv4/...), Patrick McHardy (maintainer:NETWORKING [IPv4/...), netdev@vger.kernel.org (open list:NETWORKING [IPv4/...), linux-kernel@vger.kernel.org (open list) Subject: [PATCH] net: have ipconfig not wait if no dev is available Date: Tue, 20 Dec 2011 09:58:04 +0100 Message-Id: <1324371484-24082-1-git-send-email-gerlando.falauto@keymile.com> X-Mailer: git-send-email 1.7.1 X-ESAFE-STATUS: [srvhellgate.de.keymile.net] Mail clean To: unlisted-recipients:; (no To-header on input) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org previous commit 3fb72f1e6e6165c5f495e8dc11c5bbd14c73385c makes IP-Config wait for carrier on at least one network device. Before waiting (predefined value 120s), check that at least one device was successfully brought up. Otherwise (e.g. buggy bootloader which does not set the MAC address) there is no point in waiting for carrier. Cc: Micha Nelissen Cc: Holger Brunck Signed-off-by: Gerlando Falauto --- net/ipv4/ipconfig.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c index ab7e554..7fbcaba 100644 --- a/net/ipv4/ipconfig.c +++ b/net/ipv4/ipconfig.c @@ -252,6 +252,10 @@ static int __init ic_open_devs(void) } } + /* no point in waiting if we could not bring up at least one device */ + if (!ic_first_dev) + goto have_carrier; + /* wait for a carrier on at least one device */ start = jiffies; while (jiffies - start < msecs_to_jiffies(CONF_CARRIER_TIMEOUT)) {