From 082ab49e6ea5ea48fcf08c0de73a7612d532c4af Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Thu, 27 Sep 2007 12:32:44 -0700 Subject: [PATCH] --- yaml --- r: 65204 b: refs/heads/master c: d6c9bc1ed4301cbc3df4565ff5348b64bf2a767c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/sky2.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index cd0c3b992223..d4f6159a623f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3b12e0141f7a97c3b84731b5f935ed738bb6f960 +refs/heads/master: d6c9bc1ed4301cbc3df4565ff5348b64bf2a767c diff --git a/trunk/drivers/net/sky2.c b/trunk/drivers/net/sky2.c index a3de0b6127eb..3bfc9d3e3c6e 100644 --- a/trunk/drivers/net/sky2.c +++ b/trunk/drivers/net/sky2.c @@ -3970,8 +3970,12 @@ static __devinit struct net_device *sky2_init_netdev(struct sky2_hw *hw, dev->features |= NETIF_F_HIGHDMA; #ifdef SKY2_VLAN_TAG_USED - dev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX; - dev->vlan_rx_register = sky2_vlan_rx_register; + /* The workaround for FE+ status conflicts with VLAN tag detection. */ + if (!(sky2->hw->chip_id == CHIP_ID_YUKON_FE_P && + sky2->hw->chip_rev == CHIP_REV_YU_FE2_A0)) { + dev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX; + dev->vlan_rx_register = sky2_vlan_rx_register; + } #endif /* read the mac address */