diff --git a/[refs] b/[refs]
index 726955e1cb60..2cb16285bbef 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b1cbd5f980863eb97f687baba95850c334c83a47
+refs/heads/master: 16c3ea785fe4a383c6675dfe7316f3c815755bdd
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
index 5bdce97b8175..09b3742c4c89 100644
--- a/trunk/net/core/dev.c
+++ b/trunk/net/core/dev.c
@@ -5057,6 +5057,11 @@ int register_netdevice(struct net_device *dev)
 	if (dev->features & NETIF_F_SG)
 		dev->features |= NETIF_F_GSO;
 
+	/* Enable GRO for vlans by default if dev->features has GRO also.
+	 * vlan_dev_init() will do the dev->features check.
+	 */
+	dev->vlan_features |= NETIF_F_GRO;
+
 	ret = call_netdevice_notifiers(NETDEV_POST_INIT, dev);
 	ret = notifier_to_errno(ret);
 	if (ret)