linux-kernel - Re: [PATCH] staging: octeon: Use IS_ENABLED() instead of checking for built-in or module

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]

Date:   Sun, 21 Aug 2016 18:02:49 +0200
From:   Greg Kroah-Hartman <gregkh@...uxfoundation.org>
To:     Javier Martinez Canillas <javier@....samsung.com>
Cc:     linux-kernel@...r.kernel.org, devel@...verdev.osuosl.org,
        Aaro Koskinen <aaro.koskinen@....fi>,
        Aybuke Ozdemir <aybuke.147@...il.com>,
        Cristina Moraru <cristina.moraru09@...il.com>,
        Laura Garcia Liebana <nevola@...il.com>,
        Bhaktipriya Shridhar <bhaktipriya96@...il.com>,
        David Daney <david.daney@...ium.com>
Subject: Re: [PATCH] staging: octeon: Use IS_ENABLED() instead of checking
 for built-in or module

On Thu, Jul 14, 2016 at 01:06:09PM -0400, Javier Martinez Canillas wrote:
> The IS_ENABLED() macro checks if a Kconfig symbol has been enabled either
> built-in or as a module, use that macro instead of open coding the same.
> 
> Signed-off-by: Javier Martinez Canillas <javier@....samsung.com>
> Acked-by: David Daney <david.daney@...ium.com>
> ---
> 
>  drivers/staging/octeon/ethernet.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c
> index e9cd5f242921..c0c62143ffc8 100644
> --- a/drivers/staging/octeon/ethernet.c
> +++ b/drivers/staging/octeon/ethernet.c
> @@ -238,7 +238,7 @@ static int cvm_oct_common_change_mtu(struct net_device *dev, int new_mtu)
>  	struct octeon_ethernet *priv = netdev_priv(dev);
>  	int interface = INTERFACE(priv->port);
>  	int index = INDEX(priv->port);
> -#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
> +#if IS_ENABLED(CONFIG_VLAN_8021Q)
>  	int vlan_bytes = 4;
>  #else
>  	int vlan_bytes = 0;

Fails to apply to the tree :(