---

yaml --- r: 368155 b: refs/heads/master c: ee57967 h: refs/heads/master i: 368153: 76e03f8 368151: c9b4f22 v: v3
git-mirror · Mar 9, 2013 · 45bcfa1 · 45bcfa1
1 parent da62994
commit 45bcfa1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ec5f061564238892005257c83565a0b58ec79295
+refs/heads/master: ee579677c29954f20e48e5bb80ae85b30100c2e0
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
@@ -5205,6 +5205,10 @@ int register_netdevice(struct net_device *dev)
 	 */
 	dev->vlan_features |= NETIF_F_HIGHDMA;
 
+	/* Make NETIF_F_SG inheritable to tunnel devices.
+	 */
+	dev->hw_enc_features |= NETIF_F_SG;
+
 	ret = call_netdevice_notifiers(NETDEV_POST_INIT, dev);
 	ret = notifier_to_errno(ret);
 	if (ret)