netdev - Re: [PATCH] net: enetc: Replace ifdef with IS

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] [thread-next>] [day] [month] [year] [list]

Message-ID: <c47861dae9d339b9033ed71c45160009a7464888.camel@collabora.com>
Date: Tue, 03 Sep 2024 15:00:47 +0100
From: Martyn Welch <martyn.welch@...labora.com>
To: Vadim Fedorenko <vadim.fedorenko@...ux.dev>, Claudiu Manoil	
 <claudiu.manoil@....com>, Vladimir Oltean <vladimir.oltean@....com>, "David
 S. Miller" <davem@...emloft.net>, Eric Dumazet <edumazet@...gle.com>, Jakub
 Kicinski <kuba@...nel.org>,  Paolo Abeni <pabeni@...hat.com>
Cc: kernel@...labora.com, netdev@...r.kernel.org,
 linux-kernel@...r.kernel.org
Subject: Re: [PATCH] net: enetc: Replace ifdef with IS_ENABLED

On Mon, 2024-09-02 at 10:21 +0100, Vadim Fedorenko wrote:
> On 30/08/2024 18:50, Martyn Welch wrote:
> > The enetc driver uses ifdefs when checking whether
> > CONFIG_FSL_ENETC_PTP_CLOCK is enabled in a number of places. This
> > works
> > if the driver is compiled in but fails if the driver is available
> > as a
> > kernel module. Replace the instances of ifdef with use of the
> > IS_ENABLED
> > macro, that will evaluate as true when this feature is built as a
> > kernel
> > module.
> > 
> > Signed-off-by: Martyn Welch <martyn.welch@...labora.com>
> > ---
> >   drivers/net/ethernet/freescale/enetc/enetc.c         | 8 ++++----
> >   drivers/net/ethernet/freescale/enetc/enetc.h         | 4 ++--
> >   drivers/net/ethernet/freescale/enetc/enetc_ethtool.c | 2 +-
> >   3 files changed, 7 insertions(+), 7 deletions(-)
> > 
> > diff --git a/drivers/net/ethernet/freescale/enetc/enetc.c
> > b/drivers/net/ethernet/freescale/enetc/enetc.c
> > index 5c45f42232d3..276bc96dd1ef 100644
> > --- a/drivers/net/ethernet/freescale/enetc/enetc.c
> > +++ b/drivers/net/ethernet/freescale/enetc/enetc.c
> > @@ -977,7 +977,7 @@ static int enetc_refill_rx_ring(struct
> > enetc_bdr *rx_ring, const int buff_cnt)
> >   	return j;
> >   }
> >   
> > -#ifdef CONFIG_FSL_ENETC_PTP_CLOCK
> > +#if IS_ENABLED(CONFIG_FSL_ENETC_PTP_CLOCK)
> >   static void enetc_get_rx_tstamp(struct net_device *ndev,
> >   				union enetc_rx_bd *rxbd,
> >   				struct sk_buff *skb)
> > @@ -1041,7 +1041,7 @@ static void enetc_get_offloads(struct
> > enetc_bdr *rx_ring,
> >   		__vlan_hwaccel_put_tag(skb, tpid,
> > le16_to_cpu(rxbd->r.vlan_opt));
> >   	}
> >   
> > -#ifdef CONFIG_FSL_ENETC_PTP_CLOCK
> > +#if IS_ENABLED(CONFIG_FSL_ENETC_PTP_CLOCK)
> >   	if (priv->active_offloads & ENETC_F_RX_TSTAMP)
> >   		enetc_get_rx_tstamp(rx_ring->ndev, rxbd, skb);
> 
> I believe IS_ENABLED can go directly to if statement and there should
> be
> no macros dances anymore. You can change these lines into
> 	if (IS_ENABLED(CONFIG_FSL_ENETC_PTP_CLOCK) &&
> 	    priv->active_offloads & ENETC_F_RX_TSTAMP)
> 
> The same applies to other spots in the patch.
> 

Thanks, v2 on the way....

Martyn