Merge branch 'linus' into x86/i8259

[sfrench/cifs-2.6.git] / include / linux / tcp.h

diff --git a/include/linux/tcp.h b/include/linux/tcp.h
index 08027f1d7f31d81836de46fd58f89d1fd5edbcae..b31b6b74aa28bf4e4dd3aa45d976e34c0c5f968d 100644 (file)
--- a/include/linux/tcp.h
+++ b/include/linux/tcp.h
@@ -350,7 +350,7 @@ struct tcp_sock {
        u32     lost_retrans_low;       /* Sent seq after any rxmit (lowest) */
 
        u16     advmss;         /* Advertised MSS                       */
-       u16     prior_ssthresh; /* ssthresh saved at recovery start     */
+       u32     prior_ssthresh; /* ssthresh saved at recovery start     */
        u32     lost_out;       /* Lost packets                 */
        u32     sacked_out;     /* SACK'd packets                       */
        u32     fackets_out;    /* FACK'd packets                       */