From patchwork Tue Sep 1 15:02:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 1355147 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=glider.be Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4Bgr0W2HfMz9sTM for ; Wed, 2 Sep 2020 01:02:51 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728303AbgIAPCq (ORCPT ); Tue, 1 Sep 2020 11:02:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49920 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726122AbgIAPCn (ORCPT ); Tue, 1 Sep 2020 11:02:43 -0400 Received: from baptiste.telenet-ops.be (baptiste.telenet-ops.be [IPv6:2a02:1800:120:4::f00:13]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E24BAC061244 for ; Tue, 1 Sep 2020 08:02:42 -0700 (PDT) Received: from ramsan ([84.195.186.194]) by baptiste.telenet-ops.be with bizsmtp id Nf2g230054C55Sk01f2g9P; Tue, 01 Sep 2020 17:02:40 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan with esmtp (Exim 4.90_1) (envelope-from ) id 1kD7o0-000651-3o; Tue, 01 Sep 2020 17:02:40 +0200 Received: from geert by rox.of.borg with local (Exim 4.90_1) (envelope-from ) id 1kD7o0-0003zf-1W; Tue, 01 Sep 2020 17:02:40 +0200 From: Geert Uytterhoeven To: Heiner Kallweit , Florian Fainelli , Andrew Lunn , "David S . Miller" , Jakub Kicinski Cc: Gaku Inami , Yoshihiro Shimoda , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH] Revert "net: linkwatch: add check for netdevice being present to linkwatch_do_dev" Date: Tue, 1 Sep 2020 17:02:37 +0200 Message-Id: <20200901150237.15302-1-geert+renesas@glider.be> X-Mailer: git-send-email 2.17.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This reverts commit 124eee3f6955f7aa19b9e6ff5c9b6d37cb3d1e2c. Inami-san reported that this commit breaks bridge support in a Xen environment, and that reverting it fixes this. During system resume, bridge ports are no longer enabled, as that relies on the receipt of the NETDEV_CHANGE notification. This notification is not sent, as netdev_state_change() is no longer called. Note that the condition this commit intended to fix never existed upstream, as the patch triggering it and referenced in the commit was never applied upstream. Hence I can confirm s2ram on r8a73a4/ape6evm and sh73a0/kzm9g works fine before/after this revert. Reported-by Gaku Inami Signed-off-by: Geert Uytterhoeven --- net/core/link_watch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/core/link_watch.c b/net/core/link_watch.c index 75431ca9300fb9c4..c24574493ecf95e6 100644 --- a/net/core/link_watch.c +++ b/net/core/link_watch.c @@ -158,7 +158,7 @@ static void linkwatch_do_dev(struct net_device *dev) clear_bit(__LINK_STATE_LINKWATCH_PENDING, &dev->state); rfc2863_policy(dev); - if (dev->flags & IFF_UP && netif_device_present(dev)) { + if (dev->flags & IFF_UP) { if (netif_carrier_ok(dev)) dev_activate(dev); else