From: David Daney <ddaney.cavm@gmail.com>
To: linux-mips@linux-mips.org, ralf@linux-mips.org,
"David S. Miller" <davem@davemloft.net>,
netdev@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, David Daney <david.daney@cavium.com>
Subject: [PATCH 4/8] netdev: octeon_mgmt: Improve ethtool_ops.
Date: Tue, 21 Aug 2012 11:45:08 -0700 [thread overview]
Message-ID: <1345574712-21444-5-git-send-email-ddaney.cavm@gmail.com> (raw)
In-Reply-To: <1345574712-21444-1-git-send-email-ddaney.cavm@gmail.com>
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
next prev parent reply other threads:[~2012-08-21 18:45 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-21 18:45 [PATCH 0/8] netdev/MIPS: Improvements to octeon_mgmt Ethernet driver David Daney
2012-08-21 18:45 ` [PATCH 1/8] MIPS: Octeon: Add octeon_io_clk_delay() function David Daney
2012-08-21 18:45 ` [PATCH 2/8] netdev: octeon_mgmt: Add support for 1Gig ports David Daney
2012-08-21 18:45 ` [PATCH 3/8] netdev: octeon_mgmt: Add hardware timestamp support David Daney
2012-08-21 18:45 ` David Daney [this message]
2012-08-21 18:45 ` [PATCH 5/8] netdev: octeon_mgmt: Set the parent device David Daney
2012-08-21 18:45 ` [PATCH 6/8] netdev: octeon_mgmt: Cleanup and modernize MAC address handling David Daney
2012-08-21 18:45 ` [PATCH 7/8] netdev: octeon_mgmt: Remove some useless 'inline' David Daney
2012-08-21 18:45 ` [PATCH 8/8] netdev: octeon_mgmt: Make multi-line comment style consistent David Daney
2012-08-23 2:16 ` [PATCH 0/8] netdev/MIPS: Improvements to octeon_mgmt Ethernet driver David Miller
2012-08-23 6:35 ` John Crispin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1345574712-21444-5-git-send-email-ddaney.cavm@gmail.com \
--to=ddaney.cavm@gmail.com \
--cc=davem@davemloft.net \
--cc=david.daney@cavium.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=netdev@vger.kernel.org \
--cc=ralf@linux-mips.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).