From 6d51162caccc089cb3c95f04bb1ef2ff7b6aa805 Mon Sep 17 00:00:00 2001 From: Anton Vorontsov Date: Tue, 8 Jan 2008 22:05:55 +0300 Subject: [PATCH] --- yaml --- r: 75434 b: refs/heads/master c: dfd9a421bed2325059fae04f810769b648fa1302 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/fs_enet/fs_enet-main.c | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a6089df2e710..bcdd6534f024 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9ea7d6cb9c223e8b0887b8b0355470acb947a1c9 +refs/heads/master: dfd9a421bed2325059fae04f810769b648fa1302 diff --git a/trunk/drivers/net/fs_enet/fs_enet-main.c b/trunk/drivers/net/fs_enet/fs_enet-main.c index 3e1a57a42f11..c83bd6560088 100644 --- a/trunk/drivers/net/fs_enet/fs_enet-main.c +++ b/trunk/drivers/net/fs_enet/fs_enet-main.c @@ -894,14 +894,21 @@ static void fs_get_regs(struct net_device *dev, struct ethtool_regs *regs, static int fs_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) { struct fs_enet_private *fep = netdev_priv(dev); + + if (!fep->phydev) + return -ENODEV; + return phy_ethtool_gset(fep->phydev, cmd); } static int fs_set_settings(struct net_device *dev, struct ethtool_cmd *cmd) { struct fs_enet_private *fep = netdev_priv(dev); - phy_ethtool_sset(fep->phydev, cmd); - return 0; + + if (!fep->phydev) + return -ENODEV; + + return phy_ethtool_sset(fep->phydev, cmd); } static int fs_nway_reset(struct net_device *dev)