Received: by 2002:a25:d783:0:0:0:0:0 with SMTP id o125csp655075ybg; Thu, 19 Mar 2020 06:29:38 -0700 (PDT) X-Google-Smtp-Source: ADFU+vv+C3yxG7U7iTs3WrJSW5duAAOeDCZjzBrenTOpLnaNtjCfa9RDdPjAlDPp+gI7eTCZ5a5d X-Received: by 2002:a9d:4f0:: with SMTP id 103mr2244941otm.336.1584624578304; Thu, 19 Mar 2020 06:29:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1584624578; cv=none; d=google.com; s=arc-20160816; b=t9pcpHEjyhB4QAhpdf2uBbUikl+pXugY2pBmoHTlD+8EwqJjeEKqF5QR1+3e+6iw/l B9PUgKHk9sn8fLPcvZ7Dm1dN6whHxw9UxEB71LZwXk//yjLSTW+HvGsJvagbhlvr1hpS IY1//93h8Z9WevBsuXFnFkwmM73Edgn4hbLxp8P224TtiFBaBDwX9LK5jkQNBGr3V2Ab zx/xvRMrnnRSAaYebXF1eRm2dDP6Ucinpw/wRyHQZx96ZaU11vSrfVGEjIy1pk0hXlfw ECCtLDoUniqKEaAT3MGGSqOTYFLPx6OJSLUZHwGdJ9of1AAG0j07IRxwyR0URSwKoEIy 2e2w== 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=iEUEWC0xb6RPYgXrvVzuTBU/hXbpgVs8rHZP7hfmKNo=; b=L7CTAzCMwIDbC+TqHNmbP3BCODEWIfXEsqGRXTB3ISdBZUSjPf3bCnw9rSF8ZxIm14 KmWlawH6gXLOkzWK5+hRQ+4kk6CYTcEw0HpV2KqOMZCnLCFtO+kLTtMLTEmJZ6XCkctg +i8kKTcJj351mJGHL581k0z6hd4QotsSMUMnNJa9Pfrrai94Kozfn2M13C1BCdVIGaOz QLF6+bzNC1B9GqiGY+5ikaPQvr+mTeHMVwYFI8ZubUbu5k5dcOtoSp+tQat5/+2h+MB0 VhMPQsN1NylqVnBJcOe0buww0EAROV64+IngzgolHfU+X+YxZ9GudAgmPGsW4nn6oThE 0Uzw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=DSBZaP7I; 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 i142si1079458oib.87.2020.03.19.06.29.25; Thu, 19 Mar 2020 06:29:38 -0700 (PDT) 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=DSBZaP7I; 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 S1730949AbgCSN1y (ORCPT + 99 others); Thu, 19 Mar 2020 09:27:54 -0400 Received: from mail.kernel.org ([198.145.29.99]:56344 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730946AbgCSN1v (ORCPT ); Thu, 19 Mar 2020 09:27:51 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.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 DD15C208D6; Thu, 19 Mar 2020 13:27:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584624470; bh=vIWVVQSsxa0q2PBnre3MSrwGIHMPHLvVS/E2Zr8HFLo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DSBZaP7I4lHsRKMzdrt6pu73Cmz8lYnls6FKXZ17jhpkOLso4ySBc4HO9u5vmkL9v F2mfTHH92tVKRrfKNcYvd7MZlZKZchV4DQqjoCx0l08xbCLRapMxGLWqRvFuyAgm3v 5xyhi0sX5Of9I/l2FA8zA3OQk31bkGoEccyitK48= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kevin Benson , Chris Healy , Andrew Lunn , "David S. Miller" , Sasha Levin Subject: [PATCH 5.5 56/65] net: dsa: mv88e6xxx: Fix masking of egress port Date: Thu, 19 Mar 2020 14:04:38 +0100 Message-Id: <20200319123943.985046228@linuxfoundation.org> X-Mailer: git-send-email 2.25.2 In-Reply-To: <20200319123926.466988514@linuxfoundation.org> References: <20200319123926.466988514@linuxfoundation.org> User-Agent: quilt/0.66 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 From: Andrew Lunn [ Upstream commit 3ee339eb28959629db33aaa2b8cde4c63c6289eb ] Add missing ~ to the usage of the mask. Reported-by: Kevin Benson Reported-by: Chris Healy Fixes: 5c74c54ce6ff ("net: dsa: mv88e6xxx: Split monitor port configuration") Signed-off-by: Andrew Lunn Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/dsa/mv88e6xxx/global1.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/dsa/mv88e6xxx/global1.c b/drivers/net/dsa/mv88e6xxx/global1.c index b016cc205f81f..ca3a7a7a73c32 100644 --- a/drivers/net/dsa/mv88e6xxx/global1.c +++ b/drivers/net/dsa/mv88e6xxx/global1.c @@ -278,13 +278,13 @@ int mv88e6095_g1_set_egress_port(struct mv88e6xxx_chip *chip, switch (direction) { case MV88E6XXX_EGRESS_DIR_INGRESS: dest_port_chip = &chip->ingress_dest_port; - reg &= MV88E6185_G1_MONITOR_CTL_INGRESS_DEST_MASK; + reg &= ~MV88E6185_G1_MONITOR_CTL_INGRESS_DEST_MASK; reg |= port << __bf_shf(MV88E6185_G1_MONITOR_CTL_INGRESS_DEST_MASK); break; case MV88E6XXX_EGRESS_DIR_EGRESS: dest_port_chip = &chip->egress_dest_port; - reg &= MV88E6185_G1_MONITOR_CTL_EGRESS_DEST_MASK; + reg &= ~MV88E6185_G1_MONITOR_CTL_EGRESS_DEST_MASK; reg |= port << __bf_shf(MV88E6185_G1_MONITOR_CTL_EGRESS_DEST_MASK); break; -- 2.20.1