diff options
Diffstat (limited to 'include/net/tcp.h')
-rw-r--r-- | include/net/tcp.h | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/include/net/tcp.h b/include/net/tcp.h index 34f5cc24d90..87d164b9bd8 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h | |||
@@ -400,6 +400,8 @@ extern int compat_tcp_setsockopt(struct sock *sk, | |||
400 | int level, int optname, | 400 | int level, int optname, |
401 | char __user *optval, unsigned int optlen); | 401 | char __user *optval, unsigned int optlen); |
402 | extern void tcp_set_keepalive(struct sock *sk, int val); | 402 | extern void tcp_set_keepalive(struct sock *sk, int val); |
403 | extern void tcp_syn_ack_timeout(struct sock *sk, | ||
404 | struct request_sock *req); | ||
403 | extern int tcp_recvmsg(struct kiocb *iocb, struct sock *sk, | 405 | extern int tcp_recvmsg(struct kiocb *iocb, struct sock *sk, |
404 | struct msghdr *msg, | 406 | struct msghdr *msg, |
405 | size_t len, int nonblock, | 407 | size_t len, int nonblock, |
@@ -856,13 +858,6 @@ static inline void tcp_check_probe_timer(struct sock *sk) | |||
856 | icsk->icsk_rto, TCP_RTO_MAX); | 858 | icsk->icsk_rto, TCP_RTO_MAX); |
857 | } | 859 | } |
858 | 860 | ||
859 | static inline void tcp_push_pending_frames(struct sock *sk) | ||
860 | { | ||
861 | struct tcp_sock *tp = tcp_sk(sk); | ||
862 | |||
863 | __tcp_push_pending_frames(sk, tcp_current_mss(sk), tp->nonagle); | ||
864 | } | ||
865 | |||
866 | static inline void tcp_init_wl(struct tcp_sock *tp, u32 seq) | 861 | static inline void tcp_init_wl(struct tcp_sock *tp, u32 seq) |
867 | { | 862 | { |
868 | tp->snd_wl1 = seq; | 863 | tp->snd_wl1 = seq; |
@@ -972,7 +967,8 @@ static inline void tcp_sack_reset(struct tcp_options_received *rx_opt) | |||
972 | /* Determine a window scaling and initial window to offer. */ | 967 | /* Determine a window scaling and initial window to offer. */ |
973 | extern void tcp_select_initial_window(int __space, __u32 mss, | 968 | extern void tcp_select_initial_window(int __space, __u32 mss, |
974 | __u32 *rcv_wnd, __u32 *window_clamp, | 969 | __u32 *rcv_wnd, __u32 *window_clamp, |
975 | int wscale_ok, __u8 *rcv_wscale); | 970 | int wscale_ok, __u8 *rcv_wscale, |
971 | __u32 init_rcv_wnd); | ||
976 | 972 | ||
977 | static inline int tcp_win_from_space(int space) | 973 | static inline int tcp_win_from_space(int space) |
978 | { | 974 | { |
@@ -1342,6 +1338,15 @@ static inline int tcp_write_queue_empty(struct sock *sk) | |||
1342 | return skb_queue_empty(&sk->sk_write_queue); | 1338 | return skb_queue_empty(&sk->sk_write_queue); |
1343 | } | 1339 | } |
1344 | 1340 | ||
1341 | static inline void tcp_push_pending_frames(struct sock *sk) | ||
1342 | { | ||
1343 | if (tcp_send_head(sk)) { | ||
1344 | struct tcp_sock *tp = tcp_sk(sk); | ||
1345 | |||
1346 | __tcp_push_pending_frames(sk, tcp_current_mss(sk), tp->nonagle); | ||
1347 | } | ||
1348 | } | ||
1349 | |||
1345 | /* Start sequence of the highest skb with SACKed bit, valid only if | 1350 | /* Start sequence of the highest skb with SACKed bit, valid only if |
1346 | * sacked > 0 or when the caller has ensured validity by itself. | 1351 | * sacked > 0 or when the caller has ensured validity by itself. |
1347 | */ | 1352 | */ |