aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark D Rustad <mark.d.rustad@intel.com>2016-08-31 10:34:28 -0700
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2017-10-09 07:43:06 -0700
commite0f06bba9629987fb3ec1d6928bf17ef689702e8 (patch)
tree15fe0f6169be03e7effa68760bae625013cf6ea6
parenttipc: Unclone message at secondary destination lookup (diff)
downloadlinux-dev-e0f06bba9629987fb3ec1d6928bf17ef689702e8.tar.xz
linux-dev-e0f06bba9629987fb3ec1d6928bf17ef689702e8.zip
ixgbe: Return error when getting PHY address if PHY access is not supported
In cases where PHY register access is not supported, don't mislead a caller into thinking that it is supported by returning a PHY address. Instead, return -EOPNOTSUPP when PHY access is not supported. Signed-off-by: Mark Rustad <mark.d.rustad@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
-rw-r--r--drivers/net/ethernet/intel/ixgbe/ixgbe_main.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index d962368d08d0..822cdb4f2c25 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -8529,6 +8529,10 @@ static int ixgbe_ioctl(struct net_device *netdev, struct ifreq *req, int cmd)
return ixgbe_ptp_set_ts_config(adapter, req);
case SIOCGHWTSTAMP:
return ixgbe_ptp_get_ts_config(adapter, req);
+ case SIOCGMIIPHY:
+ if (!adapter->hw.phy.ops.read_reg)
+ return -EOPNOTSUPP;
+ /* fall through */
default:
return mdio_mii_ioctl(&adapter->hw.phy.mdio, if_mii(req), cmd);
}