From patchwork Mon Aug 17 15:16:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 247837 Delivered-To: patch@linaro.org Received: by 2002:a92:cc90:0:0:0:0:0 with SMTP id x16csp2853101ilo; Mon, 17 Aug 2020 11:12:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx7bMnI5bqhKxTYyexF6f/1xoOoSEMsMtl7E9YB1I2U0ALYa2euxLWtqR+SdIYecRst26o7 X-Received: by 2002:a17:906:3449:: with SMTP id d9mr16693584ejb.460.1597687967489; Mon, 17 Aug 2020 11:12:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1597687967; cv=none; d=google.com; s=arc-20160816; b=Fda8RdQNUziVJo6+oK3oxL8s6rbKLBKiEFE9hwntKO1KAC4vO5cN2ML07SkuPbjUZp H2pWRpPes0I8befNlE7hPNFEIWXjM/8OMSbv5p5n33Qb/3tu2PmwNSjvIiCX3G3GUQpt 3KQ1x6oK1CMLzjlY2uRduEvB+rSb+UQhmjl9l3v7Pp9JCEqBNjrf/D8l8hS4PMvd+xxC 4iE8E1YUmvHatOJUxv8j8F8K/t3WwuZjswVCxlO8WSy5gBChman/Za2WW8ofGAibTG2a GszCVet4/qTIIHWQDUyh55jIZBLe6IEQS5RBlbIjknmageAXueJG5+WSSoNP27hUZPOA wVGQ== 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=YMLT84xCQWP4bHI/26FQj2kiwbVoJmBvK2DZplUhdeoDh7pswXSKNfBA0rvQXwqjbw +ii/aMTITlIuU//TKfkU1iq6UA1JAWIQtrLakuk1+kEVV8G3/K5JzybE8gozpu+IxnLO CrZGC+FhakEsNXDA5Gdimrc8VUAktqKKJH5F4tjazhTzKTcPNiWmLz1CBKz4LAqsDkvS gw1cIKQ3L3WIMtLTh4nj0i51XcT79wM3rNu++EI9XrzZgdAtoUD9vXprJEGEKl/lbyjR 5gJ0qKXdbLrmL4PttA3vneyHiC0/5WuZCnCgpK3Iz+wwGvKTdACP+EsLQzpMZugB1nKw o2Zw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=QKz7vVKO; 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 m29si14211400edb.298.2020.08.17.11.12.47; Mon, 17 Aug 2020 11:12:47 -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=QKz7vVKO; 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 S2390512AbgHQSMo (ORCPT + 15 others); Mon, 17 Aug 2020 14:12:44 -0400 Received: from mail.kernel.org ([198.145.29.99]:53934 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730534AbgHQQG5 (ORCPT ); Mon, 17 Aug 2020 12:06:57 -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 62CAD22B40; Mon, 17 Aug 2020 16:06:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597680411; bh=QA7MIVp4ltQuVqhOplQfMzK4I4rRnM8iHhKZ0h1fVZ4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QKz7vVKO6FlGmQ1tNtj88dDrpmtFe19VSoY0dlWnVhaLu2RWQXTdvXayaztotT4L2 /7i7ubMQoID1f0SM7pex/ofINfLssJsvwWTkjzQVhPZpJhGhr4w1WmEZgTBaxXc4te SLul5KX2+Wj4IIfczxJi5P2wZFvK9hsqsuxo0wV4= 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.4 177/270] net: dsa: rtl8366: Fix VLAN set-up Date: Mon, 17 Aug 2020 17:16:18 +0200 Message-Id: <20200817143804.628945269@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200817143755.807583758@linuxfoundation.org> References: <20200817143755.807583758@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);