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;