From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-807177-1523400219-5-8503858899509385429 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.25, MAILING_LIST_MULTI -1, ME_NOAUTH 0.01, RCVD_IN_DNSWL_HI -5, LANGUAGES enroca, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='org', MailFrom='org' X-Spam-charsets: plain='UTF-8' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=fm2; t= 1523400219; b=pyfGYZwPSkFraBL0F42hp+WMR1xiHldBqn+Nxx9fr9TTMuQvmr Ac3kT1E0kJdkKhfTUlKYe8fswDnCmAVICoqI1fSHb9H3/ElNGih59u5Qu4MrJVw9 /meH3GIx9FYEDJ1QbMaiyHBrGkUzkNsBAKA++bhmklygvqDkNN2E0//zBp6l8Qh0 dgmUMhMqgN1MtMHzpzFFqPUGOifkLD6Zj7zOJR/PKg43pgK4M2XHpEn5zx8Ag92Y 9oeDl90qGQYETvoFVQW0SMLNsa/NG59vCu0vUSU9MMqh1iUi8dGAgpJ2q/eR7sW7 Pof5Re/dyRNH/1EhVJMVqXBNqVdOGlaJ8mFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-type:sender :list-id; s=fm2; t=1523400219; bh=SoFXbaXVNMI8Wo2nbL+bQEbQCPXeKi zCa71BawKCosI=; b=PbxWDbcBqDXmqOTwv2sEfRiFQkgNdLiSoRGrCFmPNIGT0f tQSAih8C7Apa3xaZc1uF163ftbVphkZbR6TP7ApoWc8zbMqfuMr4m19eqln3jlVQ Q7DB008jikBt+LPi7IBf+Js33qwhD1feHRk7oSNHEpSv6Uqqj1uQ1vuNUBtsICCA +cjR8rRxlzNYlqf323npIEyvPeq779WUoHLFQyqjzKimZdktGOnsSI7xVJIWMLZT kLkKZvr3IBLMrZsHgSzOEgPq5mnnPPfjp10VFE0sRW8A7dIta/WuKmbtKjsQ4ARn EutVBXHy4zqJLnaHT/UAZrtRA9iYjAh3jvT+Qc6A== ARC-Authentication-Results: i=1; mx2.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,has-list-id=yes,d=none) header.from=linuxfoundation.org; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-cm=none score=0; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=linuxfoundation.org header.result=pass header_is_org_domain=yes; x-vs=clean score=-100 state=0 Authentication-Results: mx2.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,has-list-id=yes,d=none) header.from=linuxfoundation.org; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-cm=none score=0; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=linuxfoundation.org header.result=pass header_is_org_domain=yes; x-vs=clean score=-100 state=0 X-ME-VSCategory: clean X-CM-Envelope: MS4wfKwwyw5z6wbjDXQX5cbwPhI/GMOph7cQIcWZdwE5i1UirwnYdoR+a5PDMWXu9JvA+go1oMWUOhkomUvLIycjY2Ga1UJAawQ1rBFzZoUw22artPpjpfVh F2YVkqHyvKGBSSOMU/cDV0boTf9pM3L91HDbLugDvxy0LJrKc7gt0U8oArE9s8Roc2rOcrTI1BSu3k14SPnLoLg+wnKE8Q8MdCOv1p1WMySRM7XUeszLznzX X-CM-Analysis: v=2.3 cv=E8HjW5Vl c=1 sm=1 tr=0 a=UK1r566ZdBxH71SXbqIOeA==:117 a=UK1r566ZdBxH71SXbqIOeA==:17 a=IkcTkHD0fZMA:10 a=Kd1tUaAdevIA:10 a=pGLkceISAAAA:8 a=J1Y8HTJGAAAA:8 a=ag1SF4gXAAAA:8 a=B8s8FRZQZouqPVZreGMA:9 a=QEXdDO2ut3YA:10 a=y1Q9-5lHfBjTkpIzbSAN:22 a=Yupwre4RP9_Eg_Bd0iYG:22 X-ME-CMScore: 0 X-ME-CMCategory: none Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756089AbeDJWjl (ORCPT ); Tue, 10 Apr 2018 18:39:41 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:45498 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756072AbeDJWjj (ORCPT ); Tue, 10 Apr 2018 18:39:39 -0400 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Richard Cochran , Hangbin Liu , "David S. Miller" Subject: [PATCH 4.14 112/138] vlan: also check phy_driver ts_info for vlans real device Date: Wed, 11 Apr 2018 00:25:02 +0200 Message-Id: <20180410212915.191689569@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180410212902.121524696@linuxfoundation.org> References: <20180410212902.121524696@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Hangbin Liu [ Upstream commit ec1d8ccb07deaf30fd0508af6755364ac47dc08d ] Just like function ethtool_get_ts_info(), we should also consider the phy_driver ts_info call back. For example, driver dp83640. Fixes: 37dd9255b2f6 ("vlan: Pass ethtool get_ts_info queries to real device.") Acked-by: Richard Cochran Signed-off-by: Hangbin Liu Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/8021q/vlan_dev.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) --- a/net/8021q/vlan_dev.c +++ b/net/8021q/vlan_dev.c @@ -29,6 +29,7 @@ #include #include #include +#include #include #include @@ -665,8 +666,11 @@ static int vlan_ethtool_get_ts_info(stru { const struct vlan_dev_priv *vlan = vlan_dev_priv(dev); const struct ethtool_ops *ops = vlan->real_dev->ethtool_ops; + struct phy_device *phydev = vlan->real_dev->phydev; - if (ops->get_ts_info) { + if (phydev && phydev->drv && phydev->drv->ts_info) { + return phydev->drv->ts_info(phydev, info); + } else if (ops->get_ts_info) { return ops->get_ts_info(vlan->real_dev, info); } else { info->so_timestamping = SOF_TIMESTAMPING_RX_SOFTWARE |