| To: | linux-mips@linux-mips.org, ralf@linux-mips.org, "David S. Miller" <davem@davemloft.net>, netdev@vger.kernel.org |
|---|---|
| Subject: | [PATCH 4/8] netdev: octeon_mgmt: Improve ethtool_ops. |
| From: | David Daney <ddaney.cavm@gmail.com> |
| Date: | Tue, 21 Aug 2012 11:45:08 -0700 |
| Cc: | linux-kernel@vger.kernel.org, David Daney <david.daney@cavium.com> |
| Dkim-signature: | v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=NDXuOP3XVTDnd621xVKfXwFApD/xlJu2S7WcCTQUBIM=; b=YNxNJHYVkVn+yBIXvgj9acklHsXxxF8yKHG62PwNHKPGU3wrONtfhV/mUFjADplnE3 lQbTWvDOsnxG2aYOdZ8tq6tHe3mbRvQ220b2vjrs65HrPPiBTrF5E75N+/EeKeA9lwaL S/+vinIh5NOE/wBg06m5JFiD0fnVhEUHNkvgPkOHCDKgIAPyLUsZKkjxmoVkZtc9OgNe Tfziv15j0RuzS1HUM81XCfdtMLAEvIKzUbF16t1/LbxOyuqPMXYbNid65R+9r55pHBZZ m3FB3kdJ01mN6tw7C81oCMmjaoFaSJF9Szk/yNVufotZMQx9fCHOt1hJNXba3v26Shgq 5I1g== |
| In-reply-to: | <1345574712-21444-1-git-send-email-ddaney.cavm@gmail.com> |
| List-archive: | <http://www.linux-mips.org/archives/linux-mips/> |
| List-help: | <mailto:ecartis@linux-mips.org?Subject=help> |
| List-id: | linux-mips <linux-mips.eddie.linux-mips.org> |
| List-owner: | <mailto:ralf@linux-mips.org> |
| List-post: | <mailto:linux-mips@linux-mips.org> |
| List-software: | Ecartis version 1.0.0 |
| List-subscribe: | <mailto:ecartis@linux-mips.org?subject=subscribe%20linux-mips> |
| List-unsubscribe: | <mailto:ecartis@linux-mips.org?subject=unsubscribe%20linux-mips> |
| References: | <1345574712-21444-1-git-send-email-ddaney.cavm@gmail.com> |
| Sender: | linux-mips-bounce@linux-mips.org |
From: David Daney <david.daney@cavium.com>
Correctly show no link when the interface is down, and return
-EOPNOTSUPP for things that don't work. This quiets the ethtool
program when run on down interfaces.
Signed-off-by: David Daney <david.daney@cavium.com>
---
drivers/net/ethernet/octeon/octeon_mgmt.c | 22 ++++++++++++++++++----
1 file changed, 18 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/octeon/octeon_mgmt.c
b/drivers/net/ethernet/octeon/octeon_mgmt.c
index 687a6a0..cf06cf2 100644
--- a/drivers/net/ethernet/octeon/octeon_mgmt.c
+++ b/drivers/net/ethernet/octeon/octeon_mgmt.c
@@ -1379,7 +1379,7 @@ static int octeon_mgmt_get_settings(struct net_device
*netdev,
if (p->phydev)
return phy_ethtool_gset(p->phydev, cmd);
- return -EINVAL;
+ return -EOPNOTSUPP;
}
static int octeon_mgmt_set_settings(struct net_device *netdev,
@@ -1393,14 +1393,28 @@ static int octeon_mgmt_set_settings(struct net_device
*netdev,
if (p->phydev)
return phy_ethtool_sset(p->phydev, cmd);
- return -EINVAL;
+ return -EOPNOTSUPP;
+}
+
+static int octeon_mgmt_nway_reset(struct net_device *dev)
+{
+ struct octeon_mgmt *p = netdev_priv(dev);
+
+ if (!capable(CAP_NET_ADMIN))
+ return -EPERM;
+
+ if (p->phydev)
+ return phy_start_aneg(p->phydev);
+
+ return -EOPNOTSUPP;
}
static const struct ethtool_ops octeon_mgmt_ethtool_ops = {
.get_drvinfo = octeon_mgmt_get_drvinfo,
- .get_link = ethtool_op_get_link,
.get_settings = octeon_mgmt_get_settings,
- .set_settings = octeon_mgmt_set_settings
+ .set_settings = octeon_mgmt_set_settings,
+ .nway_reset = octeon_mgmt_nway_reset,
+ .get_link = ethtool_op_get_link,
};
static const struct net_device_ops octeon_mgmt_ops = {
--
1.7.11.4
|
| <Prev in Thread] | Current Thread | [Next in Thread> |
|---|---|---|
| ||
| Previous by Date: | [PATCH 2/8] netdev: octeon_mgmt: Add support for 1Gig ports., David Daney |
|---|---|
| Next by Date: | [PATCH 3/8] netdev: octeon_mgmt: Add hardware timestamp support., David Daney |
| Previous by Thread: | [PATCH 2/8] netdev: octeon_mgmt: Add support for 1Gig ports., David Daney |
| Next by Thread: | [PATCH 3/8] netdev: octeon_mgmt: Add hardware timestamp support., David Daney |
| Indexes: | [Date] [Thread] [Top] [All Lists] |