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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 7691BCA9EB9 for ; Sat, 26 Oct 2019 13:19:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4851C21655 for ; Sat, 26 Oct 2019 13:19:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572095962; bh=RBQgVcgAMJQXJNkqYkEX5jjqICxz36C2q/bR3Zm5E8c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=WGoKJoU3CkrGndgt3Lizw8WuXLnZJQJDyvSm6fGxg0qozcTMsEY8DYCbrJeYg+caS C/vx+YwHBTqcFJUvGV/7fF/+KGo+WCdSJJC7vybONbeDkiIrpM/9DCIUw+1jQLZJZo 1wtwdLZnijmS/JdyqBELJ0r+AOzif2xFlheCM51s= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728224AbfJZNTV (ORCPT ); Sat, 26 Oct 2019 09:19:21 -0400 Received: from mail.kernel.org ([198.145.29.99]:41256 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728211AbfJZNTS (ORCPT ); Sat, 26 Oct 2019 09:19:18 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (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 E52DE21D7F; Sat, 26 Oct 2019 13:19:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572095957; bh=RBQgVcgAMJQXJNkqYkEX5jjqICxz36C2q/bR3Zm5E8c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nOC8wDW1jsE1r/3//gv/UweK/Eb1uRzc8awBSCwk50IAsnfsD91i3oHrJZh/476dg p3AjsfmMBbBdb6G2SeMQj3qjRGriXudEXR5QdHRnfNvRDHAKRGCw2o9/Du0fuNAHw+ KNhmeDqntZ9OXygIEXuK62syNJLP4tTrw6aWt0TM= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Florian Fainelli , Hubert Feurstein , Vivien Didelot , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 06/59] net: dsa: b53: Do not clear existing mirrored port mask Date: Sat, 26 Oct 2019 09:18:17 -0400 Message-Id: <20191026131910.3435-6-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191026131910.3435-1-sashal@kernel.org> References: <20191026131910.3435-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Florian Fainelli [ Upstream commit c763ac436b668d7417f0979430ec0312ede4093d ] Clearing the existing bitmask of mirrored ports essentially prevents us from capturing more than one port at any given time. This is clearly wrong, do not clear the bitmask prior to setting up the new port. Reported-by: Hubert Feurstein Fixes: ed3af5fd08eb ("net: dsa: b53: Add support for port mirroring") Signed-off-by: Florian Fainelli Reviewed-by: Vivien Didelot Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/dsa/b53/b53_common.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c index ad534b90ef21b..2d3a2cb026d26 100644 --- a/drivers/net/dsa/b53/b53_common.c +++ b/drivers/net/dsa/b53/b53_common.c @@ -1584,7 +1584,6 @@ int b53_mirror_add(struct dsa_switch *ds, int port, loc = B53_EG_MIR_CTL; b53_read16(dev, B53_MGMT_PAGE, loc, ®); - reg &= ~MIRROR_MASK; reg |= BIT(port); b53_write16(dev, B53_MGMT_PAGE, loc, reg); -- 2.20.1