]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
vlan: also check phy_driver ts_info for vlan's real device
authorHangbin Liu <liuhangbin@gmail.com>
Fri, 30 Mar 2018 01:44:00 +0000 (09:44 +0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 2 Apr 2018 00:53:50 +0000 (20:53 -0400)
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 <richardcochran@gmail.com>
Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/8021q/vlan_dev.c

index f7e83f6d2e64ade531f53f366a069c2afcabfdef..236452ebbd9ea68fae4820ae3c2946cac7ada6f1 100644 (file)
@@ -29,6 +29,7 @@
 #include <linux/net_tstamp.h>
 #include <linux/etherdevice.h>
 #include <linux/ethtool.h>
+#include <linux/phy.h>
 #include <net/arp.h>
 #include <net/switchdev.h>
 
@@ -665,8 +666,11 @@ static int vlan_ethtool_get_ts_info(struct net_device *dev,
 {
        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 |