From patchwork Tue Apr 10 04:21:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Schiller X-Patchwork-Id: 896478 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=dev.tdt.de Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40KvCM5RjHz9s0n for ; Tue, 10 Apr 2018 14:22:17 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:Message-Id: Date:To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=k7myOm1q92l5PE6k7Ntu2oQA6ScdpwaJwvlvRMWdENA=; b=ujIH+wbYqa4wJD eqPbdVUikyG86ifF/8j1JhurNp0deULu3HQw5IEaSHFnvBfnrvxouz7ilrYx9dkbnMdFrST461NdU 8/Y2bKrpGAMMO+oL8SrCancUcRbuG5mwYs1fgdg6I5NtGMlaLysguaMZPPZcwbgxZKksVjVO8lz7O cyTq7qD3MNhvKzV53Lc+hHRvpMc//o5YJe58bAgasW7H5Rc89aQrCL0usUUga8hq7lnSl52YG5KU7 Ds71MQgANdPdwJT6OAMjsI03dwi5JAoz83/np8c6sD6tnvVJ6nrp4B+hqfa2kGrf64TMrCxASkng2 Id2Ehp7CW4UwCc835G7A==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1f5knG-00020T-7l; Tue, 10 Apr 2018 04:22:06 +0000 Received: from ms.tdt.de ([195.243.126.94] helo=mail.dev.tdt.de) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1f5knC-0001zQ-EQ for lede-dev@lists.infradead.org; Tue, 10 Apr 2018 04:22:04 +0000 Received: from localhost.localdomain (unknown [10.2.3.20]) by mail.dev.tdt.de (Postfix) with ESMTPSA id 5A1482082D; Tue, 10 Apr 2018 04:21:47 +0000 (UTC) From: Martin Schiller To: lede-dev@lists.infradead.org Date: Tue, 10 Apr 2018 06:21:39 +0200 Message-Id: <20180410042139.24984-1-ms@dev.tdt.de> X-Mailer: git-send-email 2.11.0 X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail.dev.tdt.de X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180409_212202_640687_153EE315 X-CRM114-Status: GOOD ( 10.42 ) X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- Subject: [LEDE-DEV] [PATCH netifd] interface: fix "ifup-failed" hotplug event handling X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Martin Schiller , nbd@nbd.name MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org The ifup-failed event should only be triggered when the former interface state is IFS_SETUP. Otherwise, there will also be an ifup-failed event in the IFS_TEARDOWN stateif you do an manual ifdown . Signed-off-by: Martin Schiller --- interface.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/interface.c b/interface.c index 900a523..2a23984 100644 --- a/interface.c +++ b/interface.c @@ -267,10 +267,16 @@ mark_interface_down(struct interface *iface) iface->link_up_event = false; iface->state = IFS_DOWN; - if (state == IFS_UP) + switch (state) { + case IFS_UP: interface_event(iface, IFEV_DOWN); - else + break; + case IFS_SETUP: interface_event(iface, IFEV_UP_FAILED); + break; + default: + break; + } interface_ip_set_enabled(&iface->config_ip, false); interface_ip_set_enabled(&iface->proto_ip, false); interface_ip_flush(&iface->proto_ip);