From: Michael Chan <mchan@broadcom.com>
Date: Thu, 14 Aug 2008 22:29:39 +0000 (-0700)
Subject: bnx2: Use proper CONFIG_VLAN_8021Q to compile the VLAN code.
X-Git-Tag: v2.6.27-rc4~39^2~46
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=729b85cd47f4e63657505cb5c6af104e19250805;p=linux-2.6-omap-h63xx.git

bnx2: Use proper CONFIG_VLAN_8021Q to compile the VLAN code.

Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: Benjamin Li <benli@broadcom.com>
Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index 0623ceb7a0e..a2a010ede59 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -35,7 +35,7 @@
 #include <linux/time.h>
 #include <linux/ethtool.h>
 #include <linux/mii.h>
-#ifdef NETIF_F_HW_VLAN_TX
+#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
 #include <linux/if_vlan.h>
 #define BCM_VLAN 1
 #endif
@@ -5963,10 +5963,12 @@ bnx2_start_xmit(struct sk_buff *skb, struct net_device *dev)
 		vlan_tag_flags |= TX_BD_FLAGS_TCP_UDP_CKSUM;
 	}
 
+#ifdef BCM_VLAN
 	if (bp->vlgrp && vlan_tx_tag_present(skb)) {
 		vlan_tag_flags |=
 			(TX_BD_FLAGS_VLAN_TAG | (vlan_tx_tag_get(skb) << 16));
 	}
+#endif
 	if ((mss = skb_shinfo(skb)->gso_size)) {
 		u32 tcp_opt_len, ip_tcp_len;
 		struct iphdr *iph;