Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1582959
| Path | csiph.com!news.redatomik.org!aioe.org!bofh.it!news.nic.it!robomod |
|---|---|
| From | Philippe Reynes <tremyfr@gmail.com> |
| Newsgroups | linux.kernel |
| Subject | [PATCH] net: hamachi: use new api ethtool_{get|set}_link_ksettings |
| Date | Thu, 16 Feb 2017 22:50:01 +0100 |
| Message-ID | <tbC65-3M4-3@gated-at.bofh.it> (permalink) |
| X-Original-To | davem@davemloft.net, mugunthanvnm@ti.com, a@unstable.cc, fw@strlen.de, jarod@redhat.com |
| Dkim-Signature | v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=3uSps3dxtLPI/zNNhwYMw8Wjyox2b1uZrWVUUW+SVnY=; b=NUlEris5OsrSB5NT0p3sasQf2016kWrL5Ipqs1FSJnXPLj9g9HQd4LlsduDzkHsdXf nWL81iNVSByzRLu5594J159OdVW1BtVVxu6pQ2q13FBtlRggvW0P6h8MKOCWrX6cQRW+ HuWh6+1qN/lqYq4OgbtAXNzVW4BCDt7Lrn8dA5B0W7NRqGAkW9gRNBYP7aAAShQBmDVm v/rBeQuCYa1uGDnGxA8dsEDjr+C7nDOy+Mky4ImmfROmRG8g8c5ZYpFgg7zla82O5GPZ dz41Zr+dSpLoCCq4DyVNEWzOUgWpZ6Qx9o7uS0FShtr/aRLFGuotu83UHzF4pMvqISmB x+SA== |
| X-Google-Dkim-Signature | v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=3uSps3dxtLPI/zNNhwYMw8Wjyox2b1uZrWVUUW+SVnY=; b=t4ZoJ4tKXRO8e8rKYg94NsLt2Y3CPUEs39lES7iVfhz/3C36wU3bMmlFHGV4T7y2p5 XH3ZDwlwSARSg3kt2Vg6oQKTGn6DT2XbaWDMrwxeRSheNXLXcCD/dYECR8B53Ffn8uGn I4gMD8soQl3X/ZKs69CIqxTr/+2deMKoxzU4XYfuRtIrfz7pjp9nJ1vcaH0umIX+wMFO cIoRUE2uCzpsr+ZOMYFMxY1mAgZyWnJOYfAvz8poJfnP7Uo3L2RvVgSs0w5VuPG2uBiV /jUyEixb2n0XIGu7OFFu4s8vDrs0lmtiHOOjJrUFWHkx4Vy2pql12Dw5hhH1qX5707Y3 ItYQ== |
| X-Gm-Message-State | AMke39nvwadDZEKdrPTIFIl0knpcKT9795dRFS24drUAipXcrrr9xeyjH3piZVsT3yq+Ww== |
| X-Received | by 10.28.35.65 with SMTP id j62mr3882164wmj.31.1487281584030; Thu, 16 Feb 2017 13:46:24 -0800 (PST) |
| X-Mailer | git-send-email 1.7.4.4 |
| Sender | robomod@news.nic.it |
| List-ID | <linux-kernel.vger.kernel.org> |
| X-Mailing-List | linux-kernel@vger.kernel.org |
| Approved | robomod@news.nic.it |
| Lines | 58 |
| Organization | linux.* mail to news gateway |
| X-Original-Cc | netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Philippe Reynes <tremyfr@gmail.com> |
| X-Original-Date | Thu, 16 Feb 2017 22:46:14 +0100 |
| X-Original-Message-ID | <1487281574-30613-1-git-send-email-tremyfr@gmail.com> |
| X-Original-Sender | linux-kernel-owner@vger.kernel.org |
| Xref | csiph.com linux.kernel:1582959 |
Show key headers only | View raw
The ethtool api {get|set}_settings is deprecated.
We move this driver to new api {get|set}_link_ksettings.
As I don't have the hardware, I'd be very pleased if
someone may test this patch.
Signed-off-by: Philippe Reynes <tremyfr@gmail.com>
---
drivers/net/ethernet/packetengines/hamachi.c | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ethernet/packetengines/hamachi.c b/drivers/net/ethernet/packetengines/hamachi.c
index baff744..8b026db 100644
--- a/drivers/net/ethernet/packetengines/hamachi.c
+++ b/drivers/net/ethernet/packetengines/hamachi.c
@@ -1811,21 +1811,23 @@ static void hamachi_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *
strlcpy(info->bus_info, pci_name(np->pci_dev), sizeof(info->bus_info));
}
-static int hamachi_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
+static int hamachi_get_link_ksettings(struct net_device *dev,
+ struct ethtool_link_ksettings *cmd)
{
struct hamachi_private *np = netdev_priv(dev);
spin_lock_irq(&np->lock);
- mii_ethtool_gset(&np->mii_if, ecmd);
+ mii_ethtool_get_link_ksettings(&np->mii_if, cmd);
spin_unlock_irq(&np->lock);
return 0;
}
-static int hamachi_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
+static int hamachi_set_link_ksettings(struct net_device *dev,
+ const struct ethtool_link_ksettings *cmd)
{
struct hamachi_private *np = netdev_priv(dev);
int res;
spin_lock_irq(&np->lock);
- res = mii_ethtool_sset(&np->mii_if, ecmd);
+ res = mii_ethtool_set_link_ksettings(&np->mii_if, cmd);
spin_unlock_irq(&np->lock);
return res;
}
@@ -1845,10 +1847,10 @@ static u32 hamachi_get_link(struct net_device *dev)
static const struct ethtool_ops ethtool_ops = {
.begin = check_if_running,
.get_drvinfo = hamachi_get_drvinfo,
- .get_settings = hamachi_get_settings,
- .set_settings = hamachi_set_settings,
.nway_reset = hamachi_nway_reset,
.get_link = hamachi_get_link,
+ .get_link_ksettings = hamachi_get_link_ksettings,
+ .set_link_ksettings = hamachi_set_link_ksettings,
};
static const struct ethtool_ops ethtool_ops_no_mii = {
--
1.7.4.4
Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread
[PATCH] net: hamachi: use new api ethtool_{get|set}_link_ksettings Philippe Reynes <tremyfr@gmail.com> - 2017-02-16 22:50 +0100
Re: [PATCH] net: hamachi: use new api ethtool_{get|set}_link_ksettings David Miller <davem@davemloft.net> - 2017-02-17 20:10 +0100
csiph-web