gro: Use gso_size to store MSS

[linux-2.6-omap-h63xx.git] / net / ipv4 / tcp.c

diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index f28acf11fc67d419bc0ccab57510c8bcedee1c3e..4d655e945413aadf8a8fb3e75b62f6a946573c14 100644 (file)
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -2519,9 +2519,7 @@ found:
        flush |= memcmp(th + 1, th2 + 1, thlen - sizeof(*th));
 
        total = p->len;
-       mss = total;
-       if (skb_shinfo(p)->frag_list)
-               mss = skb_shinfo(p)->frag_list->len;
+       mss = skb_shinfo(p)->gso_size;
 
        flush |= skb->len > mss || skb->len <= 0;
        flush |= ntohl(th2->seq) + total != ntohl(th->seq);
@@ -2557,7 +2555,6 @@ int tcp_gro_complete(struct sk_buff *skb)
        skb->csum_offset = offsetof(struct tcphdr, check);
        skb->ip_summed = CHECKSUM_PARTIAL;
 
-       skb_shinfo(skb)->gso_size = skb_shinfo(skb)->frag_list->len;
        skb_shinfo(skb)->gso_segs = NAPI_GRO_CB(skb)->count;
 
        if (th->cwr)