---

yaml --- r: 214761 b: refs/heads/master c: c5256c5 h: refs/heads/master i: 214759: 6c0d510 v: v3
git-mirror · Sep 27, 2010 · dc032c8 · dc032c8
1 parent 0921fb1
commit dc032c8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bba50b99b2410e863b38afdcd0280eb37f8a8bcc
+refs/heads/master: c5256c51232d8312755e8de2b514c426b19b101a
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
@@ -5058,10 +5058,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.
+	/* Enable GRO and NETIF_F_HIGHDMA for vlans by default,
+	 * vlan_dev_init() will do the dev->features check, so these features
+	 * are enabled only if supported by underlying device.
 	 */
-	dev->vlan_features |= NETIF_F_GRO;
+	dev->vlan_features |= (NETIF_F_GRO | NETIF_F_HIGHDMA);
 
 	ret = call_netdevice_notifiers(NETDEV_POST_INIT, dev);
 	ret = notifier_to_errno(ret);