diff options
| author | Arnaldo Carvalho de Melo <acme@ghostprotocols.net> | 2005-06-19 01:48:55 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2005-06-19 01:48:55 -0400 |
| commit | 2ad69c55a282315e6119cf7fd744f26a925bdfd2 (patch) | |
| tree | 85350a384e5c1c6646bd8f9e75c6f11c1f6752ff /net/ipv4 | |
| parent | 0e87506fcc734647c7b2497eee4eb81e785c857a (diff) | |
[NET] rename struct tcp_listen_opt to struct listen_sock
Signed-off-by: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/tcp.c | 2 | ||||
| -rw-r--r-- | net/ipv4/tcp_diag.c | 2 | ||||
| -rw-r--r-- | net/ipv4/tcp_ipv4.c | 4 | ||||
| -rw-r--r-- | net/ipv4/tcp_timer.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index b85a46dd40a0..3a4c52e77e01 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c | |||
| @@ -499,7 +499,7 @@ int tcp_listen_start(struct sock *sk) | |||
| 499 | static void tcp_listen_stop (struct sock *sk) | 499 | static void tcp_listen_stop (struct sock *sk) |
| 500 | { | 500 | { |
| 501 | struct tcp_sock *tp = tcp_sk(sk); | 501 | struct tcp_sock *tp = tcp_sk(sk); |
| 502 | struct tcp_listen_opt *lopt; | 502 | struct listen_sock *lopt; |
| 503 | struct request_sock *acc_req; | 503 | struct request_sock *acc_req; |
| 504 | struct request_sock *req; | 504 | struct request_sock *req; |
| 505 | int i; | 505 | int i; |
diff --git a/net/ipv4/tcp_diag.c b/net/ipv4/tcp_diag.c index c3328fa48837..634befc07921 100644 --- a/net/ipv4/tcp_diag.c +++ b/net/ipv4/tcp_diag.c | |||
| @@ -514,7 +514,7 @@ static int tcpdiag_dump_reqs(struct sk_buff *skb, struct sock *sk, | |||
| 514 | struct tcpdiag_entry entry; | 514 | struct tcpdiag_entry entry; |
| 515 | struct tcpdiagreq *r = NLMSG_DATA(cb->nlh); | 515 | struct tcpdiagreq *r = NLMSG_DATA(cb->nlh); |
| 516 | struct tcp_sock *tp = tcp_sk(sk); | 516 | struct tcp_sock *tp = tcp_sk(sk); |
| 517 | struct tcp_listen_opt *lopt; | 517 | struct listen_sock *lopt; |
| 518 | struct rtattr *bc = NULL; | 518 | struct rtattr *bc = NULL; |
| 519 | struct inet_sock *inet = inet_sk(sk); | 519 | struct inet_sock *inet = inet_sk(sk); |
| 520 | int j, s_j; | 520 | int j, s_j; |
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 1745dc8d25e6..485ca9cb1707 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c | |||
| @@ -874,7 +874,7 @@ static struct request_sock *tcp_v4_search_req(struct tcp_sock *tp, | |||
| 874 | __u16 rport, | 874 | __u16 rport, |
| 875 | __u32 raddr, __u32 laddr) | 875 | __u32 raddr, __u32 laddr) |
| 876 | { | 876 | { |
| 877 | struct tcp_listen_opt *lopt = tp->accept_queue.listen_opt; | 877 | struct listen_sock *lopt = tp->accept_queue.listen_opt; |
| 878 | struct request_sock *req, **prev; | 878 | struct request_sock *req, **prev; |
| 879 | 879 | ||
| 880 | for (prev = &lopt->syn_table[tcp_v4_synq_hash(raddr, rport, lopt->hash_rnd)]; | 880 | for (prev = &lopt->syn_table[tcp_v4_synq_hash(raddr, rport, lopt->hash_rnd)]; |
| @@ -898,7 +898,7 @@ static struct request_sock *tcp_v4_search_req(struct tcp_sock *tp, | |||
| 898 | static void tcp_v4_synq_add(struct sock *sk, struct request_sock *req) | 898 | static void tcp_v4_synq_add(struct sock *sk, struct request_sock *req) |
| 899 | { | 899 | { |
| 900 | struct tcp_sock *tp = tcp_sk(sk); | 900 | struct tcp_sock *tp = tcp_sk(sk); |
| 901 | struct tcp_listen_opt *lopt = tp->accept_queue.listen_opt; | 901 | struct listen_sock *lopt = tp->accept_queue.listen_opt; |
| 902 | u32 h = tcp_v4_synq_hash(inet_rsk(req)->rmt_addr, inet_rsk(req)->rmt_port, lopt->hash_rnd); | 902 | u32 h = tcp_v4_synq_hash(inet_rsk(req)->rmt_addr, inet_rsk(req)->rmt_port, lopt->hash_rnd); |
| 903 | 903 | ||
| 904 | reqsk_queue_hash_req(&tp->accept_queue, h, req, TCP_TIMEOUT_INIT); | 904 | reqsk_queue_hash_req(&tp->accept_queue, h, req, TCP_TIMEOUT_INIT); |
diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c index d97d191149c1..b127b4498565 100644 --- a/net/ipv4/tcp_timer.c +++ b/net/ipv4/tcp_timer.c | |||
| @@ -464,7 +464,7 @@ out_unlock: | |||
| 464 | static void tcp_synack_timer(struct sock *sk) | 464 | static void tcp_synack_timer(struct sock *sk) |
| 465 | { | 465 | { |
| 466 | struct tcp_sock *tp = tcp_sk(sk); | 466 | struct tcp_sock *tp = tcp_sk(sk); |
| 467 | struct tcp_listen_opt *lopt = tp->accept_queue.listen_opt; | 467 | struct listen_sock *lopt = tp->accept_queue.listen_opt; |
| 468 | int max_retries = tp->syn_retries ? : sysctl_tcp_synack_retries; | 468 | int max_retries = tp->syn_retries ? : sysctl_tcp_synack_retries; |
| 469 | int thresh = max_retries; | 469 | int thresh = max_retries; |
| 470 | unsigned long now = jiffies; | 470 | unsigned long now = jiffies; |
