[TCP]: clear_all_retrans_hints prefixed by tcp_

In addition, fix its function comment spacing.

Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>

diff --git a/include/net/tcp.h b/include/net/tcp.h
index 4ba256a3f5e08a9679b55f4f14e46b2d9f30a90a..d78ad9bfcfa7e09dbb2cd7a66119f7cead378b96 100644 (file)
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -1066,8 +1066,8 @@ static inline void tcp_mib_init(void)
        TCP_ADD_STATS_USER(TCP_MIB_MAXCONN, -1);
 }
 
-/*from STCP */
-static inline void clear_all_retrans_hints(struct tcp_sock *tp){
+/* from STCP */
+static inline void tcp_clear_all_retrans_hints(struct tcp_sock *tp) {
        tp->lost_skb_hint = NULL;
        tp->scoreboard_skb_hint = NULL;
        tp->retransmit_skb_hint = NULL;

diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 46aedd6ca020fb469cccd3d5370a8f8e530a0d3b..31e7e339b5672566af743a7b30298279e3d3d346 100644 (file)
--- 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)
        tp->high_seq = tp->frto_highmark;
        TCP_ECN_queue_cwr(tp);
 
-       clear_all_retrans_hints(tp);
+       tcp_clear_all_retrans_hints(tp);
 }
 
 void tcp_clear_retrans(struct tcp_sock *tp)
@@ -1738,7 +1738,7 @@ void tcp_enter_loss(struct sock *sk, int how)
        /* Abort FRTO algorithm if one is in progress */
        tp->frto_counter = 0;
 
-       clear_all_retrans_hints(tp);
+       tcp_clear_all_retrans_hints(tp);
 }
 
 static int tcp_check_sack_reneging(struct sock *sk)
@@ -2103,7 +2103,7 @@ static void tcp_undo_cwr(struct sock *sk, const int undo)
 
        /* There is something screwy going on with the retrans hints after
           an undo */
-       clear_all_retrans_hints(tp);
+       tcp_clear_all_retrans_hints(tp);
 }
 
 static inline int tcp_may_undo(struct tcp_sock *tp)
@@ -2196,7 +2196,7 @@ static int tcp_try_undo_loss(struct sock *sk)
                        TCP_SKB_CB(skb)->sacked &= ~TCPCB_LOST;
                }
 
-               clear_all_retrans_hints(tp);
+               tcp_clear_all_retrans_hints(tp);
 
                DBGUNDO(sk, "partial loss");
                tp->lost_out = 0;
@@ -2656,7 +2656,7 @@ static int tcp_clean_rtx_queue(struct sock *sk, __s32 *seq_rtt_p)
                tp->packets_out -= tcp_skb_pcount(skb);
                tcp_unlink_write_queue(skb, sk);
                sk_stream_free_skb(sk, skb);
-               clear_all_retrans_hints(tp);
+               tcp_clear_all_retrans_hints(tp);
        }
 
        if (acked&FLAG_ACKED) {

diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index cbe8bf6dab5f32836907017032f761d3bb264d8d..f46d24b8410fc771288779387309143fbeed88e4 100644 (file)
--- 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
 
        BUG_ON(len > skb->len);
 
-       clear_all_retrans_hints(tp);
+       tcp_clear_all_retrans_hints(tp);
        nsize = skb_headlen(skb) - len;
        if (nsize < 0)
                nsize = 0;
@@ -1719,7 +1719,7 @@ static void tcp_retrans_try_collapse(struct sock *sk, struct sk_buff *skb, int m
                       tcp_skb_pcount(next_skb) != 1);
 
                /* changing transmit queue under us so clear hints */
-               clear_all_retrans_hints(tp);
+               tcp_clear_all_retrans_hints(tp);
 
                /* Ok.  We will be able to collapse the packet. */
                tcp_unlink_write_queue(next_skb, sk);
@@ -1792,7 +1792,7 @@ void tcp_simple_retransmit(struct sock *sk)
                }
        }
 
-       clear_all_retrans_hints(tp);
+       tcp_clear_all_retrans_hints(tp);
 
        if (!lost)
                return;