Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 729b85cd authored by Michael Chan's avatar Michael Chan Committed by David S. Miller
Browse files

bnx2: Use proper CONFIG_VLAN_8021Q to compile the VLAN code. 



Signed-off-by: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarBenjamin Li <benli@broadcom.com>
Signed-off-by: default avatarMatt Carlson <mcarlson@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7c6337a1

drivers/net/bnx2.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -35,7 +35,7 @@ 
#include <linux/time.h>

#include <linux/time.h>

#include <linux/ethtool.h>

#include <linux/ethtool.h>

#include <linux/mii.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>

#include <linux/if_vlan.h>

#define BCM_VLAN 1

#define BCM_VLAN 1

#endif

#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;

		vlan_tag_flags |= TX_BD_FLAGS_TCP_UDP_CKSUM;

	}

	}





#ifdef BCM_VLAN

	if (bp->vlgrp && vlan_tx_tag_present(skb)) {

	if (bp->vlgrp && vlan_tx_tag_present(skb)) {

		vlan_tag_flags |=

		vlan_tag_flags |=

			(TX_BD_FLAGS_VLAN_TAG | (vlan_tx_tag_get(skb) << 16));

			(TX_BD_FLAGS_VLAN_TAG | (vlan_tx_tag_get(skb) << 16));

	}

	}

#endif

	if ((mss = skb_shinfo(skb)->gso_size)) {

	if ((mss = skb_shinfo(skb)->gso_size)) {

		u32 tcp_opt_len, ip_tcp_len;

		u32 tcp_opt_len, ip_tcp_len;

		struct iphdr *iph;

		struct iphdr *iph;