diff options
| author | David S. Miller <davem@davemloft.net> | 2008-05-25 23:26:10 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-05-25 23:26:10 -0700 |
| commit | 43154d08d6bb5c69aa0d0e3448fb348b4cd84e91 (patch) | |
| tree | 176edb26aad2d33e8be36530b66b19d0603c4b1d /include/linux/tcp.h | |
| parent | 03194379a77b02df3404ec4848a50c6784e9a8a5 (diff) | |
| parent | 289c79a4bd350e8a25065102563ad1a183d1b402 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/cpmac.c
net/mac80211/mlme.c
Diffstat (limited to 'include/linux/tcp.h')
| -rw-r--r-- | include/linux/tcp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/tcp.h b/include/linux/tcp.h index d96d9b12230..18e62e3d406 100644 --- a/include/linux/tcp.h +++ b/include/linux/tcp.h @@ -355,7 +355,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 */ |