Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ec1d8ccb authored by Hangbin Liu's avatar Hangbin Liu Committed by David S. Miller
Browse files

vlan: also check phy_driver ts_info for vlan's real device 



Just like function ethtool_get_ts_info(), we should also consider the
phy_driver ts_info call back. For example, driver dp83640.

Fixes: 37dd9255 ("vlan: Pass ethtool get_ts_info queries to real device.")
Acked-by: default avatarRichard Cochran <richardcochran@gmail.com>
Signed-off-by: default avatarHangbin Liu <liuhangbin@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c0b458a9

net/8021q/vlan_dev.c

+5 −1
Original line number Diff line number Diff line
@@ -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 |