Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Michael Chan and committed by
David S. Miller
729b85cd 7c6337a1

+3 -1
+3 -1
drivers/net/bnx2.c
··· 35 35 #include <linux/time.h> 36 36 #include <linux/ethtool.h> 37 37 #include <linux/mii.h> 38 - #ifdef NETIF_F_HW_VLAN_TX 38 + #if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE) 39 39 #include <linux/if_vlan.h> 40 40 #define BCM_VLAN 1 41 41 #endif ··· 5963 5963 vlan_tag_flags |= TX_BD_FLAGS_TCP_UDP_CKSUM; 5964 5964 } 5965 5965 5966 + #ifdef BCM_VLAN 5966 5967 if (bp->vlgrp && vlan_tx_tag_present(skb)) { 5967 5968 vlan_tag_flags |= 5968 5969 (TX_BD_FLAGS_VLAN_TAG | (vlan_tx_tag_get(skb) << 16)); 5969 5970 } 5971 + #endif 5970 5972 if ((mss = skb_shinfo(skb)->gso_size)) { 5971 5973 u32 tcp_opt_len, ip_tcp_len; 5972 5974 struct iphdr *iph;