X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=net%2Fipv4%2Faf_inet.c;h=06c08e5740fbcca5b0aa37dade5a90f88609ee42;hb=40b42f1ebf653cd72c32eb1a1a0b9fea2dfbfd7d;hp=16aae8ef5555b65855f5437a729c13134cf9739b;hpb=5e0f04351d11e07a23b5ab4914282cbb78027e50;p=linux-2.6

diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
index 16aae8ef55..06c08e5740 100644
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
@@ -92,7 +92,6 @@
 #include <asm/uaccess.h>
 #include <asm/system.h>
 
-#include <linux/smp_lock.h>
 #include <linux/inet.h>
 #include <linux/igmp.h>
 #include <linux/inetdevice.h>
@@ -1171,6 +1170,9 @@ static struct sk_buff *inet_gso_segment(struct sk_buff *skb, int features)
 	int ihl;
 	int id;
 
+	if (!(features & NETIF_F_V4_CSUM))
+		features &= ~NETIF_F_SG;
+
 	if (unlikely(skb_shinfo(skb)->gso_type &
 		     ~(SKB_GSO_TCPV4 |
 		       SKB_GSO_UDP |