From 121852a68428e9ef974457611c2b6a55bcfb1f86 Mon Sep 17 00:00:00 2001
From: Shan Wei <shanwei@cn.fujitsu.com>
Date: Fri, 1 Jul 2011 22:06:44 +0000
Subject: [PATCH] --- yaml --- r: 254679 b: refs/heads/master c:
 60b677034fcb3e48ffa30d638b09ac925afb4b36 h: refs/heads/master i:   254677:
 b63899b1b9e0212df5ad6458a8297bb914fb7a79   254675:
 9fde8cda918a2491eda61cf489dbb14589f02787   254671:
 0a1abd700731e432a0ad84fe6357f186f5a8162c v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/net/8139too.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index eba018e14db3..2f3edade69d1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5f77898de17ff983ff0e2988b73a6bdf4b6f9f8b
+refs/heads/master: 60b677034fcb3e48ffa30d638b09ac925afb4b36
diff --git a/trunk/drivers/net/8139too.c b/trunk/drivers/net/8139too.c
index 98517a373473..e3bad8247fd1 100644
--- a/trunk/drivers/net/8139too.c
+++ b/trunk/drivers/net/8139too.c
@@ -992,6 +992,7 @@ static int __devinit rtl8139_init_one (struct pci_dev *pdev,
 	 * features
 	 */
 	dev->features |= NETIF_F_SG | NETIF_F_HW_CSUM | NETIF_F_HIGHDMA;
+	dev->vlan_features = dev->features;
 
 	dev->irq = pdev->irq;