netdev - Re: [PATCH 1/2] Revert "net: fec: Use a spinlock to guard `fep->ptp_clk

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:   Wed, 14 Sep 2022 10:38:11 +0200
From:   Marc Kleine-Budde <mkl@...gutronix.de>
To:     Csókás Bence <Csokas.Bence@...lan.hu>
Cc:     Bence Csókás <bence98@....bme.hu>,
        "netdev@...r.kernel.org" <netdev@...r.kernel.org>,
        Richard Cochran <richardcochran@...il.com>,
        "David S . Miller" <davem@...emloft.net>,
        Jakub Kicinski <kuba@...nel.org>,
        Francesco Dolcini <francesco.dolcini@...adex.com>,
        Andrew Lunn <andrew@...n.ch>,
        Guenter Roeck <linux@...ck-us.net>,
        "kernel@...gutronix.de" <kernel@...gutronix.de>
Subject: Re: [PATCH 1/2] Revert "net: fec: Use a spinlock to guard
 `fep->ptp_clk_on`"

On 13.09.2022 19:04:56, Csókás Bence wrote:
> > This is not a 100% revert.
> > 
> > In b353b241f1eb ("net: fec: Use a spinlock to guard `fep->ptp_clk_on`")
> > the "struct fec_enet_private *fep" was renamed to "struct
> > fec_enet_private *adapter" for no apparent reason. The driver uses "fep"
> > everywhere else. This revert doesn't restore the original state.
> 
> You got that backwards. b353b241f1eb renamed `adapter` to `fep` to align
> it with the rest of the driver.

Doh! You're right - sorry about that.

> I decided to amend the revert to keep this renaming.
> `adapter` was introduced in 6605b73 when `fec_ptp.c` was created.
> 
> > This leads to the following diff against a 100% revert.
> > 
> > diff --git a/drivers/net/ethernet/freescale/fec_ptp.c b/drivers/net/ethernet/freescale/fec_ptp.c
> > index c99dff3c3422..c74d04f4b2fd 100644
> > --- a/drivers/net/ethernet/freescale/fec_ptp.c
> > +++ b/drivers/net/ethernet/freescale/fec_ptp.c
> > @@ -365,21 +365,21 @@ static int fec_ptp_adjtime(struct ptp_clock_info *ptp, s64 delta)
> >   */
> >  static int fec_ptp_gettime(struct ptp_clock_info *ptp, struct timespec64 *ts)
> >  {
> > -       struct fec_enet_private *fep =
> > +       struct fec_enet_private *adapter =
> 
> Here you can clearly see the nature of my amend. 

Please don't mix fixes and especially reverts with cleanups.

> I thought I added this to the commit message,
> but it seems I have forgot.

regards,
Marc

-- 
Pengutronix e.K.                 | Marc Kleine-Budde           |
Embedded Linux                   | https://www.pengutronix.de  |
Vertretung West/Dortmund         | Phone: +49-231-2826-924     |
Amtsgericht Hildesheim, HRA 2686 | Fax:   +49-5121-206917-5555 |

Download attachment "signature.asc" of type "application/pgp-signature" (489 bytes)