diff options
| author | Michael Chan <mchan@broadcom.com> | 2008-08-14 15:29:39 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-08-14 15:29:39 -0700 |
| commit | 729b85cd47f4e63657505cb5c6af104e19250805 (patch) | |
| tree | a5bf5f01797ec0dffd550bd50cca7fa930e2f962 /drivers/net/bnx2.c | |
| parent | 7c6337a15e3d4689efe703e8bb65ae82cc13c435 (diff) | |
| download | linux-stable-729b85cd47f4e63657505cb5c6af104e19250805.tar.gz linux-stable-729b85cd47f4e63657505cb5c6af104e19250805.tar.bz2 linux-stable-729b85cd47f4e63657505cb5c6af104e19250805.zip | |
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>
Diffstat (limited to 'drivers/net/bnx2.c')
| -rw-r--r-- | drivers/net/bnx2.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c index 0623ceb7a0e2..a2a010ede591 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; |