| Message ID | 1480326472-5849-1-git-send-email-yegorslists@googlemail.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Mon, Nov 28, 2016 at 10:47 AM, <yegorslists@googlemail.com> wrote: > From: Yegor Yefremov <yegorslists@googlemail.com> > > This patch adds support for ethtool's '-r' command. Restarting > N-WAY negotiation can be useful to activate newly changed EEE > settings etc. > > Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com> This patch applies on top of http://marc.info/?l=linux-netdev&m=148032251729251&w=2 Yegor
From: yegorslists@googlemail.com Date: Mon, 28 Nov 2016 10:47:52 +0100 > From: Yegor Yefremov <yegorslists@googlemail.com> > > This patch adds support for ethtool's '-r' command. Restarting > N-WAY negotiation can be useful to activate newly changed EEE > settings etc. > > Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com> This doesn't apply cleanly to net-next.
Hi David, On Wed, Nov 30, 2016 at 1:41 AM, David Miller <davem@davemloft.net> wrote: > From: yegorslists@googlemail.com > Date: Mon, 28 Nov 2016 10:47:52 +0100 > >> From: Yegor Yefremov <yegorslists@googlemail.com> >> >> This patch adds support for ethtool's '-r' command. Restarting >> N-WAY negotiation can be useful to activate newly changed EEE >> settings etc. >> >> Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com> > > This doesn't apply cleanly to net-next. My previous patch [1] doesn't show up in net-next. This could explain, why nway patch doesn't apply. Should I resend them both as series? [1] http://marc.info/?l=linux-omap&m=148036822211869&w=2 Yegor
From: Yegor Yefremov <yegorslists@googlemail.com> Date: Wed, 30 Nov 2016 10:31:30 +0100 > Hi David, > > On Wed, Nov 30, 2016 at 1:41 AM, David Miller <davem@davemloft.net> wrote: >> From: yegorslists@googlemail.com >> Date: Mon, 28 Nov 2016 10:47:52 +0100 >> >>> From: Yegor Yefremov <yegorslists@googlemail.com> >>> >>> This patch adds support for ethtool's '-r' command. Restarting >>> N-WAY negotiation can be useful to activate newly changed EEE >>> settings etc. >>> >>> Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com> >> >> This doesn't apply cleanly to net-next. > > My previous patch [1] doesn't show up in net-next. This could explain, > why nway patch doesn't apply. > Should I resend them both as series? > > [1] http://marc.info/?l=linux-omap&m=148036822211869&w=2 My bad, I sorted this out and applied the nway-reset patch too. Sorry about that.
diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c index df87bff..caec6ac 100644 --- a/drivers/net/ethernet/ti/cpsw.c +++ b/drivers/net/ethernet/ti/cpsw.c @@ -2261,6 +2261,18 @@ static int cpsw_set_eee(struct net_device *ndev, struct ethtool_eee *edata) return -EOPNOTSUPP; } +static int cpsw_nway_reset(struct net_device *ndev) +{ + struct cpsw_priv *priv = netdev_priv(ndev); + struct cpsw_common *cpsw = priv->cpsw; + int slave_no = cpsw_slave_index(cpsw, priv); + + if (cpsw->slaves[slave_no].phy) + return genphy_restart_aneg(cpsw->slaves[slave_no].phy); + else + return -EOPNOTSUPP; +} + static const struct ethtool_ops cpsw_ethtool_ops = { .get_drvinfo = cpsw_get_drvinfo, .get_msglevel = cpsw_get_msglevel, @@ -2286,6 +2298,7 @@ static const struct ethtool_ops cpsw_ethtool_ops = { .set_link_ksettings = cpsw_set_link_ksettings, .get_eee = cpsw_get_eee, .set_eee = cpsw_set_eee, + .nway_reset = cpsw_nway_reset, }; static void cpsw_slave_init(struct cpsw_slave *slave, struct cpsw_common *cpsw,