Skip to contentSkip to conversation

bnx2x: remove duplication of the BCM_VLAN macro

PATCH In review Denis Kirjanov <[email protected] 2 participants 2 messages Oct 21, 2009 – Oct 22, 2009

Subsystems (2)
Networking Network drivers
lore
Share & tools
lore

Denis Kirjanov <[email protected]

author
#0 lore raw

PATCH 1/1 bnx2x: remove duplication of the BCM_VLAN macro

File bnx2.c already contains condition of the macro inclusion. So we can remove this.

Signed-off-by Denis Kirjanov <[email protected]>

---

drivers/net/bnx2x.h +0 -4
index bbf8422..4b99fd2 100644
@@ -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
#1 lore raw

On Wed, 2009-10-21 at 13:38 -0700, Denis Kirjanov

Quoted 2 lines

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

Quoted 18 lines
Signed-off-by Denis Kirjanov <[email protected]>

---

drivers/net/bnx2x.h +0 -4
index bbf8422..4b99fd2 100644
@@ -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