From patchwork Thu Dec 26 02:16:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Cochran X-Patchwork-Id: 1215401 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 (no SPF record) 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="oYSpy1U9"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 47jtqk1VbVz9sP3 for ; Thu, 26 Dec 2019 13:16:34 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726976AbfLZCQ2 (ORCPT ); Wed, 25 Dec 2019 21:16:28 -0500 Received: from mail-pf1-f194.google.com ([209.85.210.194]:35937 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726943AbfLZCQ1 (ORCPT ); Wed, 25 Dec 2019 21:16:27 -0500 Received: by mail-pf1-f194.google.com with SMTP id x184so12542659pfb.3; Wed, 25 Dec 2019 18:16:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=TUdlEwyS6RYa1hXdLY5fHxlvIjKv50oIs66wiKRqcgw=; b=oYSpy1U92nFgQ0nGXyCQL4x8poBXo/b57v154rK9ql0BosjHnslmxLRab7P6xD0Qbz ghhslEJxXA8jt2OhTQTyoVmYHe/K0SQa6w6/ShCM0HO12CVPR3iwK23vgWTuma+CrcmT E2wL87i9xSPwcM1NcPHLWAVVF3zelQ26PzdLAk8BCK/1LhAofUchpQUL1NJ8MXWsUqkr n/UBJxqbps2n1bc50opO1e0aC8hEQc6+/dDg3ZXiDickaf6nPBER9J0H5mVRYdBb1XPS jnqHlRAtSn4R3cyTlfzs731BEbGhdXR4HPl9Z76GswgbSPKKBClR16h0eYposeTbTBu5 YseA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=TUdlEwyS6RYa1hXdLY5fHxlvIjKv50oIs66wiKRqcgw=; b=mrsrBLYbmDvqFnu0+hJK0tSxJsfiD89rqUk/8R83PNeZDtnbdfIRQoeQnEMmHbJW6V JEaCqi8XtagO7Mz01fNFzlILTgpg8shUMbYy2QWp7VLEIAIAaMM+d3cigGS62maFhKGa 3VPa+pkAzyJysiF8DQkr5x3b+/uBj4NHLO3b3Mzeb9sHXdJ5UeqDJlktyil9XPVAo4TC 3NuEHU2AzvYJoa/dFSYjKZ/icOM+P2xlzVSvGzZSYMvWDEwq1XHJHcXbwtp4qq1Nv3zk WRmuc11zA5UdIpUH9Oh/gjASxMbyxIh2RCN1QIBs7llTqm7ZbGAypfSsvEEPK3GrJOTd 52YQ== X-Gm-Message-State: APjAAAUq2EEnZQq411nHaqE7COWtGF1Jl6K/j241tOB+4fvf/Fj4wKyH PP54iPOtqZRa42nYuOzIFx3K5xKu X-Google-Smtp-Source: APXvYqxVYZf0HRIiWnI2s6hTYV6TSLa6oXIXJjrQD/5nJCQddXqAQ5wPoK9vBjd053xGgzBM/Ot3pw== X-Received: by 2002:a65:680f:: with SMTP id l15mr47573379pgt.307.1577326586638; Wed, 25 Dec 2019 18:16:26 -0800 (PST) Received: from localhost.localdomain (c-73-241-114-122.hsd1.ca.comcast.net. [73.241.114.122]) by smtp.gmail.com with ESMTPSA id b65sm31880723pgc.18.2019.12.25.18.16.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Dec 2019 18:16:25 -0800 (PST) From: Richard Cochran To: netdev@vger.kernel.org Cc: David Miller , devicetree@vger.kernel.org, Andrew Lunn , Florian Fainelli , Heiner Kallweit , Jacob Keller , Jakub Kicinski , Mark Rutland , Miroslav Lichvar , Murali Karicheri , Rob Herring , Willem de Bruijn , Wingman Kwok Subject: [PATCH V9 net-next 03/12] net: vlan: Use the PHY time stamping interface. Date: Wed, 25 Dec 2019 18:16:11 -0800 Message-Id: <1febd2b2d0a5bd99d70e9e46e8d794bbf8d118cd.1577326042.git.richardcochran@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: References: MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The vlan layer tests fields of the phy_device in order to determine whether to invoke the PHY's tsinfo ethtool callback. This patch replaces the open coded logic with an invocation of the proper methods. Signed-off-by: Richard Cochran Reviewed-by: Andrew Lunn Reviewed-by: Florian Fainelli --- net/8021q/vlan_dev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c index e5bff5cc6f97..5ff8059837b4 100644 --- a/net/8021q/vlan_dev.c +++ b/net/8021q/vlan_dev.c @@ -646,8 +646,8 @@ static int vlan_ethtool_get_ts_info(struct net_device *dev, const struct ethtool_ops *ops = vlan->real_dev->ethtool_ops; struct phy_device *phydev = vlan->real_dev->phydev; - if (phydev && phydev->drv && phydev->drv->ts_info) { - return phydev->drv->ts_info(phydev, info); + if (phy_has_tsinfo(phydev)) { + return phy_ts_info(phydev, info); } else if (ops->get_ts_info) { return ops->get_ts_info(vlan->real_dev, info); } else {