From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
To: netdev@vger.kernel.org
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Subject: [PATCH v2 1/9] ftgmac100: Add ethtool n-way reset call
Date: Thu, 13 Apr 2017 14:39:08 +1000 [thread overview]
Message-ID: <20170413043916.7793-2-benh@kernel.crashing.org> (raw)
In-Reply-To: <20170413043916.7793-1-benh@kernel.crashing.org>
A non-wired up implementation accidentally made its way in
a previous patch (Make ring sizes configurable via ethtool).
This removes it and wires up the generic phy_ethtool_nway_reset
instead.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
--
v2. - Use phy_ethtool_nway_reset() instead of custom implementation
---
drivers/net/ethernet/faraday/ftgmac100.c | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c
index 796b37e..66a5065 100644
--- a/drivers/net/ethernet/faraday/ftgmac100.c
+++ b/drivers/net/ethernet/faraday/ftgmac100.c
@@ -1043,13 +1043,6 @@ static void ftgmac100_get_drvinfo(struct net_device *netdev,
strlcpy(info->bus_info, dev_name(&netdev->dev), sizeof(info->bus_info));
}
-static int ftgmac100_nway_reset(struct net_device *ndev)
-{
- if (!ndev->phydev)
- return -ENXIO;
- return phy_start_aneg(ndev->phydev);
-}
-
static void ftgmac100_get_ringparam(struct net_device *netdev,
struct ethtool_ringparam *ering)
{
@@ -1088,6 +1081,7 @@ static const struct ethtool_ops ftgmac100_ethtool_ops = {
.get_link = ethtool_op_get_link,
.get_link_ksettings = phy_ethtool_get_link_ksettings,
.set_link_ksettings = phy_ethtool_set_link_ksettings,
+ .nway_reset = phy_ethtool_nway_reset,
.get_ringparam = ftgmac100_get_ringparam,
.set_ringparam = ftgmac100_set_ringparam,
};
--
2.9.3
next prev parent reply other threads:[~2017-04-13 4:39 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-13 4:39 [PATCH v2 0/9] ftgmac100: Rework batch 5 - Features Benjamin Herrenschmidt
2017-04-13 4:39 ` Benjamin Herrenschmidt [this message]
2017-04-13 4:39 ` [PATCH v2 2/9] ftgmac100: Add pause frames configuration and support Benjamin Herrenschmidt
2017-04-13 4:39 ` [PATCH v2 3/9] ftgmac100: Add ndo_set_rx_mode() and support for multicast & promisc Benjamin Herrenschmidt
2017-04-13 4:39 ` [PATCH v2 4/9] ftgmac100: Add vlan HW offload Benjamin Herrenschmidt
2017-04-13 4:39 ` [PATCH v2 5/9] ftgmac100: Add netpoll support Benjamin Herrenschmidt
2017-04-13 4:39 ` [PATCH v2 6/9] ftgmac100: Allow configuration of phy interface via device-tree Benjamin Herrenschmidt
2017-04-13 4:39 ` [PATCH v2 7/9] ftgmac100: Display the discovered PHY device info Benjamin Herrenschmidt
2017-04-13 4:39 ` [PATCH v2 8/9] ftgmac100: Fix potential ordering issue in NAPI poll Benjamin Herrenschmidt
2017-04-13 4:39 ` [PATCH v2 9/9] ftgmac100: Document device-tree binding Benjamin Herrenschmidt
2017-04-17 15:11 ` [PATCH v2 0/9] ftgmac100: Rework batch 5 - Features David Miller
2017-04-17 20:44 ` Benjamin Herrenschmidt
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=20170413043916.7793-2-benh@kernel.crashing.org \
--to=benh@kernel.crashing.org \
--cc=netdev@vger.kernel.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).