From: Petko Manolov <petkan@nucleusys.com>
To: Philippe Reynes <tremyfr@gmail.com>
Cc: davem@davemloft.net, linux-usb@vger.kernel.org,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] net: usb: pegasus: use new api ethtool_{get|set}_link_ksettings
Date: Sat, 18 Mar 2017 12:24:13 +0200 [thread overview]
Message-ID: <20170318102413.isi5fgq5qwwng2se@p310> (raw)
In-Reply-To: <1489790044-11867-1-git-send-email-tremyfr@gmail.com>
On 17-03-17 23:34:04, Philippe Reynes wrote:
> 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.
Yep, the patch seems to be working fine on real hardware.
Acked-by: Petko Manolov <petkan@nucleusys.com>
cheers,
Petko
> Signed-off-by: Philippe Reynes <tremyfr@gmail.com>
> ---
> drivers/net/usb/pegasus.c | 14 ++++++++------
> 1 files changed, 8 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/net/usb/pegasus.c b/drivers/net/usb/pegasus.c
> index 3667448..321e059 100644
> --- a/drivers/net/usb/pegasus.c
> +++ b/drivers/net/usb/pegasus.c
> @@ -953,20 +953,22 @@ static inline void pegasus_reset_wol(struct net_device *dev)
> }
>
> static int
> -pegasus_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
> +pegasus_get_link_ksettings(struct net_device *dev,
> + struct ethtool_link_ksettings *ecmd)
> {
> pegasus_t *pegasus;
>
> pegasus = netdev_priv(dev);
> - mii_ethtool_gset(&pegasus->mii, ecmd);
> + mii_ethtool_get_link_ksettings(&pegasus->mii, ecmd);
> return 0;
> }
>
> static int
> -pegasus_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
> +pegasus_set_link_ksettings(struct net_device *dev,
> + const struct ethtool_link_ksettings *ecmd)
> {
> pegasus_t *pegasus = netdev_priv(dev);
> - return mii_ethtool_sset(&pegasus->mii, ecmd);
> + return mii_ethtool_set_link_ksettings(&pegasus->mii, ecmd);
> }
>
> static int pegasus_nway_reset(struct net_device *dev)
> @@ -995,14 +997,14 @@ static void pegasus_set_msglevel(struct net_device *dev, u32 v)
>
> static const struct ethtool_ops ops = {
> .get_drvinfo = pegasus_get_drvinfo,
> - .get_settings = pegasus_get_settings,
> - .set_settings = pegasus_set_settings,
> .nway_reset = pegasus_nway_reset,
> .get_link = pegasus_get_link,
> .get_msglevel = pegasus_get_msglevel,
> .set_msglevel = pegasus_set_msglevel,
> .get_wol = pegasus_get_wol,
> .set_wol = pegasus_set_wol,
> + .get_link_ksettings = pegasus_get_link_ksettings,
> + .set_link_ksettings = pegasus_set_link_ksettings,
> };
>
> static int pegasus_ioctl(struct net_device *net, struct ifreq *rq, int cmd)
> --
> 1.7.4.4
>
>
prev parent reply other threads:[~2017-03-18 10:24 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-17 22:34 [PATCH] net: usb: pegasus: use new api ethtool_{get|set}_link_ksettings Philippe Reynes
2017-03-18 10:24 ` Petko Manolov [this message]
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=20170318102413.isi5fgq5qwwng2se@p310 \
--to=petkan@nucleusys.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=tremyfr@gmail.com \
/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