Now, TCP_CHECK_TIMER is not used for debuging, it does nothing.
And, it has been there for several years, maybe 6 years.
Remove it to keep code clearer.
Signed-off-by: Shan Wei <shanwei@cn.fujitsu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-#define TCP_CHECK_TIMER(sk) do { } while (0)
-
static inline void tcp_mib_init(struct net *net)
{
/* See RFC 2012 */
static inline void tcp_mib_init(struct net *net)
{
/* See RFC 2012 */
res = do_tcp_sendpages(sk, &page, offset, size, flags);
res = do_tcp_sendpages(sk, &page, offset, size, flags);
release_sock(sk);
return res;
}
release_sock(sk);
return res;
}
long timeo;
lock_sock(sk);
long timeo;
lock_sock(sk);
flags = msg->msg_flags;
timeo = sock_sndtimeo(sk, flags & MSG_DONTWAIT);
flags = msg->msg_flags;
timeo = sock_sndtimeo(sk, flags & MSG_DONTWAIT);
out:
if (copied)
tcp_push(sk, flags, mss_now, tp->nonagle);
out:
if (copied)
tcp_push(sk, flags, mss_now, tp->nonagle);
release_sock(sk);
return copied;
release_sock(sk);
return copied;
goto out;
out_err:
err = sk_stream_error(sk, flags, err);
goto out;
out_err:
err = sk_stream_error(sk, flags, err);
release_sock(sk);
return err;
}
release_sock(sk);
return err;
}
err = -ENOTCONN;
if (sk->sk_state == TCP_LISTEN)
goto out;
err = -ENOTCONN;
if (sk->sk_state == TCP_LISTEN)
goto out;
/* Clean up data we have read: This will do ACK frames. */
tcp_cleanup_rbuf(sk, copied);
/* Clean up data we have read: This will do ACK frames. */
tcp_cleanup_rbuf(sk, copied);
release_sock(sk);
return copied;
out:
release_sock(sk);
return copied;
out:
release_sock(sk);
return err;
release_sock(sk);
return err;
if (sk->sk_state == TCP_ESTABLISHED) { /* Fast path */
sock_rps_save_rxhash(sk, skb->rxhash);
if (sk->sk_state == TCP_ESTABLISHED) { /* Fast path */
sock_rps_save_rxhash(sk, skb->rxhash);
if (tcp_rcv_established(sk, skb, tcp_hdr(skb), skb->len)) {
rsk = sk;
goto reset;
}
if (tcp_rcv_established(sk, skb, tcp_hdr(skb), skb->len)) {
rsk = sk;
goto reset;
}
} else
sock_rps_save_rxhash(sk, skb->rxhash);
} else
sock_rps_save_rxhash(sk, skb->rxhash);
if (tcp_rcv_state_process(sk, skb, tcp_hdr(skb), skb->len)) {
rsk = sk;
goto reset;
}
if (tcp_rcv_state_process(sk, skb, tcp_hdr(skb), skb->len)) {
rsk = sk;
goto reset;
}
tcp_send_ack(sk);
NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_DELAYEDACKS);
}
tcp_send_ack(sk);
NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_DELAYEDACKS);
}
out:
if (tcp_memory_pressure)
out:
if (tcp_memory_pressure)
tcp_probe_timer(sk);
break;
}
tcp_probe_timer(sk);
break;
}
elapsed = keepalive_time_when(tp) - elapsed;
}
elapsed = keepalive_time_when(tp) - elapsed;
}
sk_mem_reclaim(sk);
resched:
sk_mem_reclaim(sk);
resched:
opt_skb = skb_clone(skb, GFP_ATOMIC);
if (sk->sk_state == TCP_ESTABLISHED) { /* Fast path */
opt_skb = skb_clone(skb, GFP_ATOMIC);
if (sk->sk_state == TCP_ESTABLISHED) { /* Fast path */
if (tcp_rcv_established(sk, skb, tcp_hdr(skb), skb->len))
goto reset;
if (tcp_rcv_established(sk, skb, tcp_hdr(skb), skb->len))
goto reset;
if (opt_skb)
goto ipv6_pktoptions;
return 0;
if (opt_skb)
goto ipv6_pktoptions;
return 0;
if (tcp_rcv_state_process(sk, skb, tcp_hdr(skb), skb->len))
goto reset;
if (tcp_rcv_state_process(sk, skb, tcp_hdr(skb), skb->len))
goto reset;
if (opt_skb)
goto ipv6_pktoptions;
return 0;
if (opt_skb)
goto ipv6_pktoptions;
return 0;