netdev - Re: [PATCH net] cnic : Cleanup CONFIG

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:	Thu, 4 Sep 2014 18:18:51 -0700
From:	Michael Chan <mchan@...adcom.com>
To:	Anish Bhatt <anish@...lsio.com>
CC:	<netdev@...r.kernel.org>, <davem@...emloft.net>,
	<jitendra.kalsaria@...gic.com>, <eddie.wai@...adcom.com>,
	<randy.dunlap@...cle.com>
Subject: Re: [PATCH net] cnic : Cleanup CONFIG_IPV6 & VLAN check

On Thu, 2014-09-04 at 17:12 -0700, Anish Bhatt wrote: 
> The cnic module needs to ensure that if ipv6 support is compiled as a module,
> then the cnic module cannot be compiled as built-in as it depends on ipv6.
> Made this check cleaner via Kconfig
> 
> Use simpler IS_ENABLED for CONFIG_VLAN_8021Q check
> 
> Signed-off-by: Anish Bhatt <anish@...lsio.com>

Acked-by: Michael Chan <mchan@...adcom.com>

> 
> diff --git a/drivers/net/ethernet/broadcom/Kconfig b/drivers/net/ethernet/broadcom/Kconfig
> index 7dcfb19..d8d07a8 100644
> --- a/drivers/net/ethernet/broadcom/Kconfig
> +++ b/drivers/net/ethernet/broadcom/Kconfig
> @@ -84,7 +84,7 @@ config BNX2
>  
>  config CNIC
>  	tristate "QLogic CNIC support"
> -	depends on PCI
> +	depends on PCI && (IPV6 || IPV6=n)
>  	select BNX2
>  	select UIO
>  	---help---
> diff --git a/drivers/net/ethernet/broadcom/cnic.c b/drivers/net/ethernet/broadcom/cnic.c
> index 27861a6..a6a9f28 100644
> --- a/drivers/net/ethernet/broadcom/cnic.c
> +++ b/drivers/net/ethernet/broadcom/cnic.c
> @@ -31,7 +31,7 @@
>  #include <linux/if_vlan.h>
>  #include <linux/prefetch.h>
>  #include <linux/random.h>
> -#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
> +#if IS_ENABLED(CONFIG_VLAN_8021Q)
>  #define BCM_VLAN 1
>  #endif
>  #include <net/ip.h>
> @@ -3685,7 +3685,7 @@ static int cnic_get_v4_route(struct sockaddr_in *dst_addr,
>  static int cnic_get_v6_route(struct sockaddr_in6 *dst_addr,
>  			     struct dst_entry **dst)
>  {
> -#if defined(CONFIG_IPV6) || (defined(CONFIG_IPV6_MODULE) && defined(MODULE))
> +#if IS_ENABLED(CONFIG_IPV6)
>  	struct flowi6 fl6;
>  
>  	memset(&fl6, 0, sizeof(fl6));


--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html