tcp: Refactor pingpong code

[linux-2.6-microblaze.git] / net / dccp / timer.c

diff --git a/net/dccp/timer.c b/net/dccp/timer.c
index 1501a20..74e1384 100644 (file)
--- a/net/dccp/timer.c
+++ b/net/dccp/timer.c
@@ -199,7 +199,7 @@ static void dccp_delack_timer(struct timer_list *t)
        icsk->icsk_ack.pending &= ~ICSK_ACK_TIMER;
 
        if (inet_csk_ack_scheduled(sk)) {
-               if (!icsk->icsk_ack.pingpong) {
+               if (!inet_csk_in_pingpong_mode(sk)) {
                        /* Delayed ACK missed: inflate ATO. */
                        icsk->icsk_ack.ato = min(icsk->icsk_ack.ato << 1,
                                                 icsk->icsk_rto);
@@ -207,7 +207,7 @@ static void dccp_delack_timer(struct timer_list *t)
                        /* Delayed ACK missed: leave pingpong mode and
                         * deflate ATO.
                         */
-                       icsk->icsk_ack.pingpong = 0;
+                       inet_csk_exit_pingpong_mode(sk);
                        icsk->icsk_ack.ato = TCP_ATO_MIN;
                }
                dccp_send_ack(sk);