summaryrefslogtreecommitdiffstats
path: root/net/ipv4/tcp_input.c
diff options
context:
space:
mode:
authorIlpo Järvinen2008-10-07 23:43:31 +0200
committerDavid S. Miller2008-10-07 23:43:31 +0200
commit4a7e56098f06d505f23f8d7c8d6762221065922a (patch)
tree2dc8d5548d71de014c4ec20b2ea2890c1f287e72 /net/ipv4/tcp_input.c
parenttcp: kill pointless urg_mode (diff)
downloadkernel-qcow2-linux-4a7e56098f06d505f23f8d7c8d6762221065922a.tar.gz
kernel-qcow2-linux-4a7e56098f06d505f23f8d7c8d6762221065922a.tar.xz
kernel-qcow2-linux-4a7e56098f06d505f23f8d7c8d6762221065922a.zip
tcp: cleanup messy initializer
I'm quite sure that if I give this function in its old format for you to inspect, you start to wonder what is the type of demanded or if it's a global variable. Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_input.c')
-rw-r--r--net/ipv4/tcp_input.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index c19f429dc443..63da39372d40 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -4461,8 +4461,8 @@ static void tcp_new_space(struct sock *sk)
if (tcp_should_expand_sndbuf(sk)) {
int sndmem = max_t(u32, tp->rx_opt.mss_clamp, tp->mss_cache) +
- MAX_TCP_HEADER + 16 + sizeof(struct sk_buff),
- demanded = max_t(unsigned int, tp->snd_cwnd,
+ MAX_TCP_HEADER + 16 + sizeof(struct sk_buff);
+ int demanded = max_t(unsigned int, tp->snd_cwnd,
tp->reordering + 1);
sndmem *= 2 * demanded;
if (sndmem > sk->sk_sndbuf)