From patchwork Tue Sep 8 15:24:42 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: 249309 Delivered-To: patch@linaro.org Received: by 2002:a92:5b9c:0:0:0:0:0 with SMTP id c28csp4751245ilg; Tue, 8 Sep 2020 10:30:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzrSUZF+0OcAMz4+SHzUSXxuAWsyGyXtWjH/nCB3I6Lp0eWm+il6T5EyL5LEqr7xLc3Ipef X-Received: by 2002:a05:6402:8:: with SMTP id d8mr18344edu.15.1599586210892; Tue, 08 Sep 2020 10:30:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1599586210; cv=none; d=google.com; s=arc-20160816; b=AU9xi2iN26o6cNIHo6wq2uk0h9T+9ej1B9nHfpFf1Zkc05GnP2MnEUO5yVSJXpxsjX 7/WjGOhdFEbqr6UuR5cYBC0bBeQL0wDzpKVuvOaRPOPOETda+6s0Pmnmy8JoJSHg9nVW kIx5LfAEjOaAp9Dy6J9Od64Oj4Q+yxhsUkgdYbCX9xMTDrXQC4BDW+sp1RZTljOMB+/0 QQm7Fv6madRkZMSOIo00TbKdgVZ2ysx2UsRGaN6TJKoxmKSJ6Eow8BA0RGlDhHetsJDn 9FqNwXKsDTQj/EUpEl7kPJqWWkVypa5FGs5nYUtZP06icMqpvTI9qbjksws6CY+ypH3Z eqhw== 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=MK+AIEZjfQw+kX4xi3h90129OFfT+oLZsYey+LZFrH4=; b=muJP+u/xoP0G7aHZlg1ac3YQATV1jCmW6rIXCs2J4BnySlMYKuUzrf0f/SrSVYNHyr 4QqGphwME/rgWfrlGMgz6yGHapIIDrqxXiWT1x712GwsVpaCsquOcFvaLHa+VlVNHbJm wAKT30NkJlzmaOktFXk1NdceNEM8e2IixpF/E2Ai+xutQy38qgX2/wFuiecgVAwsQ/ZG yufjU8Zof2d29gIZYEP+C5KOLZpocw2N29x+2dnHq8mX+LssKvdHxg0ZsONCH0mkm7M7 JzZo+7hAqBvzG+qfSdErnmOyMywbBeH5dCjDMnzvby3HQdrlvrUbQEQLXRSbghkkjNeU MofQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="FrfaX/OE"; 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 mh25si12365871ejb.568.2020.09.08.10.30.10; Tue, 08 Sep 2020 10:30:10 -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="FrfaX/OE"; 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 S1731721AbgIHR2X (ORCPT + 15 others); Tue, 8 Sep 2020 13:28:23 -0400 Received: from mail.kernel.org ([198.145.29.99]:57344 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731711AbgIHQQU (ORCPT ); Tue, 8 Sep 2020 12:16:20 -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 CA1DA24811; Tue, 8 Sep 2020 15:43:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599579809; bh=gZXMhSZLkLMQmCr5NLeirVitRVQYr117gEwuikXZ4c4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FrfaX/OE/mMt92svTtZFM1fKB4vet2ZLO52GRe5ZQjXCYW6bid+kQiU5mK+C0zves yNLe2DJereLmaZnNgtwd5cZfsY5n/pLMRTVNzA0aw7GU1CuTVToN/ILayRn5w/kqvJ LFql60TfS/8VdrKuMomJOXkOYUEeeILeZdUHcxg8= 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.4 041/129] net: ethernet: ti: cpsw: fix clean up of vlan mc entries for host port Date: Tue, 8 Sep 2020 17:24:42 +0200 Message-Id: <20200908152231.729986772@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200908152229.689878733@linuxfoundation.org> References: <20200908152229.689878733@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 39df8c8feb6ce..e7b4d93e3f288 100644 --- a/drivers/net/ethernet/ti/cpsw.c +++ b/drivers/net/ethernet/ti/cpsw.c @@ -2209,7 +2209,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;