Re: linux-next: Tree for August 15 (bnx2) [resend/lost]

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: David Miller
Date: Friday, August 15, 2008 - 3:17 pm

From: Randy Dunlap <randy.dunlap@oracle.com>
Date: Fri, 15 Aug 2008 08:41:16 -0700


Does this fix it for you?

diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index d454810..2486a65 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -35,8 +35,8 @@
 #include <linux/time.h>
 #include <linux/ethtool.h>
 #include <linux/mii.h>
-#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
 #include <linux/if_vlan.h>
+#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
 #define BCM_VLAN 1
 #endif
 #include <net/ip.h>
--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
linux-next: Tree for August 15, Stephen Rothwell, (Fri Aug 15, 1:40 am)
Re: linux-next: Tree for August 15 (bnx2) [resend/lost], Randy Dunlap, (Fri Aug 15, 8:41 am)
Re: linux-next: Tree for August 15 (bnx2) [resend/lost], David Miller, (Fri Aug 15, 3:17 pm)
Re: linux-next: Tree for August 15 (bnx2) [resend/lost], Randy Dunlap, (Fri Aug 15, 4:41 pm)
Re: linux-next: Tree for August 15, Tino Keitel, (Sun Aug 17, 10:49 pm)