From 1a8eb4dc3a843f30f516df296407e3d963fde46b Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Mon, 1 Dec 2003 10:34:13 -0800 Subject: [PATCH] [TG3]: Do not set RX_MODE_KEEP_VLAN_TAG when ASF is enabled. --- drivers/net/tg3.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index 66e1eb46c181d..505741a221626 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c @@ -5763,14 +5763,20 @@ static void __tg3_set_rx_mode(struct net_device *dev) rx_mode = tp->rx_mode & ~(RX_MODE_PROMISC | RX_MODE_KEEP_VLAN_TAG); + + /* When ASF is in use, we always keep the RX_MODE_KEEP_VLAN_TAG + * flag clear. + */ #if TG3_VLAN_TAG_USED - if (!tp->vlgrp) + if (!tp->vlgrp && + !(tp->tg3_flags & TG3_FLAG_ENABLE_ASF)) rx_mode |= RX_MODE_KEEP_VLAN_TAG; #else /* By definition, VLAN is disabled always in this * case. */ - rx_mode |= RX_MODE_KEEP_VLAN_TAG; + if (!(tp->tg3_flags & TG3_FLAG_ENABLE_ASF)) + rx_mode |= RX_MODE_KEEP_VLAN_TAG; #endif if (dev->flags & IFF_PROMISC) { -- 2.53.0