Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp437504imu; Wed, 12 Dec 2018 20:54:04 -0800 (PST) X-Google-Smtp-Source: AFSGD/VmyM267FhM/ivOZK17xJgkV2ytRJZC4tmO1+Y5TvKD1mmcaP5oH1nJ+vu5ET9HO7Is+g4E X-Received: by 2002:a62:5003:: with SMTP id e3mr23466620pfb.23.1544676844925; Wed, 12 Dec 2018 20:54:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544676844; cv=none; d=google.com; s=arc-20160816; b=rErmw+XUrrQFyfzC0gbnC86A/cXNUT6Lh3YBPLcKPttQpt129w8ivqSZvsdoc42GdA MWh4Y/igi7WJbVwxdGh+VUsi00R4P2ZZNG4kCiKGyBXz2WHlcCAuqiEyVpIa9bTry1DS Pp8d48ElbnpIVF8Jq3SUy/ZdSA2V3qb649o9+kAahUqP4u3R4Cj60tFzSxzZcLUSLUVm Um9UV7M3bB6ycdxMwMwdJplmJ7IBxYQ34FjSxQNU6PubWsBIfHIi0xrDGSJ/Q86OQ28E mPGIOIlTSkz5f/cWo8Pc7GpJKhjCR6QXcRTO5Wbxc5DLK0jmUMiOI4PEL2uOfPjOmQSw 7dHA== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=9UKqXeeszdSTrDs+ukFWJjtj1bCB8poI7z922BygsWk=; b=GiVE8j+E/ygM1nHFyPvBxmszvuWtGy34k82vuhlQBmGHR4Dir6tSshmGIx8vivODnU XLpwpOQc8QBWLDNiXivLVNqVbk1RwstF5qpJBx/QWsdPEbJ2xhdYhseV5bCVUzIpLw9L XZ8G4pBkcluZhfbE5LISlWfrfKzqtvwaB7IQIE05xaBSqd31rhVp6phGR2AsHyg6A7kQ jgMg0gGfVqsE+4yk8SXdsiaq0tUomNBWpFU2Undigtf2POJHclD3+M0bdummbtG0rOlJ CuNyeLxGK7oqswETiYPCTCB+OLzkhH1di/Bls/eduRVJ0gasm6LTqVYYBFMLPsFugvjv ogZA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=gECZglFK; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k134si679207pga.401.2018.12.12.20.53.50; Wed, 12 Dec 2018 20:54:04 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=gECZglFK; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727968AbeLMEwX (ORCPT + 99 others); Wed, 12 Dec 2018 23:52:23 -0500 Received: from mail.kernel.org ([198.145.29.99]:41716 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727024AbeLME2u (ORCPT ); Wed, 12 Dec 2018 23:28:50 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5ED6A2087F; Thu, 13 Dec 2018 04:28:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1544675330; bh=XBcIophZ7csLne9xCXqvnONuOooDZpF3ortx0KeLKfU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gECZglFKebpRtxU67lilQ0Gl43xP+jaSVSGFSvggGKgUysE7Dn52fwJ0Ax5rNEZMj d309F+N4kCuKGm/TvuLZ3Ws0LwlnirW8bs2N8CgCkhhOtdNQBTxFf7g7lxi/Dd52Ba TZpv88Hf7jteZz8ytyTcJxtSC3Kt0CJ32Oh46E/o= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Baruch Siach , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 09/73] net: phy: sfp: correct store of detected link modes Date: Wed, 12 Dec 2018 23:27:34 -0500 Message-Id: <20181213042838.75160-9-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181213042838.75160-1-sashal@kernel.org> References: <20181213042838.75160-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Baruch Siach [ Upstream commit d7f7e0018b96fd1a30a968faa9464eb57372c1ec ] The link modes that sfp_parse_support() detects are stored in the 'modes' bitmap. There is no reason to make an exception for 1000Base-PX or 1000Base-BX10. Fixes: 03145864bd0f ("sfp: support 1G BiDi (eg, FiberStore SFP-GE-BX) modules") Signed-off-by: Baruch Siach Acked-by: Russell King Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/phy/sfp-bus.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/phy/sfp-bus.c b/drivers/net/phy/sfp-bus.c index 83060fb349f4..ad9db652874d 100644 --- a/drivers/net/phy/sfp-bus.c +++ b/drivers/net/phy/sfp-bus.c @@ -162,7 +162,7 @@ void sfp_parse_support(struct sfp_bus *bus, const struct sfp_eeprom_id *id, /* 1000Base-PX or 1000Base-BX10 */ if ((id->base.e_base_px || id->base.e_base_bx10) && br_min <= 1300 && br_max >= 1200) - phylink_set(support, 1000baseX_Full); + phylink_set(modes, 1000baseX_Full); /* For active or passive cables, select the link modes * based on the bit rates and the cable compliance bytes. -- 2.19.1