From: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Date: Fri, 2 Mar 2007 21:27:25 +0000 (-0800)
Subject: [TCP]: Complete icsk-to-local-variable change (in tcp_enter_cwr)
X-Git-Tag: v2.6.22-rc1~1128^2~421
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=e01f9d7793be82e6c252efbd52c399d3eb65abe4;p=~shefty%2Frdma-dev.git

[TCP]: Complete icsk-to-local-variable change (in tcp_enter_cwr)

A local variable for icsk was created but this change was
missing. Spotted by Jarek Poplawski.

Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 322e43c5646..cb715eadf8f 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -770,7 +770,7 @@ void tcp_enter_cwr(struct sock *sk, const int set_ssthresh)
 
 	tp->prior_ssthresh = 0;
 	tp->bytes_acked = 0;
-	if (inet_csk(sk)->icsk_ca_state < TCP_CA_CWR) {
+	if (icsk->icsk_ca_state < TCP_CA_CWR) {
 		tp->undo_marker = 0;
 		if (set_ssthresh)
 			tp->snd_ssthresh = icsk->icsk_ca_ops->ssthresh(sk);