From 01b70db165febba0d3300e08bd962f1ceee7aa84 Mon Sep 17 00:00:00 2001 From: James Morris Date: Mon, 25 Apr 2005 21:39:29 -0700 Subject: [PATCH] --- yaml --- r: 451 b: refs/heads/master c: 088dd3a45fdb8fb726cd50575856562c4f6f1c3e h: refs/heads/master i: 449: 550026c12e03d8061b400c4a91a035e3ff81d702 447: bbf146ee1c205ebee1d49bb8ea742a8eb3f040be v: v3 --- [refs] | 2 +- trunk/net/ipv4/tcp_input.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d861d33ee05c..9f0bba7b7f7b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 04237dddd14375fce1df4bfb1be92a35aa1c247f +refs/heads/master: 088dd3a45fdb8fb726cd50575856562c4f6f1c3e diff --git a/trunk/net/ipv4/tcp_input.c b/trunk/net/ipv4/tcp_input.c index 250492735902..6984042c0927 100644 --- a/trunk/net/ipv4/tcp_input.c +++ b/trunk/net/ipv4/tcp_input.c @@ -3517,7 +3517,6 @@ static void tcp_data_queue(struct sock *sk, struct sk_buff *skb) if (TCP_SKB_CB(skb)->seq == TCP_SKB_CB(skb)->end_seq) goto drop; - th = skb->h.th; __skb_pull(skb, th->doff*4); TCP_ECN_accept_cwr(tp, skb);