Message ID | 20230324080608.3428714-2-o.rempel@pengutronix.de |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp457530vqo; Fri, 24 Mar 2023 01:19:11 -0700 (PDT) X-Google-Smtp-Source: AK7set/7NONOfqu9Bi2XVDnooInmF7MVunmqj+SCXeFMJLW39ZHXwMboWn3eE43Xxl3T9EduzpoU X-Received: by 2002:aa7:8f3c:0:b0:627:6328:79d7 with SMTP id y28-20020aa78f3c000000b00627632879d7mr1801082pfr.34.1679645951283; Fri, 24 Mar 2023 01:19:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679645951; cv=none; d=google.com; s=arc-20160816; b=z8hLOH1Xx0T53j3GeE1/0co9Q1G7ueGlyIuQCo1N5CxHI40kyN+mxxcMP1Hk8+T/h6 x/G0saxKoJMcH7PMJT1DBoQSY4Pm+EpXaf17+MIn5ZiFx78HIJMtfd/ptshN2KWTwVXp wZUuY1Kp0VFKpkats/4skbZ/oDTP0rA2L5LE2My8s+jPbbT8gSVFgeulIoe43H2sxIfm GOHoCq4W2Z6QVqtaex3OPl+vo+O6fkIUJAIEsH4VaaRUa3snlkhcofwkNudNf/KeR/ZB ynwTs+0q+0u0Xh562nDtY+RPHoawtot62QRvJ4XGh38BDDcrkMNF76skHaUvKR/z51xu EGrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=dimf+oRW7gXL8GlUUWr61YaKGpxrf4GRQmWLWgF7HE4=; b=qOjPx6FZXq4Dg67C1pAKCU0cEtxErvO8h/zcL+RMx6TJ6FffyRFY9J8eszpClDKVPC QgK47EtHwW/COC4cabgM7pyisFbBvUndL6cePnbq4sZ4ckzfiLyhc6Bih8umoQPs4F5Y nSm1aWvh527fpbYaPWMO3jKgXXxYJ2S2KE9od/PeMEgZkYnZpizEtK+OC9FGC6Oam4Gj 94XnbFLJBWFx5eh35Fp2uxP+A32uSiTg1zTEfHeWs8sGtC9YFPJqrVVYL32JI+qiK7Of TXf8b5b06lFufzRY4PWxHHEyzlAqlnZhb8MoyaxapbbJigAyiz079ec4p6KgR2r0SK8D AmqQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t18-20020a62d152000000b005935dae4234si21100677pfl.306.2023.03.24.01.18.58; Fri, 24 Mar 2023 01:19:11 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231706AbjCXIGk (ORCPT <rfc822;ezelljr.billy@gmail.com> + 99 others); Fri, 24 Mar 2023 04:06:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50318 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231281AbjCXIGX (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Fri, 24 Mar 2023 04:06:23 -0400 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 06D272387B for <linux-kernel@vger.kernel.org>; Fri, 24 Mar 2023 01:06:21 -0700 (PDT) Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from <ore@pengutronix.de>) id 1pfcRB-00077P-IU; Fri, 24 Mar 2023 09:06:13 +0100 Received: from [2a0a:edc0:0:1101:1d::ac] (helo=dude04.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from <ore@pengutronix.de>) id 1pfcR8-006KcJ-Bp; Fri, 24 Mar 2023 09:06:10 +0100 Received: from ore by dude04.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from <ore@pengutronix.de>) id 1pfcR7-00ENyy-Gw; Fri, 24 Mar 2023 09:06:09 +0100 From: Oleksij Rempel <o.rempel@pengutronix.de> To: "David S. Miller" <davem@davemloft.net>, Andrew Lunn <andrew@lunn.ch>, Eric Dumazet <edumazet@google.com>, Florian Fainelli <f.fainelli@gmail.com>, Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>, Vladimir Oltean <olteanv@gmail.com>, Woojung Huh <woojung.huh@microchip.com>, Arun Ramadoss <arun.ramadoss@microchip.com> Cc: Oleksij Rempel <o.rempel@pengutronix.de>, kernel@pengutronix.de, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, UNGLinuxDriver@microchip.com Subject: [PATCH net v2 1/6] net: dsa: microchip: ksz8: fix ksz8_fdb_dump() Date: Fri, 24 Mar 2023 09:06:03 +0100 Message-Id: <20230324080608.3428714-2-o.rempel@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230324080608.3428714-1-o.rempel@pengutronix.de> References: <20230324080608.3428714-1-o.rempel@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: ore@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org X-Spam-Status: No, score=-2.3 required=5.0 tests=RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1761236432708565801?= X-GMAIL-MSGID: =?utf-8?q?1761236432708565801?= |
Series |
net: dsa: microchip: ksz8: fixes for stable
|
|
Commit Message
Oleksij Rempel
March 24, 2023, 8:06 a.m. UTC
Before this patch, the ksz8_fdb_dump() function had several issues, such as uninitialized variables and incorrect usage of source port as a bit mask. These problems caused inaccurate reporting of vid information and port assignment in the bridge fdb. Fixes: e587be759e6e ("net: dsa: microchip: update fdb add/del/dump in ksz_common") Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de> Acked-by: Arun Ramadoss <arun.ramadoss@microchip.com> --- drivers/net/dsa/microchip/ksz8795.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
Comments
On 3/24/23 01:06, Oleksij Rempel wrote: > Before this patch, the ksz8_fdb_dump() function had several issues, such > as uninitialized variables and incorrect usage of source port as a bit > mask. These problems caused inaccurate reporting of vid information and > port assignment in the bridge fdb. > > Fixes: e587be759e6e ("net: dsa: microchip: update fdb add/del/dump in ksz_common") > Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de> > Acked-by: Arun Ramadoss <arun.ramadoss@microchip.com> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
diff --git a/drivers/net/dsa/microchip/ksz8795.c b/drivers/net/dsa/microchip/ksz8795.c index 003b0ac2854c..3fffd5da8d3b 100644 --- a/drivers/net/dsa/microchip/ksz8795.c +++ b/drivers/net/dsa/microchip/ksz8795.c @@ -958,15 +958,14 @@ int ksz8_fdb_dump(struct ksz_device *dev, int port, u16 entries = 0; u8 timestamp = 0; u8 fid; - u8 member; - struct alu_struct alu; + u8 src_port; + u8 mac[ETH_ALEN]; do { - alu.is_static = false; - ret = ksz8_r_dyn_mac_table(dev, i, alu.mac, &fid, &member, + ret = ksz8_r_dyn_mac_table(dev, i, mac, &fid, &src_port, ×tamp, &entries); - if (!ret && (member & BIT(port))) { - ret = cb(alu.mac, alu.fid, alu.is_static, data); + if (!ret && port == src_port) { + ret = cb(mac, fid, false, data); if (ret) break; }