summaryrefslogtreecommitdiff
path: root/include/net/tcp.h
diff options
context:
space:
mode:
authorSrinivasarao P <spathi@codeaurora.org>2019-02-27 12:19:37 +0530
committerSrinivasarao P <spathi@codeaurora.org>2019-02-27 12:20:28 +0530
commit567c084d6267ecef2d65ca2be5b359857a6305d8 (patch)
treed550b16fc36c58fba3c9b169a17db3e4182fa9af /include/net/tcp.h
parent119c43587e314ff2ed171b2b5acf70ebd5fbd156 (diff)
parentcf84cdc1d2b5be6b3e74130a1e7156a26a813fa8 (diff)
Merge android-4.4.176 (cf84cdc) into msm-4.4
* refs/heads/tmp-cf84cdc Linux 4.4.176 KVM: VMX: Fix x2apic check in vmx_msr_bitmap_mode() ax25: fix possible use-after-free mISDN: fix a race in dev_expire_timer() net/x25: do not hold the cpu too long in x25_new_lci() mfd: as3722: Mark PM functions as __maybe_unused mfd: as3722: Handle interrupts on suspend kvm: fix kvm_ioctl_create_device() reference counting (CVE-2019-6974) x86: livepatch: Treat R_X86_64_PLT32 as R_X86_64_PC32 net: ipv4: use a dedicated counter for icmp_v4 redirect packets net: stmmac: Fix a race in EEE enable callback vxlan: test dev->flags & IFF_UP before calling netif_rx() tcp: clear icsk_backoff in tcp_write_queue_purge() net: Do not allocate page fragments that are not skb aligned tcp: tcp_v4_err() should be more careful net: Add header for usage of fls64() sky2: Increase D3 delay again net: Fix for_each_netdev_feature on Big endian hwmon: (lm80) Fix missing unlock on error in set_fan_div() vsock: cope with memory allocation failure at socket creation time net: fix IPv6 prefix route residue Change-Id: I73009b0e908406e13fe1ce87f9dbe3341f70af98 Signed-off-by: Srinivasarao P <spathi@codeaurora.org>
Diffstat (limited to 'include/net/tcp.h')
-rw-r--r--include/net/tcp.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/tcp.h b/include/net/tcp.h
index 976f38280309..dd161b625cd7 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -1475,6 +1475,7 @@ static inline void tcp_write_queue_purge(struct sock *sk)
sk_wmem_free_skb(sk, skb);
sk_mem_reclaim(sk);
tcp_clear_all_retrans_hints(tcp_sk(sk));
+ inet_csk(sk)->icsk_backoff = 0;
}
static inline struct sk_buff *tcp_write_queue_head(const struct sock *sk)