From patchwork Mon Aug 17 15:17:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 247827 Delivered-To: patch@linaro.org Received: by 2002:a92:cc90:0:0:0:0:0 with SMTP id x16csp2832980ilo; Mon, 17 Aug 2020 10:44:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwp+anA8I5+sFP9W7Fi/eS7sHUvJaxf4s2ydDdx3mx7l+auWPAB8tmjzsKRj3br3waLKXc/ X-Received: by 2002:aa7:c34d:: with SMTP id j13mr15900856edr.209.1597686242121; Mon, 17 Aug 2020 10:44:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1597686242; cv=none; d=google.com; s=arc-20160816; b=SgRhh1ky0FGsC3vac4iOw5wIujZcgBzQ5kTJRr8TqqoihN3yW8ECbCZPkjqRtyS2VD 0im+f0Y1+bRvrsB6NC/6K92AxWKo/pNvv6USpg6u+gq6M4RaUD1tR6QvDl2tYX/zjdjS dl3cU/16iXnyy9q4a0C6rxF9MG0GoVDsZ5znS01LitirPujSHFFiGLj5S39wa1XOJI6X PMel6Qaul6avElmBZB2fxVuUgNKfObgdEHE7qY1xH71TLGrPl8yGaZoH0M8jNC4zh4RZ VC4XCq7dkuECHm+BWSsvnQG+ezCi+6GS6yILYEXKxkH/f3SV2+8Jh1Thbim6Rvyigyua vB2g== 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=nZrBf8xHXchPM2P/PcKSwNAjgfapctR4vTv7gIyKC0U=; b=iC2IN5BfkL3/s/hX1V7Wl76A/CKvpQrjVP/HRaIyq8BJ+bq4JBBktHC1nrHFdv7gLC uXJcz8N3XUSfrKUfsE1p273ZAMcViQq9o+b0tKZRn3wuoaiqKNzz3tmEwnvN+8eCCEoS +jB9inClpfAlUjHq/WlSnxmcKo9fXJXoyKOz4xMtIq+WBT77KzmbNBsDcIKz+FUDezLT 9vJxzNo7+u9KkGOMM5yujuVg2fqLTD0CFn8g1DQ+kuAliTEGyhudpqwSwIskZbgwHmdJ aImjDbg90HajjdMDqL3GozvXRzGFA4VBO2cj22MLkm66Vveq/D6MpX1Ual1AJX6JU4eP iqOw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=jF3SoQRI; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id r26si11202145edy.137.2020.08.17.10.44.01; Mon, 17 Aug 2020 10:44:02 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=jF3SoQRI; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730829AbgHQQP0 (ORCPT + 15 others); Mon, 17 Aug 2020 12:15:26 -0400 Received: from mail.kernel.org ([198.145.29.99]:53370 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388805AbgHQQPM (ORCPT ); Mon, 17 Aug 2020 12:15:12 -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 D0E29206FA; Mon, 17 Aug 2020 16:15:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597680912; bh=LZEDUxir5qmJ/DDY6kHLkIl4v+t4VAJliT08wxgDnIU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jF3SoQRI64o7GPschgDfIEzhHsVgJGbLUGk286l2EFh23A3aEiPxUAFsGfbO2xM8/ W7J6fwYPQX8cn5Tl5Cp+Qeag9qRcSAMOlbCq9VBietYifiLTzwkl6biKyKVpk/uPUf bxhmvGwl23U7LYoz86IMEARqXx/Ow4fLFgrm+GKg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, DENG Qingfang , Mauri Sandberg , Florian Fainelli , Linus Walleij , "David S. Miller" , Sasha Levin Subject: [PATCH 4.19 108/168] net: dsa: rtl8366: Fix VLAN set-up Date: Mon, 17 Aug 2020 17:17:19 +0200 Message-Id: <20200817143739.085827014@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200817143733.692105228@linuxfoundation.org> References: <20200817143733.692105228@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Linus Walleij [ Upstream commit 788abc6d9d278ed6fa1fa94db2098481a04152b7 ] Alter the rtl8366_vlan_add() to call rtl8366_set_vlan() inside the loop that goes over all VIDs since we now properly support calling that function more than once. Augment the loop to postincrement as this is more intuitive. The loop moved past the last VID but called rtl8366_set_vlan() with the port number instead of the VID, assuming a 1-to-1 correspondence between ports and VIDs. This was also a bug. Cc: DENG Qingfang Cc: Mauri Sandberg Reviewed-by: Florian Fainelli Fixes: d8652956cf37 ("net: dsa: realtek-smi: Add Realtek SMI driver") Signed-off-by: Linus Walleij Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/dsa/rtl8366.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) -- 2.25.1 diff --git a/drivers/net/dsa/rtl8366.c b/drivers/net/dsa/rtl8366.c index 145f34de7b416..7e27c9aff9b72 100644 --- a/drivers/net/dsa/rtl8366.c +++ b/drivers/net/dsa/rtl8366.c @@ -397,7 +397,7 @@ void rtl8366_vlan_add(struct dsa_switch *ds, int port, if (dsa_is_dsa_port(ds, port) || dsa_is_cpu_port(ds, port)) dev_err(smi->dev, "port is DSA or CPU port\n"); - for (vid = vlan->vid_begin; vid <= vlan->vid_end; ++vid) { + for (vid = vlan->vid_begin; vid <= vlan->vid_end; vid++) { int pvid_val = 0; dev_info(smi->dev, "add VLAN %04x\n", vid); @@ -420,13 +420,13 @@ void rtl8366_vlan_add(struct dsa_switch *ds, int port, if (ret < 0) return; } - } - ret = rtl8366_set_vlan(smi, port, member, untag, 0); - if (ret) - dev_err(smi->dev, - "failed to set up VLAN %04x", - vid); + ret = rtl8366_set_vlan(smi, vid, member, untag, 0); + if (ret) + dev_err(smi->dev, + "failed to set up VLAN %04x", + vid); + } } EXPORT_SYMBOL_GPL(rtl8366_vlan_add);