~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to net/ipv4/tcp_timer.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
259
259
                tcp_send_ack(sk);
260
260
                NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_DELAYEDACKS);
261
261
        }
262
 
        TCP_CHECK_TIMER(sk);
263
262
 
264
263
out:
265
264
        if (tcp_memory_pressure)
481
480
                tcp_probe_timer(sk);
482
481
                break;
483
482
        }
484
 
        TCP_CHECK_TIMER(sk);
485
483
 
486
484
out:
487
485
        sk_mem_reclaim(sk);
589
587
                elapsed = keepalive_time_when(tp) - elapsed;
590
588
        }
591
589
 
592
 
        TCP_CHECK_TIMER(sk);
593
590
        sk_mem_reclaim(sk);
594
591
 
595
592
resched: