diff options
Diffstat (limited to 'net/ipv4/tcp.c')
-rw-r--r-- | net/ipv4/tcp.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index a3cabfa2022a..1c29feb6b35f 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c | |||
@@ -516,8 +516,8 @@ static void tcp_listen_stop (struct sock *sk) | |||
516 | { | 516 | { |
517 | struct tcp_sock *tp = tcp_sk(sk); | 517 | struct tcp_sock *tp = tcp_sk(sk); |
518 | struct tcp_listen_opt *lopt = tp->listen_opt; | 518 | struct tcp_listen_opt *lopt = tp->listen_opt; |
519 | struct open_request *acc_req = tp->accept_queue; | 519 | struct request_sock *acc_req = tp->accept_queue; |
520 | struct open_request *req; | 520 | struct request_sock *req; |
521 | int i; | 521 | int i; |
522 | 522 | ||
523 | tcp_delete_keepalive_timer(sk); | 523 | tcp_delete_keepalive_timer(sk); |
@@ -533,7 +533,7 @@ static void tcp_listen_stop (struct sock *sk) | |||
533 | while ((req = lopt->syn_table[i]) != NULL) { | 533 | while ((req = lopt->syn_table[i]) != NULL) { |
534 | lopt->syn_table[i] = req->dl_next; | 534 | lopt->syn_table[i] = req->dl_next; |
535 | lopt->qlen--; | 535 | lopt->qlen--; |
536 | tcp_openreq_free(req); | 536 | reqsk_free(req); |
537 | 537 | ||
538 | /* Following specs, it would be better either to send FIN | 538 | /* Following specs, it would be better either to send FIN |
539 | * (and enter FIN-WAIT-1, it is normal close) | 539 | * (and enter FIN-WAIT-1, it is normal close) |
@@ -573,7 +573,7 @@ static void tcp_listen_stop (struct sock *sk) | |||
573 | sock_put(child); | 573 | sock_put(child); |
574 | 574 | ||
575 | sk_acceptq_removed(sk); | 575 | sk_acceptq_removed(sk); |
576 | tcp_openreq_fastfree(req); | 576 | __reqsk_free(req); |
577 | } | 577 | } |
578 | BUG_TRAP(!sk->sk_ack_backlog); | 578 | BUG_TRAP(!sk->sk_ack_backlog); |
579 | } | 579 | } |
@@ -1894,7 +1894,7 @@ static int wait_for_connect(struct sock *sk, long timeo) | |||
1894 | struct sock *tcp_accept(struct sock *sk, int flags, int *err) | 1894 | struct sock *tcp_accept(struct sock *sk, int flags, int *err) |
1895 | { | 1895 | { |
1896 | struct tcp_sock *tp = tcp_sk(sk); | 1896 | struct tcp_sock *tp = tcp_sk(sk); |
1897 | struct open_request *req; | 1897 | struct request_sock *req; |
1898 | struct sock *newsk; | 1898 | struct sock *newsk; |
1899 | int error; | 1899 | int error; |
1900 | 1900 | ||
@@ -1927,7 +1927,7 @@ struct sock *tcp_accept(struct sock *sk, int flags, int *err) | |||
1927 | 1927 | ||
1928 | newsk = req->sk; | 1928 | newsk = req->sk; |
1929 | sk_acceptq_removed(sk); | 1929 | sk_acceptq_removed(sk); |
1930 | tcp_openreq_fastfree(req); | 1930 | __reqsk_free(req); |
1931 | BUG_TRAP(newsk->sk_state != TCP_SYN_RECV); | 1931 | BUG_TRAP(newsk->sk_state != TCP_SYN_RECV); |
1932 | release_sock(sk); | 1932 | release_sock(sk); |
1933 | return newsk; | 1933 | return newsk; |