bnx2: Fix logic to setup VLAN rx tagging.

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

kernel os linux

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: 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 17 years ago 7c6337a1 b793b3a7

+2 -2

1 changed file

expand all

drivers

net

bnx2.c

+2 -2

drivers/net/bnx2.c

··· 3237 3237 BNX2_EMAC_RX_MODE_KEEP_VLAN_TAG); 3238 3238 sort_mode = 1 | BNX2_RPM_SORT_USER0_BC_EN; 3239 3239 #ifdef BCM_VLAN 3240 - if (!bp->vlgrp && !(bp->flags & BNX2_FLAG_ASF_ENABLE)) 3240 + if (!bp->vlgrp && (bp->flags & BNX2_FLAG_CAN_KEEP_VLAN)) 3241 3241 rx_mode |= BNX2_EMAC_RX_MODE_KEEP_VLAN_TAG; 3242 3242 #else 3243 - if (!(bp->flags & BNX2_FLAG_ASF_ENABLE)) 3243 + if (bp->flags & BNX2_FLAG_CAN_KEEP_VLAN) 3244 3244 rx_mode |= BNX2_EMAC_RX_MODE_KEEP_VLAN_TAG; 3245 3245 #endif 3246 3246 if (dev->flags & IFF_PROMISC) {