From 19735667507e6a1e06b504bd565f927488d6580d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilpo=20J=E4rvinen?= Date: Mon, 19 Nov 2007 23:24:09 -0800 Subject: [PATCH] --- yaml --- r: 74194 b: refs/heads/master c: 6e42141009ff18297fe19d19296738b742f861db h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/net/tcp.h | 3 +++ trunk/net/ipv4/tcp_output.c | 1 - 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 2858f4c4179e..9b6853edd4fc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1f8170b0ecd8363847792b3b1f269e9d8e10391a +refs/heads/master: 6e42141009ff18297fe19d19296738b742f861db diff --git a/trunk/include/net/tcp.h b/trunk/include/net/tcp.h index d695cea7730d..cb5b033e0e59 100644 --- a/trunk/include/net/tcp.h +++ b/trunk/include/net/tcp.h @@ -1288,6 +1288,9 @@ static inline void tcp_insert_write_queue_before(struct sk_buff *new, struct sock *sk) { __skb_insert(new, skb->prev, skb, &sk->sk_write_queue); + + if (sk->sk_send_head == skb) + sk->sk_send_head = new; } static inline void tcp_unlink_write_queue(struct sk_buff *skb, struct sock *sk) diff --git a/trunk/net/ipv4/tcp_output.c b/trunk/net/ipv4/tcp_output.c index 324b4207254a..e48e28e7d539 100644 --- a/trunk/net/ipv4/tcp_output.c +++ b/trunk/net/ipv4/tcp_output.c @@ -1352,7 +1352,6 @@ static int tcp_mtu_probe(struct sock *sk) skb = tcp_send_head(sk); tcp_insert_write_queue_before(nskb, skb, sk); - tcp_advance_send_head(sk, skb); TCP_SKB_CB(nskb)->seq = TCP_SKB_CB(skb)->seq; TCP_SKB_CB(nskb)->end_seq = TCP_SKB_CB(skb)->seq + probe_size;