From patchwork Mon Aug 17 15:15:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 247813 Delivered-To: patch@linaro.org Received: by 2002:a92:cc90:0:0:0:0:0 with SMTP id x16csp2748693ilo; Mon, 17 Aug 2020 08:53:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyRQHbGZj7UougEevj8hVtEaJCHHCmg0p7YmgdtIhqsstkbbWlxMU5tf3ABn/bVuSh53NKg X-Received: by 2002:aa7:cd76:: with SMTP id ca22mr15251699edb.42.1597679590442; Mon, 17 Aug 2020 08:53:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1597679590; cv=none; d=google.com; s=arc-20160816; b=BlA1jxy7B7EkCnIfku0gjMhiAYW+Ee8etmWkj/GH3v1ow1FwR1ZygKAqYq+RxRYNp0 35eiAPQybQgYMkdr27AkGw+mymg4uKyPkIS4V6O3s3+G9B8/4vaDegZQqWotKWQOr6vi FsBL5EFy29xng9ByEEr+XTtt4A7HFZgYlad7b7Z/o0iT36eUvhOGq9clkY2i/aWLxT72 DAFAMvAXWEzRKCpt+gJhpFp0AKFeVCdjN4TZk/qfXBDDEBr+gllvOPCPtFZKsgwIn+kW na9WQUBokeSq+4r75kKhq4kcbsVJqdO4NsvUASrQcyuRyfv3Fnes44dG/6BCLQNSyleN Z5vw== 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=20cAmBEYR3eYbs2JwobYz+qj7hZJynIXBAnRos5zTqU=; b=JoF1diKqfc5O1WYcQUr1c7Z+ejCS8DUNPaHNrE2lLkmSSta+61ErlvngfOx2/C0a7K Qr5YUAWcwtlyjGXFN5Km0CXyHct+nO4NQNs2O3FbWWxB9nhRpm6jq/8ZkfStNexKMNx1 QdwnBKohVG+DVk9aOMwusW0omT7hcaoQjhhwD/OTmk74pixXHJvOGzPd6l/56Ow2ZN3N 8aeKzVFrpPuRpf+z/Lia9S450fTIdJHspN6mSME0kE2OfOITi3PjSdyJ2gkE9sVehtT1 K0JlABpql6oJi62UpDOa5bJNORYO/eBNFMHrlu87grOCPQ9hFAF6kRb4ilTU2IZSESFw iJ4Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=WWjnUidR; 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 e5si11499227ejq.390.2020.08.17.08.53.10; Mon, 17 Aug 2020 08:53:10 -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=WWjnUidR; 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 S2387897AbgHQPxJ (ORCPT + 15 others); Mon, 17 Aug 2020 11:53:09 -0400 Received: from mail.kernel.org ([198.145.29.99]:39348 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387879AbgHQPwz (ORCPT ); Mon, 17 Aug 2020 11:52:55 -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 A8D3520657; Mon, 17 Aug 2020 15:52:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597679575; bh=QA7MIVp4ltQuVqhOplQfMzK4I4rRnM8iHhKZ0h1fVZ4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WWjnUidRVR8guQhvPwaz19JWoAAlyV6yQcMd+WPzRPS/AfuMMBciiYx9uf9OgvS+t gA8hAeiheqUNDxpLttKVLrSjbZ5WAcadrffTVwfoiRNeoO8QJww9rnvwMTiOdlWlSL err6TGZN0sifI/rMbv8UX/lZPiJgM4ZyQ6Od/HGA= 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 5.7 262/393] net: dsa: rtl8366: Fix VLAN set-up Date: Mon, 17 Aug 2020 17:15:12 +0200 Message-Id: <20200817143832.321686927@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200817143819.579311991@linuxfoundation.org> References: <20200817143819.579311991@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 a75dcd6698b8a..1368816abaed1 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);