From 1725a64bf3b2420e6b71f2fa89159a003248e0fb Mon Sep 17 00:00:00 2001
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Thu, 31 May 2007 22:15:50 -0700
Subject: [PATCH] --- yaml --- r: 57330 b: refs/heads/master c:
 4fcd6b991685493185c2bb8a76b21aadb658bd76 h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/net/core/sock.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 97edcd7c886f..0ce691ea7397 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6418204f919c030ca0c943f6c77dc84aff2ec0d2
+refs/heads/master: 4fcd6b991685493185c2bb8a76b21aadb658bd76
diff --git a/trunk/net/core/sock.c b/trunk/net/core/sock.c
index 7e51d3a5e4f6..c14ce0198d25 100644
--- a/trunk/net/core/sock.c
+++ b/trunk/net/core/sock.c
@@ -998,7 +998,7 @@ void sk_setup_caps(struct sock *sk, struct dst_entry *dst)
 	__sk_dst_set(sk, dst);
 	sk->sk_route_caps = dst->dev->features;
 	if (sk->sk_route_caps & NETIF_F_GSO)
-		sk->sk_route_caps |= NETIF_F_GSO_MASK;
+		sk->sk_route_caps |= NETIF_F_GSO_SOFTWARE;
 	if (sk_can_gso(sk)) {
 		if (dst->header_len)
 			sk->sk_route_caps &= ~NETIF_F_GSO_MASK;