From patchwork Tue Jul 3 20:34:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 938867 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="q+r4d0xf"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41Kwpz3ql2z9s29 for ; Wed, 4 Jul 2018 06:35:07 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753067AbeGCUfE (ORCPT ); Tue, 3 Jul 2018 16:35:04 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:52362 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752607AbeGCUfD (ORCPT ); Tue, 3 Jul 2018 16:35:03 -0400 Received: by mail-wm0-f66.google.com with SMTP id w16-v6so3603540wmc.2 for ; Tue, 03 Jul 2018 13:35:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:cc:from:subject:message-id:date:user-agent:mime-version :content-language:content-transfer-encoding; bh=ks41rjgB85sdQFa/h6liQYyhAz7syt9LZkHWni/Fn04=; b=q+r4d0xfPZogC/Th2q72e+AeBx5mWOI9xQx5ortuLb1qxx3KCaIBDTR0mhjuHR0WyG JVZCHOFQnL7uvONkSbhGtwrJ0ssShxsF0iWWuGbRwuFHvrgo3IgHLEociKs1z98KOeNd tz7uMRbNbSzvxpnHlhPdvDShptMfsWk65t5J2q56MJ873rQNUh+fqi8cMPTwInB57FfU wBonhyaPvoYxPGHZ0PMVMgC7bxWc1OMCVotnjO+G6q+WP2VxsOjR/WyO+5bf3nV29LwZ KQQL+vJ5jchEQpfKWYIXNC43oZ0NhM/MaAtzV+ivBgr7EbK89GxXtFbe5cPPsB/w+Y7B EtLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:cc:from:subject:message-id:date:user-agent :mime-version:content-language:content-transfer-encoding; bh=ks41rjgB85sdQFa/h6liQYyhAz7syt9LZkHWni/Fn04=; b=pCF5bt+7rXWHtOxowjtPwYOa955lhNA7CHE+4d82Pv2TdqLfvMMGPDx54rCGDn/7Op SkZ/hiAzm1N+KE+i2b0aNOf/S/AEUYGTn94BoDo/AlIiG6TTkJVj//WbpOkCw3oXhWe1 yty/tGXS8LOQX7y9cdI/SoDJ9jDVwg4g//s6tffZSKuuOahySRllKb/ho7tPyKHwYfm+ 0Ln13gq68FbI8+D6bT40PxgPA189HW+0u6xe/TJxLMrFxl860VLCpmWxbfmK1QQ0VZfD sI45GoxyE4p7kRO7y/VvL3a66uskJsDzHJqszC8wqFNAAOJ2ESvfvPs5DwrTaHL0rIxQ DxBw== X-Gm-Message-State: APt69E1GTVfnLYA+Eew2aYR7vCQH9mriwl1AbowoId/Q0h4gKTTL3M9X V9VEXYU504YMMr1ORhZFZPmoTw== X-Google-Smtp-Source: AAOMgpfGFUm0ntS7cRdTt0whFtk6nQMONyjbBh1PTDn4pGyi8uWGaNuJmpIPlDDsJ0jX/1vXv6Czrw== X-Received: by 2002:a1c:dc1:: with SMTP id 184-v6mr6680770wmn.145.1530650102374; Tue, 03 Jul 2018 13:35:02 -0700 (PDT) Received: from ?IPv6:2003:ea:8bd4:d600:54a4:f0:2d19:cebb? (p200300EA8BD4D60054A400F02D19CEBB.dip0.t-ipconnect.de. [2003:ea:8bd4:d600:54a4:f0:2d19:cebb]) by smtp.googlemail.com with ESMTPSA id 131-v6sm4866418wmm.31.2018.07.03.13.35.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 Jul 2018 13:35:01 -0700 (PDT) To: Andrew Lunn , Florian Fainelli , David Miller Cc: "netdev@vger.kernel.org" From: Heiner Kallweit Subject: [PATCH net] net: phy: fix flag masking in __set_phy_supported Message-ID: Date: Tue, 3 Jul 2018 22:34:54 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.8.0 MIME-Version: 1.0 Content-Language: en-US Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Currently also the pause flags are removed from phydev->supported because they're not included in PHY_DEFAULT_FEATURES. I don't think this is intended, especially when considering that this function can be called via phy_set_max_speed() anywhere in a driver. Change the masking to mask out only the values we're going to change. In addition remove the misleading comment, job of this small function is just to adjust the supported and advertised speeds. Fixes: f3a6bd393c2c ("phylib: Add phy_set_max_speed helper") Signed-off-by: Heiner Kallweit Reviewed-by: Andrew Lunn Reviewed-by: Florian Fainelli --- drivers/net/phy/phy_device.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index bd0f339f..b9f5f40a 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -1724,11 +1724,8 @@ EXPORT_SYMBOL(genphy_loopback); static int __set_phy_supported(struct phy_device *phydev, u32 max_speed) { - /* The default values for phydev->supported are provided by the PHY - * driver "features" member, we want to reset to sane defaults first - * before supporting higher speeds. - */ - phydev->supported &= PHY_DEFAULT_FEATURES; + phydev->supported &= ~(PHY_1000BT_FEATURES | PHY_100BT_FEATURES | + PHY_10BT_FEATURES); switch (max_speed) { default: