From: David S. Miller <davem@davemloft.net>
Date: Sun, 12 Nov 2017 00:17:05 +0000 (+0900)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=fdae5f37a88caed9d2105f5a1ff609322f9e5416;p=linux.git

Merge git://git./linux/kernel/git/davem/net
---

fdae5f37a88caed9d2105f5a1ff609322f9e5416
diff --cc net/ipv4/tcp_input.c
index 94d729be42a94,b6bb3cdfad09e..c3447c5512fd8
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@@ -2554,9 -2615,10 +2554,8 @@@ void tcp_simple_retransmit(struct sock 
  	struct tcp_sock *tp = tcp_sk(sk);
  	struct sk_buff *skb;
  	unsigned int mss = tcp_current_mss(sk);
- 	u32 prior_lost = tp->lost_out;
  
 -	tcp_for_write_queue(skb, sk) {
 -		if (skb == tcp_send_head(sk))
 -			break;
 +	skb_rbtree_walk(skb, &sk->tcp_rtx_queue) {
  		if (tcp_skb_seglen(skb) > mss &&
  		    !(TCP_SKB_CB(skb)->sacked & TCPCB_SACKED_ACKED)) {
  			if (TCP_SKB_CB(skb)->sacked & TCPCB_SACKED_RETRANS) {