X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=net%2Fcore%2Fdev.c;h=abef86ec4cb0e466a989b60cfd4c4d966543502e;hb=e2a6b85247aacc52d6ba0d9b37a99b8d1a3e0d83;hp=60c51f7658870257571ee9455f95bb48888b4398;hpb=a505f4ff49ff05ca9030069fab7de229dae7c819;p=linux-2.6-omap-h63xx.git

diff --git a/net/core/dev.c b/net/core/dev.c
index 60c51f76588..abef86ec4cb 100644
--- a/net/core/dev.c
+++ b/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;