diff options
| author | Michael Chan <mchan@broadcom.com> | 2008-08-14 15:29:09 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-08-14 15:29:09 -0700 |
| commit | 7c6337a15e3d4689efe703e8bb65ae82cc13c435 (patch) | |
| tree | fa08e8ee38efc564f2c6fb8e76ae9b5a212c3d78 /drivers/net/bnx2.c | |
| parent | b793b3a75e12ae4576f3d9b6013c8a7d8b0277b8 (diff) | |
| download | blackbird-op-linux-7c6337a15e3d4689efe703e8bb65ae82cc13c435.tar.gz blackbird-op-linux-7c6337a15e3d4689efe703e8bb65ae82cc13c435.zip | |
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: 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, 2 insertions, 2 deletions
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c index 5ebde67d4297..0623ceb7a0e2 100644 --- a/drivers/net/bnx2.c +++ b/drivers/net/bnx2.c @@ -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) { |
