]> git.baikalelectronics.ru Git - kernel.git/commitdiff
ethtool: use phydev variable
authorTom Rix <trix@redhat.com>
Wed, 5 Jan 2022 14:10:20 +0000 (06:10 -0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 6 Jan 2022 12:33:35 +0000 (12:33 +0000)
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: Tom Rix <trix@redhat.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ethtool/ioctl.c

index b2cdba1b4aaec31df5a584e1b768a45c19cff3c0..326e14ee05dbf0cbad221865d883ad1bde7c7df3 100644 (file)
@@ -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 {