diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/ipv4/tcp_input.c | 10 | ||||
-rw-r--r-- | net/ipv4/tcp_output.c | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 46aedd6ca020..31e7e339b567 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c | |||
@@ -1667,7 +1667,7 @@ static void tcp_enter_frto_loss(struct sock *sk, int allowed_segments, int flag) | |||
1667 | tp->high_seq = tp->frto_highmark; | 1667 | tp->high_seq = tp->frto_highmark; |
1668 | TCP_ECN_queue_cwr(tp); | 1668 | TCP_ECN_queue_cwr(tp); |
1669 | 1669 | ||
1670 | clear_all_retrans_hints(tp); | 1670 | tcp_clear_all_retrans_hints(tp); |
1671 | } | 1671 | } |
1672 | 1672 | ||
1673 | void tcp_clear_retrans(struct tcp_sock *tp) | 1673 | void tcp_clear_retrans(struct tcp_sock *tp) |
@@ -1738,7 +1738,7 @@ void tcp_enter_loss(struct sock *sk, int how) | |||
1738 | /* Abort FRTO algorithm if one is in progress */ | 1738 | /* Abort FRTO algorithm if one is in progress */ |
1739 | tp->frto_counter = 0; | 1739 | tp->frto_counter = 0; |
1740 | 1740 | ||
1741 | clear_all_retrans_hints(tp); | 1741 | tcp_clear_all_retrans_hints(tp); |
1742 | } | 1742 | } |
1743 | 1743 | ||
1744 | static int tcp_check_sack_reneging(struct sock *sk) | 1744 | static int tcp_check_sack_reneging(struct sock *sk) |
@@ -2103,7 +2103,7 @@ static void tcp_undo_cwr(struct sock *sk, const int undo) | |||
2103 | 2103 | ||
2104 | /* There is something screwy going on with the retrans hints after | 2104 | /* There is something screwy going on with the retrans hints after |
2105 | an undo */ | 2105 | an undo */ |
2106 | clear_all_retrans_hints(tp); | 2106 | tcp_clear_all_retrans_hints(tp); |
2107 | } | 2107 | } |
2108 | 2108 | ||
2109 | static inline int tcp_may_undo(struct tcp_sock *tp) | 2109 | static inline int tcp_may_undo(struct tcp_sock *tp) |
@@ -2196,7 +2196,7 @@ static int tcp_try_undo_loss(struct sock *sk) | |||
2196 | TCP_SKB_CB(skb)->sacked &= ~TCPCB_LOST; | 2196 | TCP_SKB_CB(skb)->sacked &= ~TCPCB_LOST; |
2197 | } | 2197 | } |
2198 | 2198 | ||
2199 | clear_all_retrans_hints(tp); | 2199 | tcp_clear_all_retrans_hints(tp); |
2200 | 2200 | ||
2201 | DBGUNDO(sk, "partial loss"); | 2201 | DBGUNDO(sk, "partial loss"); |
2202 | tp->lost_out = 0; | 2202 | tp->lost_out = 0; |
@@ -2656,7 +2656,7 @@ static int tcp_clean_rtx_queue(struct sock *sk, __s32 *seq_rtt_p) | |||
2656 | tp->packets_out -= tcp_skb_pcount(skb); | 2656 | tp->packets_out -= tcp_skb_pcount(skb); |
2657 | tcp_unlink_write_queue(skb, sk); | 2657 | tcp_unlink_write_queue(skb, sk); |
2658 | sk_stream_free_skb(sk, skb); | 2658 | sk_stream_free_skb(sk, skb); |
2659 | clear_all_retrans_hints(tp); | 2659 | tcp_clear_all_retrans_hints(tp); |
2660 | } | 2660 | } |
2661 | 2661 | ||
2662 | if (acked&FLAG_ACKED) { | 2662 | if (acked&FLAG_ACKED) { |
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index cbe8bf6dab5f..f46d24b8410f 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c | |||
@@ -687,7 +687,7 @@ int tcp_fragment(struct sock *sk, struct sk_buff *skb, u32 len, unsigned int mss | |||
687 | 687 | ||
688 | BUG_ON(len > skb->len); | 688 | BUG_ON(len > skb->len); |
689 | 689 | ||
690 | clear_all_retrans_hints(tp); | 690 | tcp_clear_all_retrans_hints(tp); |
691 | nsize = skb_headlen(skb) - len; | 691 | nsize = skb_headlen(skb) - len; |
692 | if (nsize < 0) | 692 | if (nsize < 0) |
693 | nsize = 0; | 693 | nsize = 0; |
@@ -1719,7 +1719,7 @@ static void tcp_retrans_try_collapse(struct sock *sk, struct sk_buff *skb, int m | |||
1719 | tcp_skb_pcount(next_skb) != 1); | 1719 | tcp_skb_pcount(next_skb) != 1); |
1720 | 1720 | ||
1721 | /* changing transmit queue under us so clear hints */ | 1721 | /* changing transmit queue under us so clear hints */ |
1722 | clear_all_retrans_hints(tp); | 1722 | tcp_clear_all_retrans_hints(tp); |
1723 | 1723 | ||
1724 | /* Ok. We will be able to collapse the packet. */ | 1724 | /* Ok. We will be able to collapse the packet. */ |
1725 | tcp_unlink_write_queue(next_skb, sk); | 1725 | tcp_unlink_write_queue(next_skb, sk); |
@@ -1792,7 +1792,7 @@ void tcp_simple_retransmit(struct sock *sk) | |||
1792 | } | 1792 | } |
1793 | } | 1793 | } |
1794 | 1794 | ||
1795 | clear_all_retrans_hints(tp); | 1795 | tcp_clear_all_retrans_hints(tp); |
1796 | 1796 | ||
1797 | if (!lost) | 1797 | if (!lost) |
1798 | return; | 1798 | return; |