diff --git a/[refs] b/[refs]
index 422e7f36ad6a..6acb16daaf8c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3924773a5a82622167524bdd48799dc0452c57f8
+refs/heads/master: d29c0c5c332131f1151cf33995e2f01299b9234f
diff --git a/trunk/include/linux/netdevice.h b/trunk/include/linux/netdevice.h
index 398f6c28cf8a..8fa5e5aa879a 100644
--- a/trunk/include/linux/netdevice.h
+++ b/trunk/include/linux/netdevice.h
@@ -865,7 +865,8 @@ struct net_device {
 #define NETIF_F_FSO		(SKB_GSO_FCOE << NETIF_F_GSO_SHIFT)
 
 	/* List of features with software fallbacks. */
-#define NETIF_F_GSO_SOFTWARE	(NETIF_F_TSO | NETIF_F_TSO_ECN | NETIF_F_TSO6)
+#define NETIF_F_GSO_SOFTWARE	(NETIF_F_TSO | NETIF_F_TSO_ECN | \
+				 NETIF_F_TSO6 | NETIF_F_UFO)
 
 
 #define NETIF_F_GEN_CSUM	(NETIF_F_NO_CSUM | NETIF_F_HW_CSUM)