diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/request_sock.h | 13 | ||||
| -rw-r--r-- | include/net/tcp.h | 6 | 
2 files changed, 4 insertions, 15 deletions
diff --git a/include/net/request_sock.h b/include/net/request_sock.h index c3cdd6c9f44..b01d8dd9ee7 100644 --- a/include/net/request_sock.h +++ b/include/net/request_sock.h @@ -226,19 +226,6 @@ static inline struct request_sock *reqsk_queue_remove(struct request_sock_queue  	return req;  } -static inline struct sock *reqsk_queue_get_child(struct request_sock_queue *queue, -						 struct sock *parent) -{ -	struct request_sock *req = reqsk_queue_remove(queue); -	struct sock *child = req->sk; - -	WARN_ON(child == NULL); - -	sk_acceptq_removed(parent); -	__reqsk_free(req); -	return child; -} -  static inline int reqsk_queue_removed(struct request_sock_queue *queue,  				      struct request_sock *req)  { diff --git a/include/net/tcp.h b/include/net/tcp.h index 9f8821e3293..1421b02a790 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -424,7 +424,8 @@ extern enum tcp_tw_status tcp_timewait_state_process(struct inet_timewait_sock *  						     const struct tcphdr *th);  extern struct sock * tcp_check_req(struct sock *sk,struct sk_buff *skb,  				   struct request_sock *req, -				   struct request_sock **prev); +				   struct request_sock **prev, +				   bool fastopen);  extern int tcp_child_process(struct sock *parent, struct sock *child,  			     struct sk_buff *skb);  extern bool tcp_use_frto(struct sock *sk); @@ -478,7 +479,8 @@ extern int tcp_v4_connect(struct sock *sk, struct sockaddr *uaddr,  extern int tcp_connect(struct sock *sk);  extern struct sk_buff * tcp_make_synack(struct sock *sk, struct dst_entry *dst,  					struct request_sock *req, -					struct request_values *rvp); +					struct request_values *rvp, +					struct tcp_fastopen_cookie *foc);  extern int tcp_disconnect(struct sock *sk, int flags);  void tcp_connect_init(struct sock *sk);  |