---

yaml --- r: 214555 b: refs/heads/master c: 16c3ea7 h: refs/heads/master i: 214553: 1408450 214551: 8963fbc v: v3
git-mirror · Sep 16, 2010 · 491662e · 491662e
1 parent 6fbe7dc
commit 491662e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git 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
@@ -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)