Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp4184296pxk; Tue, 8 Sep 2020 12:54:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxMnQgwzvc9wapvH9BoQZ3vxwRvyNVLF76N7sbQdcrj50lMU87BTWdEnLxYgObYwlqBgGzz X-Received: by 2002:a17:906:e216:: with SMTP id gf22mr120787ejb.2.1599594876344; Tue, 08 Sep 2020 12:54:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1599594876; cv=none; d=google.com; s=arc-20160816; b=xQslem4oEVvujk5ebENVPaD6wEU0mecFU64+z603MN68R2duZx2X4Ugkmi7xiujYqR zqg1T1rzy6g8bC90pHmcNQV+NjRV9dNRovCKnLK8z0JtTChw1YOJ1J8J++Q56qymxnqj fKSbDmgCSs+I0NF8ddExP0pJQDkWiKeb78krVmA+rohlWwEtCqrqmNsPTGf/Hxxkpo6u KYmW5x7ph56HYxDUfjJM5cCgls7oRpcxe6LWv5bO5krcLX85tEAPW57NQDi8BeEOJQ0+ TJoNi0CP2KAHOadqcVo4WuG08lfOxjAPoCD3549NpMA42Koxn02Z0RmWSeOUadV6rQ1R ZbNg== 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=SiU1uMcg+k4BGrqv21vCween5dTpacXlL7gpKSG9+oY=; b=QvggHFbNj4jqwuD4VCFIdazNqkWtWIbnlac9oTSEmj50cIB5ZzHuFqODT1IhjALBHy mzRPV+wcve16yE+zCtRoADtOqj1sINvpzDSqBh4yP4Ap0LeMgvMM3xQ4KWdbhtoN9vUd ElCCxTrCoxcLDQxrJvWGx0808gA5FhSc2yMEyJVbjNwQRaHYBtGzu5Gc1Deq3/gDwKh9 R0pwasUGzqNL+in7W9WVZtWQcEcHDRLl13uZGkFve0BjvXYV636mxUWfQxsXlcan3v0Z w8tTGMWqESJF92W6lVytxI97Aj6OBQpByn77mNwhUJ/VD8ijmz46smhFIe//ULM4frEt aUJg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=rzKiQ779; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-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 e18si13873edv.524.2020.09.08.12.54.13; Tue, 08 Sep 2020 12:54:36 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-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=rzKiQ779; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-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 S1732143AbgIHTve (ORCPT + 99 others); Tue, 8 Sep 2020 15:51:34 -0400 Received: from mail.kernel.org ([198.145.29.99]:42814 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730304AbgIHPt5 (ORCPT ); Tue, 8 Sep 2020 11:49:57 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 ACE7B2485D; Tue, 8 Sep 2020 15:45:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599579922; bh=Q0s+No+VwSBihjIHi1xxZfkgr3aWqm7PPMb0lJeQw4A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rzKiQ7792d/hIt6YLu5j5PDIAUfhGYHYOliWXFlEiDEFbWV2c3742XUtasR5gDzMp YYxj9qITEVHBNH4uhxwT7EIg3t5PYq1zzG/X/eRRZ8JvakUOgXHIq96MVVXKveeJFp Z8pso5kZBaX7FYFPa+8WTlCEG5ZEVhJWonqzvBKg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Sasha Levin Subject: [PATCH 5.4 088/129] Revert "net: dsa: microchip: set the correct number of ports" Date: Tue, 8 Sep 2020 17:25:29 +0200 Message-Id: <20200908152234.112893103@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200908152229.689878733@linuxfoundation.org> References: <20200908152229.689878733@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 This reverts commit d55dad8b1d893fae0c4e778abf2ace048bcbad86. Upstream commit af199a1a9cb0 ("net: dsa: microchip: set the correct number of ports") seems to have been applied twice on top of the 5.4 branch. This revert the second instance of said commit. Signed-off-by: Sasha Levin --- drivers/net/dsa/microchip/ksz8795.c | 3 --- drivers/net/dsa/microchip/ksz9477.c | 3 --- 2 files changed, 6 deletions(-) diff --git a/drivers/net/dsa/microchip/ksz8795.c b/drivers/net/dsa/microchip/ksz8795.c index 8d50aacd19e51..84c4319e3b31f 100644 --- a/drivers/net/dsa/microchip/ksz8795.c +++ b/drivers/net/dsa/microchip/ksz8795.c @@ -1270,9 +1270,6 @@ static int ksz8795_switch_init(struct ksz_device *dev) /* set the real number of ports */ dev->ds->num_ports = dev->port_cnt; - /* set the real number of ports */ - dev->ds->num_ports = dev->port_cnt; - return 0; } diff --git a/drivers/net/dsa/microchip/ksz9477.c b/drivers/net/dsa/microchip/ksz9477.c index b15da9a8e3bb9..49ab1346dc3f7 100644 --- a/drivers/net/dsa/microchip/ksz9477.c +++ b/drivers/net/dsa/microchip/ksz9477.c @@ -515,9 +515,6 @@ static int ksz9477_port_vlan_filtering(struct dsa_switch *ds, int port, PORT_VLAN_LOOKUP_VID_0, false); } - /* set the real number of ports */ - dev->ds->num_ports = dev->port_cnt; - return 0; } -- 2.25.1