← 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_input.c

  • Committer: Package Import Robot
  • Author(s): Ben Hutchings, Jonathan Nieder, Ben Hutchings
  • Date: 2012-05-21 04:07:08 UTC
  • mfrom: (43.1.37 sid)
  • Revision ID: package-import@ubuntu.com-20120521040708-4zcqvn06d31tlkhf
Tags: 3.2.18-1
http://bugs.debian.org/672891
http://bugs.debian.org/672582
http://bugs.debian.org/671801
http://bugs.debian.org/673186
http://bugs.debian.org/673320
http://bugs.debian.org/670958
* New upstream stable update:
  http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.2.18
  - hugetlb: prevent BUG_ON in hugetlb_fault() -> hugetlb_cow()
  - net: l2tp: unlock socket lock before returning from l2tp_ip_sendmsg
  - [sparc] sparc64: Do not clobber %g2 in xcall_fetch_glob_regs().
  - ext4: avoid deadlock on sync-mounted FS w/o journal
  - brcm80211: smac: fix endless retry of A-MPDU transmissions
    (Closes: #672891)
  - target: Fix SPC-2 RELEASE bug for multi-session iSCSI client setups
  - ALSA: hda/idt - Fix power-map for speaker-pins with some HP laptops
    (Closes: #672582)
  - usbnet: fix skb traversing races during unlink(v2)
  - [arm] prevent VM_GROWSDOWN mmaps extending below FIRST_USER_ADDRESS

[ Jonathan Nieder ]
* wacom: Add support for various tablet models (Closes: #671801)
* rt2800usb: Add support for Ralink RT5392/RF5372 chipset (Closes: #673186)

[ Ben Hutchings ]
* test-patches: Fix -j option, broken since 3.1.0-1~experimental.1
* rt2800usb: Re-enable powersaving by default, as it should work better
  than in 2.6.38
* [sparc,sparc64] Build virtio-modules-udeb for use in qemu (Closes: #673320)
* KVM: mmu_notifier: Flush TLBs before releasing mmu_lock
* [x86] KVM: nVMX: Fix erroneous exception bitmap check
* [x86] KVM: VMX: vmx_set_cr0 expects kvm->srcu locked
* [s390] KVM: do store status after handling STOP_ON_STOP bit
* [s390] KVM: Sanitize fpc registers for KVM_SET_FPU
* ACPI battery: only refresh the sysfs files when pertinent information
  changes (Closes: #670958)

Show diffs side-by-side

added added

removed removed

Lines of Context:
net/ipv4/tcp_input.c
83
83
EXPORT_SYMBOL(sysctl_tcp_ecn);
84
84
int sysctl_tcp_dsack __read_mostly = 1;
85
85
int sysctl_tcp_app_win __read_mostly = 31;
86
 
int sysctl_tcp_adv_win_scale __read_mostly = 2;
 
86
int sysctl_tcp_adv_win_scale __read_mostly = 1;
87
87
EXPORT_SYMBOL(sysctl_tcp_adv_win_scale);
88
88
 
89
89
int sysctl_tcp_stdurg __read_mostly;
2868
2868
 
2869
2869
        /* Do not moderate cwnd if it's already undone in cwr or recovery. */
2870
2870
        if (tp->undo_marker) {
2871
 
                if (inet_csk(sk)->icsk_ca_state == TCP_CA_CWR)
 
2871
                if (inet_csk(sk)->icsk_ca_state == TCP_CA_CWR) {
2872
2872
                        tp->snd_cwnd = min(tp->snd_cwnd, tp->snd_ssthresh);
2873
 
                else /* PRR */
 
2873
                        tp->snd_cwnd_stamp = tcp_time_stamp;
 
2874
                } else if (tp->snd_ssthresh < TCP_INFINITE_SSTHRESH) {
 
2875
                        /* PRR algorithm. */
2874
2876
                        tp->snd_cwnd = tp->snd_ssthresh;
2875
 
                tp->snd_cwnd_stamp = tcp_time_stamp;
 
2877
                        tp->snd_cwnd_stamp = tcp_time_stamp;
 
2878
                }
2876
2879
        }
2877
2880
        tcp_ca_event(sk, CA_EVENT_COMPLETE_CWR);
2878
2881
}