* [PATCH]bnx2x: remove duplication of the BCM_VLAN macro
@ 2009-10-21 20:38 Denis Kirjanov <kirjanov@gmail.com
2009-10-22 7:42 ` Eilon Greenstein
0 siblings, 1 reply; 2+ messages in thread
From: Denis Kirjanov <kirjanov@gmail.com @ 2009-10-21 20:38 UTC (permalink / raw)
To: eilong; +Cc: davem, netdev
File bnx2.c already contains condition of the macro inclusion.
So we can remove this.
Signed-off-by: Denis Kirjanov <kirjanov@gmail.com>
---
diff --git a/drivers/net/bnx2x.h b/drivers/net/bnx2x.h
index bbf8422..4b99fd2 100644
--- a/drivers/net/bnx2x.h
+++ b/drivers/net/bnx2x.h
@@ -20,10 +20,6 @@
* (you will need to reboot afterwards) */
/* #define BNX2X_STOP_ON_ERROR */
-#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
-#define BCM_VLAN 1
-#endif
-
#define BNX2X_MULTI_QUEUE
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH]bnx2x: remove duplication of the BCM_VLAN macro
2009-10-21 20:38 [PATCH]bnx2x: remove duplication of the BCM_VLAN macro Denis Kirjanov <kirjanov@gmail.com
@ 2009-10-22 7:42 ` Eilon Greenstein
0 siblings, 0 replies; 2+ messages in thread
From: Eilon Greenstein @ 2009-10-22 7:42 UTC (permalink / raw)
To: kirjanov@gmail.com; +Cc: davem@davemloft.net, netdev@vger.kernel.org
On Wed, 2009-10-21 at 13:38 -0700, Denis Kirjanov
> File bnx2.c already contains condition of the macro inclusion.
> So we can remove this.
It is true that BCM_VLAN is defined in bnx2.c, however it is not defined
in bnx2x_*.c files. The definition in bnx2x.h is needed for the bnx2x.ko
module.
Please do not remove it.
Thanks,
Eilon
> Signed-off-by: Denis Kirjanov <kirjanov@gmail.com>
> ---
>
> diff --git a/drivers/net/bnx2x.h b/drivers/net/bnx2x.h
> index bbf8422..4b99fd2 100644
> --- a/drivers/net/bnx2x.h
> +++ b/drivers/net/bnx2x.h
> @@ -20,10 +20,6 @@
> * (you will need to reboot afterwards) */
> /* #define BNX2X_STOP_ON_ERROR */
>
> -#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
> -#define BCM_VLAN 1
> -#endif
> -
>
> #define BNX2X_MULTI_QUEUE
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-10-22 7:45 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-10-21 20:38 [PATCH]bnx2x: remove duplication of the BCM_VLAN macro Denis Kirjanov <kirjanov@gmail.com
2009-10-22 7:42 ` Eilon Greenstein
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).