Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp2081034imu; Wed, 28 Nov 2018 22:02:33 -0800 (PST) X-Google-Smtp-Source: AFSGD/UlDkf4t/ScJu4PT9h9TlO6HLlT5J25jKq+Mmm/eQRLloUhQWL28669f+Ga7e3OcEtVzqPt X-Received: by 2002:a63:bd1a:: with SMTP id a26mr156599pgf.121.1543471353319; Wed, 28 Nov 2018 22:02:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543471353; cv=none; d=google.com; s=arc-20160816; b=dGRl3rcvPA5SXTKoxt9daAAFvSwS/w5p2R2hO7x9+C5KlKlapYGOjVE3cvTuFpJRzT mDJYC1WLRkwsA1UmnccqimIDaKjH0SeArwaKtTFTMOsB7dB57yys7ldx9csNVeXaAYvS HQ7w0D9R11ssBQU31dpjYaT9o6RPZDKemOipRp11UhS4buOfa4lHS7zDZeJapaH41LG1 pwkN8H1M60DqGN94Oq/c7mfNWzcSvEs3VAQg0PcK7X6FG9Ca04nq5u0dUVJea6ozqbNu S19eScEM+4JMldFwPESlgKbGtgkVMfFLNIsDuYpoSSVdYXLMGCCOqOvwYtbsRoGRbdyr Z7Ow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=PX2Fpk8f5XEarfbVYQ/dcv6M2v04J/p1ceGvXHz3UJo=; b=U1NJBDzubag8xmRuLcX0u2zKJiDGFE0ILQ1j2oK5Ykb7SUuPSiNl5orxKDB3EB3N9W sRAaz4ltuPsY9KiIx6a3ViKoWCH9fTYhpFlF3h+Yvsc+6GSJhaVPbBGV1F3fEK85m4m2 Ecix7/piJclH2YV8sD6Nf25FEvoVyH2Qkw0axlcEjUZBt+Qq1DPVgf6n4y7NclKW7CPd lX8QZyNZ+1X0+43kVn6JCJuNHYtnDPdIjHdoE+zZxWxsD6QfwYNbFQwgLyar0/4dfXfx q0at6dZviUCzaQ6aIlCgi1ZSfg2VlUVg4CXh0DfCvpAe5G2LaAmt4OU3Vl8ZZx40g5Ia 0bAA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=AgLxkNlp; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d66si1228145pfg.36.2018.11.28.22.02.18; Wed, 28 Nov 2018 22:02:33 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=AgLxkNlp; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729290AbeK2RFI (ORCPT + 99 others); Thu, 29 Nov 2018 12:05:08 -0500 Received: from mail.kernel.org ([198.145.29.99]:40080 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727643AbeK2RFH (ORCPT ); Thu, 29 Nov 2018 12:05:07 -0500 Received: from sasha-vm.mshome.net (unknown [37.142.5.207]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B6D742133F; Thu, 29 Nov 2018 06:00:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1543471256; bh=9jzQTRPDL56lVu935vFr8IFeqEgntt8cinuJX3KoWto=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AgLxkNlpzslJ6Z5h0JJKXihy50ocZzLqZkBL2HNeOORpu63V4Ls0nsg1S9aZQqfZx 7dpW5gyscT7U7hQNocWanqE6INp0vKCYT8uvXGlQyZrgOnDHnl8C32Z/hmcibZcqhL xCJu385DJQvELeA52r6pLb3vf1WVQ1uJRecK6e8A= From: Sasha Levin To: stable@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Hangbin Liu , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 65/68] team: no need to do team_notify_peers or team_mcast_rejoin when disabling port Date: Thu, 29 Nov 2018 00:55:56 -0500 Message-Id: <20181129055559.159228-65-sashal@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181129055559.159228-1-sashal@kernel.org> References: <20181129055559.159228-1-sashal@kernel.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Hangbin Liu [ Upstream commit 5ed9dc99107144f83b6c1bb52a69b58875baf540 ] team_notify_peers() will send ARP and NA to notify peers. team_mcast_rejoin() will send multicast join group message to notify peers. We should do this when enabling/changed to a new port. But it doesn't make sense to do it when a port is disabled. On the other hand, when we set mcast_rejoin_count to 2, and do a failover, team_port_disable() will increase mcast_rejoin.count_pending to 2 and then team_port_enable() will increase mcast_rejoin.count_pending to 4. We will send 4 mcast rejoin messages at latest, which will make user confused. The same with notify_peers.count. Fix it by deleting team_notify_peers() and team_mcast_rejoin() in team_port_disable(). Reported-by: Liang Li Fixes: fc423ff00df3a ("team: add peer notification") Fixes: 492b200efdd20 ("team: add support for sending multicast rejoins") Signed-off-by: Hangbin Liu Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/team/team.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c index d887016e54b6..4b6572f0188a 100644 --- a/drivers/net/team/team.c +++ b/drivers/net/team/team.c @@ -985,8 +985,6 @@ static void team_port_disable(struct team *team, team->en_port_count--; team_queue_override_port_del(team, port); team_adjust_ops(team); - team_notify_peers(team); - team_mcast_rejoin(team); team_lower_state_changed(port); } -- 2.17.1