tcp: fix tcp_mtu_probe() vs highest_sack

[pandora-kernel.git] / include / net / tcp.h

diff --git a/include/net/tcp.h b/include/net/tcp.h
index 95c4211..3ff241e 100644 (file)
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -1394,12 +1394,12 @@ static inline void tcp_highest_sack_reset(struct sock *sk)
        tcp_sk(sk)->highest_sack = tcp_write_queue_head(sk);
 }
 
        tcp_sk(sk)->highest_sack = tcp_write_queue_head(sk);
 }
 

-/* Called when old skb is about to be deleted (to be combined with new skb) */
-static inline void tcp_highest_sack_combine(struct sock *sk,
+/* Called when old skb is about to be deleted and replaced by new skb */
+static inline void tcp_highest_sack_replace(struct sock *sk,

                                            struct sk_buff *old,
                                            struct sk_buff *new)
 {
                                            struct sk_buff *old,
                                            struct sk_buff *new)
 {

-       if (tcp_sk(sk)->sacked_out && (old == tcp_sk(sk)->highest_sack))
+       if (old == tcp_highest_sack(sk))

                tcp_sk(sk)->highest_sack = new;
 }
 
                tcp_sk(sk)->highest_sack = new;
 }