From 45bcfa181b66a9e5a291843eb8a80a8aa519bb9f Mon Sep 17 00:00:00 2001
From: Pravin B Shelar <pshelar@nicira.com>
Date: Thu, 7 Mar 2013 09:28:08 +0000
Subject: [PATCH] --- yaml --- r: 368155 b: refs/heads/master c:
 ee579677c29954f20e48e5bb80ae85b30100c2e0 h: refs/heads/master i:   368153:
 76e03f8c32fe5b5fb884b49354a6236f9ebec280   368151:
 c9b4f2285f0ca86577af271b0901823e669a575b v: v3

---
 [refs]               | 2 +-
 trunk/net/core/dev.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 6594c80f7057..6528000fca60 100644
--- 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
index bb999931729f..90cee5be1c0f 100644
--- 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)