tcp: use semicolons rather than commas to separate statements
authorJulia Lawall <Julia.Lawall@inria.fr>
Sun, 11 Oct 2020 10:34:56 +0000 (12:34 +0200)
committerJakub Kicinski <kuba@kernel.org>
Wed, 14 Oct 2020 00:11:52 +0000 (17:11 -0700)
Replace commas with semicolons.  Commas introduce unnecessary
variability in the code structure and are hard to see.  What is done
is essentially described by the following Coccinelle semantic patch
(http://coccinelle.lip6.fr/):

// <smpl>
@@ expression e1,e2; @@
e1
-,
+;
e2
... when any
// </smpl>

Signed-off-by: Julia Lawall <Julia.Lawall@inria.fr>
Link: https://lore.kernel.org/r/1602412498-32025-4-git-send-email-Julia.Lawall@inria.fr
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/ipv4/tcp_input.c
net/ipv4/tcp_vegas.c

index c15ca20..67f10d3 100644 (file)
@@ -4430,7 +4430,8 @@ static void tcp_sack_maybe_coalesce(struct tcp_sock *tp)
                                sp[i] = sp[i + 1];
                        continue;
                }
-               this_sack++, swalk++;
+               this_sack++;
+               swalk++;
        }
 }
 
index 3f51e78..c8003c8 100644 (file)
@@ -293,10 +293,10 @@ size_t tcp_vegas_get_info(struct sock *sk, u32 ext, int *attr,
        const struct vegas *ca = inet_csk_ca(sk);
 
        if (ext & (1 << (INET_DIAG_VEGASINFO - 1))) {
-               info->vegas.tcpv_enabled = ca->doing_vegas_now,
-               info->vegas.tcpv_rttcnt = ca->cntRTT,
-               info->vegas.tcpv_rtt = ca->baseRTT,
-               info->vegas.tcpv_minrtt = ca->minRTT,
+               info->vegas.tcpv_enabled = ca->doing_vegas_now;
+               info->vegas.tcpv_rttcnt = ca->cntRTT;
+               info->vegas.tcpv_rtt = ca->baseRTT;
+               info->vegas.tcpv_minrtt = ca->minRTT;
 
                *attr = INET_DIAG_VEGASINFO;
                return sizeof(struct tcpvegas_info);