Patchwork [net-next] tcp: cleanup messy initializer

login
register
mail settings
Submitter Ilpo Järvinen
Date Oct. 3, 2008, 7:14 p.m.
Message ID <Pine.LNX.4.64.0810032213230.30432@wrl-59.cs.helsinki.fi>
Download mbox | patch
Permalink /patch/2619/
State Not Applicable
Delegated to: David Miller
Headers show

Comments

Patch

diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index db1f194..f547b2f 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -4465,8 +4465,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)