aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/tcp_output.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/ipv4/tcp_output.c')
-rw-r--r--net/ipv4/tcp_output.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index c48baf734e8c..b1b2045ac3a9 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -2212,8 +2212,8 @@ static bool skb_still_in_host_queue(const struct sock *sk,
2212 const struct sk_buff *skb) 2212 const struct sk_buff *skb)
2213{ 2213{
2214 if (unlikely(skb_fclone_busy(sk, skb))) { 2214 if (unlikely(skb_fclone_busy(sk, skb))) {
2215 NET_INC_STATS_BH(sock_net(sk), 2215 __NET_INC_STATS(sock_net(sk),
2216 LINUX_MIB_TCPSPURIOUS_RTX_HOSTQUEUES); 2216 LINUX_MIB_TCPSPURIOUS_RTX_HOSTQUEUES);
2217 return true; 2217 return true;
2218 } 2218 }
2219 return false; 2219 return false;
@@ -2275,7 +2275,7 @@ void tcp_send_loss_probe(struct sock *sk)
2275 tp->tlp_high_seq = tp->snd_nxt; 2275 tp->tlp_high_seq = tp->snd_nxt;
2276 2276
2277probe_sent: 2277probe_sent:
2278 NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_TCPLOSSPROBES); 2278 __NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPLOSSPROBES);
2279 /* Reset s.t. tcp_rearm_rto will restart timer from now */ 2279 /* Reset s.t. tcp_rearm_rto will restart timer from now */
2280 inet_csk(sk)->icsk_pending = 0; 2280 inet_csk(sk)->icsk_pending = 0;
2281rearm_timer: 2281rearm_timer:
@@ -2656,7 +2656,7 @@ int __tcp_retransmit_skb(struct sock *sk, struct sk_buff *skb, int segs)
2656 /* Update global TCP statistics. */ 2656 /* Update global TCP statistics. */
2657 TCP_ADD_STATS(sock_net(sk), TCP_MIB_RETRANSSEGS, segs); 2657 TCP_ADD_STATS(sock_net(sk), TCP_MIB_RETRANSSEGS, segs);
2658 if (TCP_SKB_CB(skb)->tcp_flags & TCPHDR_SYN) 2658 if (TCP_SKB_CB(skb)->tcp_flags & TCPHDR_SYN)
2659 NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_TCPSYNRETRANS); 2659 __NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPSYNRETRANS);
2660 tp->total_retrans += segs; 2660 tp->total_retrans += segs;
2661 } 2661 }
2662 return err; 2662 return err;
@@ -2681,7 +2681,7 @@ int tcp_retransmit_skb(struct sock *sk, struct sk_buff *skb, int segs)
2681 tp->retrans_stamp = tcp_skb_timestamp(skb); 2681 tp->retrans_stamp = tcp_skb_timestamp(skb);
2682 2682
2683 } else if (err != -EBUSY) { 2683 } else if (err != -EBUSY) {
2684 NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_TCPRETRANSFAIL); 2684 __NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPRETRANSFAIL);
2685 } 2685 }
2686 2686
2687 if (tp->undo_retrans < 0) 2687 if (tp->undo_retrans < 0)
@@ -2805,7 +2805,7 @@ begin_fwd:
2805 if (tcp_retransmit_skb(sk, skb, segs)) 2805 if (tcp_retransmit_skb(sk, skb, segs))
2806 return; 2806 return;
2807 2807
2808 NET_INC_STATS_BH(sock_net(sk), mib_idx); 2808 __NET_INC_STATS(sock_net(sk), mib_idx);
2809 2809
2810 if (tcp_in_cwnd_reduction(sk)) 2810 if (tcp_in_cwnd_reduction(sk))
2811 tp->prr_out += tcp_skb_pcount(skb); 2811 tp->prr_out += tcp_skb_pcount(skb);
@@ -3541,7 +3541,7 @@ int tcp_rtx_synack(const struct sock *sk, struct request_sock *req)
3541 res = af_ops->send_synack(sk, NULL, &fl, req, NULL, TCP_SYNACK_NORMAL); 3541 res = af_ops->send_synack(sk, NULL, &fl, req, NULL, TCP_SYNACK_NORMAL);
3542 if (!res) { 3542 if (!res) {
3543 __TCP_INC_STATS(sock_net(sk), TCP_MIB_RETRANSSEGS); 3543 __TCP_INC_STATS(sock_net(sk), TCP_MIB_RETRANSSEGS);
3544 NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_TCPSYNRETRANS); 3544 __NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPSYNRETRANS);
3545 } 3545 }
3546 return res; 3546 return res;
3547} 3547}