From patchwork Tue Sep 8 15:23:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 249367 Delivered-To: patch@linaro.org Received: by 2002:a92:5b9c:0:0:0:0:0 with SMTP id c28csp4834059ilg; Tue, 8 Sep 2020 12:25:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwsOWw0aUg5XKemzm6kfyfnmHM/xBg4d+dZSrPYmQnv8rzSB5+4ZC/lZMzJznVgXbBVWWs1 X-Received: by 2002:a50:ab59:: with SMTP id t25mr540226edc.364.1599593106290; Tue, 08 Sep 2020 12:25:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1599593106; cv=none; d=google.com; s=arc-20160816; b=snO4uOT9o+jRzEyPCMz6+yf2voyuGgSsVNnF1WRcFWxGYbPadOKvce+AZGRziwA3B6 bL1QnCAkDCet4Mlu0198u9iR8KZCT+0biwWDamslrMqD6fFEAPvlWLoJrAbNlVeaq4JR qAez9slG8uai50wfA5EDRQWVmbZLZLRS3czGPPkEeCOwjQbXdriNXnm1rD5CeiOr7dKN QEUCfzQ3LhKjPsz3wC/DCZM4TqLHsV9Db3/Adk1IqM8ICq04Qr5CcRSS7wOxKVRfSD2s fel381MnAc4qylqIukZs/CyeYZU9Ww35e0LScgTks8eqVeg6OTRIKSaRn3ZOrl2AYD7K S0MQ== 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=FUgeH/dUxoWknPt7C0WFdxXDzRwEdRzOwLwe5Al0xZo=; b=GfdwLUDq1rLcKaO2bLy9kVtu9+naTnjeofFJAQrgDOVrUgwn5RaV4otOtTHvcexnRf 2DwZMnqi/XZXaLTWVnzdddyJCBu1jiTLKyrXB6my7mZm+ru+DDSasQr/lvasZJOb96sJ 7eS2PqHv4RbomU3nrlZK+haMfH2V8Dnm2wdg7eD1Ga0PZVolNNHxNg9HAnH0iEbYaaDl ApSklhmJC4F9sW7wqUfd6RWwwhy4k3HOsYIpmcydviEQnk10guzXID87sYhhvXyzNW/6 N3DnFQXK5Tfx5I6V1Iq36H3BXeq2FbgxDwq/tnuRXaQbzMN1U5G1AZQWLWlFCkWwtiru +qVQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=hYSUCF5j; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id d1si8901787ejh.616.2020.09.08.12.25.05; Tue, 08 Sep 2020 12:25:06 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=hYSUCF5j; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731950AbgIHTYh (ORCPT + 15 others); Tue, 8 Sep 2020 15:24:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:47746 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731080AbgIHQBX (ORCPT ); Tue, 8 Sep 2020 12:01:23 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 011C823D22; Tue, 8 Sep 2020 15:36:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599579408; bh=JKzs0guyM9YvZO6uqN0KbuEC1FWIlpV2kgvpKhYr0cU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hYSUCF5joQWwZlF3EXGmm1DFPVqynCdCwQ08y2weKhv0eQgmSnJU2AVAJDbTeq6dV 6BWAgzBmjM0ykDZSpUaon9Pntgrp5yXRaIhnxE9fUfU/tAIxNFafUz3g2katJbQE6U xJnykG+IcQKV/ufQrLI9G3RJpaSDyLF5Kl9ROA2k= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Murali Karicheri , "David S. Miller" , Sasha Levin Subject: [PATCH 5.8 065/186] net: ethernet: ti: cpsw: fix clean up of vlan mc entries for host port Date: Tue, 8 Sep 2020 17:23:27 +0200 Message-Id: <20200908152244.808958254@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200908152241.646390211@linuxfoundation.org> References: <20200908152241.646390211@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Murali Karicheri [ Upstream commit 99d469fc64d06f0c81c0fe2a1c01645a67e0cbf0 ] To flush the vid + mc entries from ALE, which is required when a VLAN interface is removed, driver needs to call cpsw_ale_flush_multicast() with ALE_PORT_HOST for port mask as these entries are added only for host port. Without this, these entries remain in the ALE table even after removing the VLAN interface. cpsw_ale_flush_multicast() calls cpsw_ale_flush_mcast which expects a port mask to do the job. Fixes: 15180eca569b ("net: ethernet: ti: cpsw: fix vlan mcast") Signed-off-by: Murali Karicheri Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/ti/cpsw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.25.1 diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c index 9b17bbbe102fe..4a65edc5a3759 100644 --- a/drivers/net/ethernet/ti/cpsw.c +++ b/drivers/net/ethernet/ti/cpsw.c @@ -1116,7 +1116,7 @@ static int cpsw_ndo_vlan_rx_kill_vid(struct net_device *ndev, HOST_PORT_NUM, ALE_VLAN, vid); ret |= cpsw_ale_del_mcast(cpsw->ale, priv->ndev->broadcast, 0, ALE_VLAN, vid); - ret |= cpsw_ale_flush_multicast(cpsw->ale, 0, vid); + ret |= cpsw_ale_flush_multicast(cpsw->ale, ALE_PORT_HOST, vid); err: pm_runtime_put(cpsw->dev); return ret;