Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp811981imu; Tue, 11 Dec 2018 07:59:01 -0800 (PST) X-Google-Smtp-Source: AFSGD/VQSIkxtG5vvopioUuvYi7gCZ7gVXwAFOSZwtFaUqmFw2+cSI2oJ2Lye7Pyl3/qdk7ATXSQ X-Received: by 2002:a17:902:9345:: with SMTP id g5mr16068575plp.148.1544543941734; Tue, 11 Dec 2018 07:59:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544543941; cv=none; d=google.com; s=arc-20160816; b=r23x/4OyaHNOn77bMOVDuDnu6H18VbZpM6DWfzod4Tcz3XXqH6ks838E0IpDu7w+Fn F4DvRfvZ9nu3KBkbJkf0ZSmnPnzWEvDnnx5b8gZ7HJiebw1AqSysOy4SbxA6OYeqgcjs mdBDYrcB3r4e1dGdCntA6QP6rkemMm3tFYA6urpIQq8d2gA0v7OEsvOCFVg2kkXtOsc9 Gl8xoI4rLimzZCgTO6GKswrMBAw3iCq3Z4vy1ovnXVZWR7eBY6NorxkHdHAcaZKR91f3 h/M/cbaceU3Bc7V1KjofMziJu05IEONIrJlCOK/3qnaj8Q74PWR3JR4FVvh2YqDWj++q FA2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=0stDHNNJIzQ8zW3HH2DtHDpZx7vdyzjBQ1JQREywYkc=; b=r9/1lwkj+6dG1WrsTs/irEfcC0XFN/uKP61xvrdKkxO/llOqW8Ve+1L14YjzzBtF8W JXnQ0jcaYeACUP384XCuhGx1QJFytZu5JbBkyCYPT+GSefFAt8FLWrHOOEFBmq/yOnK+ aCnhWeMX+pZL/SRSzmNR9dSscJ85IPtPYmQULdJf6iEOYOY/Nin4tbIEQBuyDU2cI299 2jPDorM77qzALJwGaQSyL+0My0fh5Gf28r+dMGrxUCGmI+b7MihBuekwrAC/3cEnBHzv ikEDYU8wHO4ytJr28ttEdz8FgVXQhONhhUTKKfS/6tvCKwSCM4rGRybLfV+DSethqJuI 2KgQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=vsZ5b2cH; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 133si13328315pfc.61.2018.12.11.07.58.47; Tue, 11 Dec 2018 07:59:01 -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=vsZ5b2cH; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730513AbeLKP4C (ORCPT + 99 others); Tue, 11 Dec 2018 10:56:02 -0500 Received: from mail.kernel.org ([198.145.29.99]:44790 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730498AbeLKP4B (ORCPT ); Tue, 11 Dec 2018 10:56:01 -0500 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 D4EBC2146D; Tue, 11 Dec 2018 15:55:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1544543760; bh=kY03nsUMsAbpRFscAA/k/Niz9pX/I+vJpZLQQYc8sWA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vsZ5b2cHHmOawzMdtIze0FyHerQODvVjq6GGRN1CP64MPMr/FBflEEodkAchKjEVR oMmQogd6lLFZETGS1UdnhP+TL2H2Im730ff1jWCtBnuu2hQiJY3ykVRzlslZqW46qQ Ad3srw8o4qZMQE6BU7uqkYhbmIJn3WnhLmJySFcI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Liang Li , Hangbin Liu , "David S. Miller" , Sasha Levin Subject: [PATCH 4.19 054/118] team: no need to do team_notify_peers or team_mcast_rejoin when disabling port Date: Tue, 11 Dec 2018 16:41:13 +0100 Message-Id: <20181211151646.428160652@linuxfoundation.org> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20181211151644.216668863@linuxfoundation.org> References: <20181211151644.216668863@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.19-stable review patch. If anyone has any objections, please let me know. ------------------ [ 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.19.1