Commit ccd21ec5 authored by Tom Rix's avatar Tom Rix Committed by David S. Miller
Browse files

ethtool: use phydev variable 



In ethtool_get_phy_stats(), the phydev varaible is set to
dev->phydev but dev->phydev is still used.  Replace
dev->phydev uses with phydev.

Signed-off-by: default avatarTom Rix <trix@redhat.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8876769b

net/ethtool/ioctl.c

+4 −4
Original line number Diff line number Diff line
@@ -2096,9 +2096,9 @@ static int ethtool_get_phy_stats(struct net_device *dev, void __user *useraddr) 
	if (!phydev && (!ops->get_ethtool_phy_stats || !ops->get_sset_count))

		return -EOPNOTSUPP;



	if (dev->phydev && !ops->get_ethtool_phy_stats &&

	if (phydev && !ops->get_ethtool_phy_stats &&

	    phy_ops && phy_ops->get_sset_count)

		n_stats = phy_ops->get_sset_count(dev->phydev);

		n_stats = phy_ops->get_sset_count(phydev);

	else

		n_stats = ops->get_sset_count(dev, ETH_SS_PHY_STATS);

	if (n_stats < 0)
@@ -2117,9 +2117,9 @@ static int ethtool_get_phy_stats(struct net_device *dev, void __user *useraddr) 
		if (!data)

			return -ENOMEM;



		if (dev->phydev && !ops->get_ethtool_phy_stats &&

		if (phydev && !ops->get_ethtool_phy_stats &&

		    phy_ops && phy_ops->get_stats) {

			ret = phy_ops->get_stats(dev->phydev, &stats, data);

			ret = phy_ops->get_stats(phydev, &stats, data);

			if (ret < 0)

				goto out;

		} else {