Received: by 2002:a25:ad19:0:0:0:0:0 with SMTP id y25csp834612ybi; Fri, 12 Jul 2019 05:26:04 -0700 (PDT) X-Google-Smtp-Source: APXvYqwn0H9yYYkzMiDAeUnw44eSgrgWRCHrsTbvGc2iNjYWOS010N6dA6jwCZRwKdn8ihKzhz+w X-Received: by 2002:a63:ab08:: with SMTP id p8mr10879291pgf.340.1562934364087; Fri, 12 Jul 2019 05:26:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1562934364; cv=none; d=google.com; s=arc-20160816; b=UopC7dbXXze771TrrxX5n+5H5TXZ40901oAsbiXguzIxULzO5ZxQ/BnS0tjM+AuAL2 12GkqPXHaUXxzIkQ/28AVL2ps4L9ommZ9J3aRxkNlIYX/Hbvgr2SiZzOZkHLNTRXO6OU LwaBWiShAvHwR4w9DK8Jw4Vh9m26phuR8oYu0Xe4NFMWk+OFrXSVj1B7Esyds/iBLxWj Cfr94D6pwVr5rAKNpwBQjhxIqZfHK+PVhP9fgh1JB8SdCHn2hgE+++rmW4rBQGeql4M6 EuANg+mwHR54dsnnbnb5XKgvfxXn5XAvaDEVcINpLhTt/k9vWybp0xZ8IDZndNxLBwqW +mbQ== 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=700naDn2w7Sq0mBuPndkhJ1gpJbeb8aB2YuSeX9+xQk=; b=xietEqGz6mn2/m1Y+Kn9+ZHLheWDszgljH5ElqzOUx7r/zBXgx0o7UB816WCMF00vN lEIw6RdgColJLFXZFOcvDlyndjm8yFHQdgn9Bk1ybZeN+tSspbuykDxWIczYhaOF47tZ M+bz615t3acRs3DaNKYON09dAgrZxzXqHwNNPsHITquTGWJnPifMretfTsX6K7mcMM1u 0sNATbG4fYWDZlV3yzstYlTaL3MkzXcF7MlFgt/9KexLZc6EAeukxlRYxUKC5rpGUaRv qS5qQ/1wisON7WuhCgq5xd13UlqfxB8aaVAOOVVFN2m8D32yR+VZVy/6JYdqMWEd27/H +i3Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=lTkUaOQm; 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 b6si8315267pfa.76.2019.07.12.05.25.49; Fri, 12 Jul 2019 05:26:04 -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=lTkUaOQm; 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 S1728174AbfGLMYt (ORCPT + 99 others); Fri, 12 Jul 2019 08:24:49 -0400 Received: from mail.kernel.org ([198.145.29.99]:33820 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728163AbfGLMYq (ORCPT ); Fri, 12 Jul 2019 08:24:46 -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 B2E7121019; Fri, 12 Jul 2019 12:24:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1562934286; bh=hOKXLOrtNFOb/GmQlkG2DFICOr/oDnmKtqy0JV8Jau8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lTkUaOQmhAchf8xbSl4n8nZxnKbOW+Pg2dDt0bOhAfb+y/d2gFqwfhfx0aJvhlzbu PE0AxAoeg041rlXgC1+SonKgAu/ymBTaLq9PcrTSIQcJsB68UHgNnb2ikOdxkDbTRX PnEXN3vcsDu+qj5DCf5GMiWu2JjtP1dFhBpC1ojY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Rasmus Villemoes , "David S. Miller" , Sasha Levin Subject: [PATCH 4.19 53/91] net: dsa: mv88e6xxx: fix shift of FID bits in mv88e6185_g1_vtu_loadpurge() Date: Fri, 12 Jul 2019 14:18:56 +0200 Message-Id: <20190712121624.511422728@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190712121621.422224300@linuxfoundation.org> References: <20190712121621.422224300@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 [ 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 058326924f3e..7a6667e0b9f9 100644 --- a/drivers/net/dsa/mv88e6xxx/global1_vtu.c +++ b/drivers/net/dsa/mv88e6xxx/global1_vtu.c @@ -419,7 +419,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