From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2E1CBC43381 for ; Mon, 18 Mar 2019 09:30:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D9BAC2087C for ; Mon, 18 Mar 2019 09:30:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1552901404; bh=sjkXSgbQFsyfupN9F71/DJIbGH3SshpZUaAJ7q1I528=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=l6W9RiUoetBr2jvjPlnUMYYWkOMV32BCHyYwpeC1W+5zbdoKdZ2NNDRh6OittLVZx 0pOF8ayVkesstoHFVKN1I44haoXlITrxXNyb2FzEMN+HLW9eD6HQkNC7+LSXukCFua p7dEcVqT3FvfRumolwoIsPOSMgmRM28Ez5qi1n0I= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728308AbfCRJaC (ORCPT ); Mon, 18 Mar 2019 05:30:02 -0400 Received: from mail.kernel.org ([198.145.29.99]:36754 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728300AbfCRJ35 (ORCPT ); Mon, 18 Mar 2019 05:29:57 -0400 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B3689214AF; Mon, 18 Mar 2019 09:29:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1552901397; bh=sjkXSgbQFsyfupN9F71/DJIbGH3SshpZUaAJ7q1I528=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1KHIBi70a8TeCtx1cF/widIyP9Ln1Qww0b0DGbzj3mr8uYgzPoQO4tO/KRhUuZYDZ tByePsRoG12CfvbXp3qvtN4UCLPuD3o735Jwh1XsFU3v4DBzoGZAmF5xmQJMKak0gh Xl/bx/n+gMzyAs7qK7FWLhSqdg8pPmZOW474KXzI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, George Wilkie , Jiri Pirko , "David S. Miller" Subject: [PATCH 4.20 32/52] team: use operstate consistently for linkup Date: Mon, 18 Mar 2019 10:25:19 +0100 Message-Id: <20190318083847.179493866@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190318083843.398913295@linuxfoundation.org> References: <20190318083843.398913295@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.20-stable review patch. If anyone has any objections, please let me know. ------------------ From: George Wilkie [ Upstream commit 8c7a77267eec81dd81af8412f29e50c0b1082548 ] When a port is added to a team, its initial state is derived from netif_carrier_ok rather than netif_oper_up. If it is carrier up but operationally down at the time of being added, the port state.linkup will be set prematurely. port state.linkup should be set consistently using netif_oper_up rather than netif_carrier_ok. Fixes: f1d22a1e0595 ("team: account for oper state") Signed-off-by: George Wilkie Acked-by: Jiri Pirko Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/team/team.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/net/team/team.c +++ b/drivers/net/team/team.c @@ -1256,7 +1256,7 @@ static int team_port_add(struct team *te list_add_tail_rcu(&port->list, &team->port_list); team_port_enable(team, port); __team_compute_features(team); - __team_port_change_port_added(port, !!netif_carrier_ok(port_dev)); + __team_port_change_port_added(port, !!netif_oper_up(port_dev)); __team_options_change_check(team); netdev_info(dev, "Port device %s added\n", portname); @@ -2915,7 +2915,7 @@ static int team_device_event(struct noti switch (event) { case NETDEV_UP: - if (netif_carrier_ok(dev)) + if (netif_oper_up(dev)) team_port_change_check(port, true); break; case NETDEV_DOWN: