tcp: do not assume TCP code is non preemptible

[deliverable/linux.git] / net / ipv4 / tcp_cubic.c

diff --git a/net/ipv4/tcp_cubic.c b/net/ipv4/tcp_cubic.c
index 59155af9de5d40ccf73daa8496cf9fd79cd2a987..0ce946e395e1bc3e535cd2e1eeed132b730d0869 100644 (file)
--- a/net/ipv4/tcp_cubic.c
+++ b/net/ipv4/tcp_cubic.c
@@ -402,11 +402,11 @@ static void hystart_update(struct sock *sk, u32 delay)
                        ca->last_ack = now;
                        if ((s32)(now - ca->round_start) > ca->delay_min >> 4) {
                                ca->found |= HYSTART_ACK_TRAIN;
-                               __NET_INC_STATS(sock_net(sk),
-                                               LINUX_MIB_TCPHYSTARTTRAINDETECT);
-                               __NET_ADD_STATS(sock_net(sk),
-                                               LINUX_MIB_TCPHYSTARTTRAINCWND,
-                                               tp->snd_cwnd);
+                               NET_INC_STATS(sock_net(sk),
+                                             LINUX_MIB_TCPHYSTARTTRAINDETECT);
+                               NET_ADD_STATS(sock_net(sk),
+                                             LINUX_MIB_TCPHYSTARTTRAINCWND,
+                                             tp->snd_cwnd);
                                tp->snd_ssthresh = tp->snd_cwnd;
                        }
                }
@@ -423,11 +423,11 @@ static void hystart_update(struct sock *sk, u32 delay)
                        if (ca->curr_rtt > ca->delay_min +
                            HYSTART_DELAY_THRESH(ca->delay_min >> 3)) {
                                ca->found |= HYSTART_DELAY;
-                               __NET_INC_STATS(sock_net(sk),
-                                               LINUX_MIB_TCPHYSTARTDELAYDETECT);
-                               __NET_ADD_STATS(sock_net(sk),
-                                               LINUX_MIB_TCPHYSTARTDELAYCWND,
-                                               tp->snd_cwnd);
+                               NET_INC_STATS(sock_net(sk),
+                                             LINUX_MIB_TCPHYSTARTDELAYDETECT);
+                               NET_ADD_STATS(sock_net(sk),
+                                             LINUX_MIB_TCPHYSTARTDELAYCWND,
+                                             tp->snd_cwnd);
                                tp->snd_ssthresh = tp->snd_cwnd;
                        }
                }