tcp: remove CA_ACK_SLOWPATH

re-indent tcp_ack, and remove CA_ACK_SLOWPATH; it is always set now.

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 16 insertions, 19 deletions

diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index bfde9d7d210e..af0a98d54b62 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -3547,6 +3547,7 @@ static int tcp_ack(struct sock *sk, const struct sk_buff *skb, int flag)
         u32 lost = tp->lost;
         int acked = 0; /* Number of packets newly acked */
         int rexmit = REXMIT_NONE; /* Flag to (re)transmit to recover losses */
+        u32 ack_ev_flags = 0;
 
         sack_state.first_sackt = 0;
         sack_state.rate = &rs;
@@ -3590,30 +3591,26 @@ static int tcp_ack(struct sock *sk, const struct sk_buff *skb, int flag)
         if (flag & FLAG_UPDATE_TS_RECENT)
                 tcp_replace_ts_recent(tp, TCP_SKB_CB(skb)->seq);
 
-        {
-                u32 ack_ev_flags = CA_ACK_SLOWPATH;
-
-                if (ack_seq != TCP_SKB_CB(skb)->end_seq)
-                        flag |= FLAG_DATA;
-                else
-                        NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPPUREACKS);
+        if (ack_seq != TCP_SKB_CB(skb)->end_seq)
+                flag |= FLAG_DATA;
+        else
+                NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPPUREACKS);
 
-                flag |= tcp_ack_update_window(sk, skb, ack, ack_seq);
+        flag |= tcp_ack_update_window(sk, skb, ack, ack_seq);
 
-                if (TCP_SKB_CB(skb)->sacked)
-                        flag |= tcp_sacktag_write_queue(sk, skb, prior_snd_una,
-                                                        &sack_state);
+        if (TCP_SKB_CB(skb)->sacked)
+                flag |= tcp_sacktag_write_queue(sk, skb, prior_snd_una,
+                                                &sack_state);
 
-                if (tcp_ecn_rcv_ecn_echo(tp, tcp_hdr(skb))) {
-                        flag |= FLAG_ECE;
-                        ack_ev_flags |= CA_ACK_ECE;
-                }
+        if (tcp_ecn_rcv_ecn_echo(tp, tcp_hdr(skb))) {
+                flag |= FLAG_ECE;
+                ack_ev_flags = CA_ACK_ECE;
+        }
 
-                if (flag & FLAG_WIN_UPDATE)
-                        ack_ev_flags |= CA_ACK_WIN_UPDATE;
+        if (flag & FLAG_WIN_UPDATE)
+                ack_ev_flags |= CA_ACK_WIN_UPDATE;
 
-                tcp_in_ack_event(sk, ack_ev_flags);
-        }
+        tcp_in_ack_event(sk, ack_ev_flags);
 
         /* We passed data and got it acked, remove any soft error
          * log. Something worked...