From mboxrd@z Thu Jan 1 00:00:00 1970 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=-9.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=unavailable 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 85A68C48BD3 for ; Thu, 27 Jun 2019 00:41:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 516AD21855 for ; Thu, 27 Jun 2019 00:41:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1561596090; bh=+p/GKUJ0vIJ3/9b60kp1RMUYg6exC3/Pfeg8m+wUofw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=SjUeYi91KawJe4+1MkpP/jAtAaJcySFcZ71hUlhbZJry6CUE1WdHQBxzDV6jEY/1T ZQqTIc4UUqSZT3OnZjNu+PMZztKn66BfPfVJuw7D4oWYlsJV/86mg+oY6dvVBXHGRL gJCqrEysQsHKWh6IXyq33+C7emYWBTfkfmoTRR3o= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729490AbfF0AlW (ORCPT ); Wed, 26 Jun 2019 20:41:22 -0400 Received: from mail.kernel.org ([198.145.29.99]:45122 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728297AbfF0AlS (ORCPT ); Wed, 26 Jun 2019 20:41:18 -0400 Received: from sasha-vm.mshome.net (unknown [107.242.116.147]) (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 B706C205ED; Thu, 27 Jun 2019 00:41:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1561596077; bh=+p/GKUJ0vIJ3/9b60kp1RMUYg6exC3/Pfeg8m+wUofw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rqDNjGey5mWPtzz2EOQ1RxTQ5KZXkDzgp4GEjfXaMU1TzBCSp4n2n5gTHVil3VnG4 a6cfpMnNTYxm4AUWk0ivigA9b1jpZL2Y/65UrUEgiI1OJejjjpiDPakny1NOL7WqdY imn8cKDocafpSGpJ/Dtnb3cr8xDIeWlmdpCmcNHM= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Rasmus Villemoes , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 34/35] net: dsa: mv88e6xxx: fix shift of FID bits in mv88e6185_g1_vtu_loadpurge() Date: Wed, 26 Jun 2019 20:39:22 -0400 Message-Id: <20190627003925.21330-34-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190627003925.21330-1-sashal@kernel.org> References: <20190627003925.21330-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: Rasmus Villemoes [ Upstream commit 48620e341659f6e4b978ec229f6944dabe6df709 ] The comment is correct, but the code ends up moving the bits four places too far, into the VTUOp field. Fixes: 11ea809f1a74 (net: dsa: mv88e6xxx: support 256 databases) Signed-off-by: Rasmus Villemoes Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/dsa/mv88e6xxx/global1_vtu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/dsa/mv88e6xxx/global1_vtu.c b/drivers/net/dsa/mv88e6xxx/global1_vtu.c index 8c8a0ec3d6e9..f260bd30c73a 100644 --- a/drivers/net/dsa/mv88e6xxx/global1_vtu.c +++ b/drivers/net/dsa/mv88e6xxx/global1_vtu.c @@ -416,7 +416,7 @@ int mv88e6185_g1_vtu_loadpurge(struct mv88e6xxx_chip *chip, * VTU DBNum[7:4] are located in VTU Operation 11:8 */ op |= entry->fid & 0x000f; - op |= (entry->fid & 0x00f0) << 8; + op |= (entry->fid & 0x00f0) << 4; } return mv88e6xxx_g1_vtu_op(chip, op); -- 2.20.1