← Back to branch summary

~ubuntu-branches/debian/wheezy/linux-2.6/wheezy

« back to all changes in this revision

Viewing changes to net/ipv4/tcp_htcp.c

  • Committer: Bazaar Package Importer
  • Author(s): Ben Hutchings, Ben Hutchings, Aurelien Jarno, Martin Michlmayr
  • Date: 2011-04-06 13:53:30 UTC
  • mfrom: (43.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20110406135330-wjufxhd0tvn3zx4z
Tags: 2.6.38-3
http://bugs.debian.org/620124
http://bugs.debian.org/620284
http://bugs.debian.org/620204
[ Ben Hutchings ]
* [ppc64] Add to linux-tools package architectures (Closes: #620124)
* [amd64] Save cr4 to mmu_cr4_features at boot time (Closes: #620284)
* appletalk: Fix bugs introduced when removing use of BKL
* ALSA: Fix yet another race in disconnection
* cciss: Fix lost command issue
* ath9k: Fix kernel panic in AR2427
* ses: Avoid kernel panic when lun 0 is not mapped
* PCI/ACPI: Report ASPM support to BIOS if not disabled from command line

[ Aurelien Jarno ]
* rtlwifi: fix build when PCI is not enabled.

[ Martin Michlmayr ]
* rtlwifi: Eliminate udelay calls with too large values (Closes: #620204)

Show diffs side-by-side

added added

removed removed

Lines of Context:
net/ipv4/tcp_htcp.c
92
92
        if (icsk->icsk_ca_state == TCP_CA_Open) {
93
93
                if (ca->maxRTT < ca->minRTT)
94
94
                        ca->maxRTT = ca->minRTT;
95
 
                if (ca->maxRTT < srtt
96
 
                    && srtt <= ca->maxRTT + msecs_to_jiffies(20))
 
95
                if (ca->maxRTT < srtt &&
 
96
                    srtt <= ca->maxRTT + msecs_to_jiffies(20))
97
97
                        ca->maxRTT = srtt;
98
98
        }
99
99
}
123
123
 
124
124
        ca->packetcount += pkts_acked;
125
125
 
126
 
        if (ca->packetcount >= tp->snd_cwnd - (ca->alpha >> 7 ? : 1)
127
 
            && now - ca->lasttime >= ca->minRTT
128
 
            && ca->minRTT > 0) {
 
126
        if (ca->packetcount >= tp->snd_cwnd - (ca->alpha >> 7 ? : 1) &&
 
127
            now - ca->lasttime >= ca->minRTT &&
 
128
            ca->minRTT > 0) {
129
129
                __u32 cur_Bi = ca->packetcount * HZ / (now - ca->lasttime);
130
130
 
131
131
                if (htcp_ccount(ca) <= 3) {