diff --git a/[refs] b/[refs]
index b276ab5487a1..8aef72e72de6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d10c4ec8b4bc02f3874c7ef3c3539e4e7e123969
+refs/heads/master: 9bff9dbd00e5907f5c36e72bae8aee8a46440e11
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
index 60c51f765887..abef86ec4cb0 100644
--- a/trunk/net/core/dev.c
+++ b/trunk/net/core/dev.c
@@ -4663,6 +4663,12 @@ int netdev_compute_features(unsigned long all, unsigned long one)
 		one |= NETIF_F_GSO_SOFTWARE;
 	one |= NETIF_F_GSO;
 
+	/*
+	 * If even one device supports a GSO protocol with software fallback,
+	 * enable it for all.
+	 */
+	all |= one & NETIF_F_GSO_SOFTWARE;
+
 	/* If even one device supports robust GSO, enable it for all. */
 	if (one & NETIF_F_GSO_ROBUST)
 		all |= NETIF_F_GSO_ROBUST;