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

Commit 7c6337a1 authored by Michael Chan's avatar Michael Chan Committed by David S. Miller
Browse files

bnx2: Fix logic to setup VLAN rx tagging. 



We should now be checking BNX2_FLAG_CAN_KEEP_VLAN to determine how
to set the VLAN rx tagging in the RX_MODE register.

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 b793b3a7

drivers/net/bnx2.c

+2 −2
Original line number Diff line number Diff line
@@ -3237,10 +3237,10 @@ bnx2_set_rx_mode(struct net_device *dev) 
				  BNX2_EMAC_RX_MODE_KEEP_VLAN_TAG);

	sort_mode = 1 | BNX2_RPM_SORT_USER0_BC_EN;

#ifdef BCM_VLAN

	if (!bp->vlgrp && !(bp->flags & BNX2_FLAG_ASF_ENABLE))

	if (!bp->vlgrp && (bp->flags & BNX2_FLAG_CAN_KEEP_VLAN))

		rx_mode |= BNX2_EMAC_RX_MODE_KEEP_VLAN_TAG;

#else

	if (!(bp->flags & BNX2_FLAG_ASF_ENABLE))

	if (bp->flags & BNX2_FLAG_CAN_KEEP_VLAN)

		rx_mode |= BNX2_EMAC_RX_MODE_KEEP_VLAN_TAG;

#endif

	if (dev->flags & IFF_PROMISC) {