diff options
author | Arnaldo Carvalho de Melo <acme@ghostprotocols.net> | 2005-06-19 01:47:21 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2005-06-19 01:47:21 -0400 |
commit | 60236fdd08b2169045a3bbfc5ffe1576e6c3c17b (patch) | |
tree | 4541c682cc72daf560ec516e2b5868089a88b6ea /include/linux | |
parent | 2e6599cb899ba4b133f42cbf9d2b1883d2dc583a (diff) |
[NET] Rename open_request to request_sock
Ok, this one just renames some stuff to have a better namespace and to
dissassociate it from TCP:
struct open_request -> struct request_sock
tcp_openreq_alloc -> reqsk_alloc
tcp_openreq_free -> reqsk_free
tcp_openreq_fastfree -> __reqsk_free
With this most of the infrastructure closely resembles a struct
sock methods subset.
Signed-off-by: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/ip.h | 4 | ||||
-rw-r--r-- | include/linux/ipv6.h | 2 | ||||
-rw-r--r-- | include/linux/tcp.h | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/include/linux/ip.h b/include/linux/ip.h index d5b7c907204e..31e7cedd9f84 100644 --- a/include/linux/ip.h +++ b/include/linux/ip.h | |||
@@ -109,7 +109,7 @@ struct ip_options { | |||
109 | #define optlength(opt) (sizeof(struct ip_options) + opt->optlen) | 109 | #define optlength(opt) (sizeof(struct ip_options) + opt->optlen) |
110 | 110 | ||
111 | struct inet_request_sock { | 111 | struct inet_request_sock { |
112 | struct open_request req; | 112 | struct request_sock req; |
113 | u32 loc_addr; | 113 | u32 loc_addr; |
114 | u32 rmt_addr; | 114 | u32 rmt_addr; |
115 | u16 rmt_port; | 115 | u16 rmt_port; |
@@ -123,7 +123,7 @@ struct inet_request_sock { | |||
123 | struct ip_options *opt; | 123 | struct ip_options *opt; |
124 | }; | 124 | }; |
125 | 125 | ||
126 | static inline struct inet_request_sock *inet_rsk(const struct open_request *sk) | 126 | static inline struct inet_request_sock *inet_rsk(const struct request_sock *sk) |
127 | { | 127 | { |
128 | return (struct inet_request_sock *)sk; | 128 | return (struct inet_request_sock *)sk; |
129 | } | 129 | } |
diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h index 98acdbf3d446..6fcd6a0ade24 100644 --- a/include/linux/ipv6.h +++ b/include/linux/ipv6.h | |||
@@ -201,7 +201,7 @@ struct tcp6_request_sock { | |||
201 | int iif; | 201 | int iif; |
202 | }; | 202 | }; |
203 | 203 | ||
204 | static inline struct tcp6_request_sock *tcp6_rsk(const struct open_request *sk) | 204 | static inline struct tcp6_request_sock *tcp6_rsk(const struct request_sock *sk) |
205 | { | 205 | { |
206 | return (struct tcp6_request_sock *)sk; | 206 | return (struct tcp6_request_sock *)sk; |
207 | } | 207 | } |
diff --git a/include/linux/tcp.h b/include/linux/tcp.h index 86771b37b80d..fb54292a15aa 100644 --- a/include/linux/tcp.h +++ b/include/linux/tcp.h | |||
@@ -236,7 +236,7 @@ struct tcp_request_sock { | |||
236 | __u32 snt_isn; | 236 | __u32 snt_isn; |
237 | }; | 237 | }; |
238 | 238 | ||
239 | static inline struct tcp_request_sock *tcp_rsk(const struct open_request *req) | 239 | static inline struct tcp_request_sock *tcp_rsk(const struct request_sock *req) |
240 | { | 240 | { |
241 | return (struct tcp_request_sock *)req; | 241 | return (struct tcp_request_sock *)req; |
242 | } | 242 | } |
@@ -393,8 +393,8 @@ struct tcp_sock { | |||
393 | struct tcp_listen_opt *listen_opt; | 393 | struct tcp_listen_opt *listen_opt; |
394 | 394 | ||
395 | /* FIFO of established children */ | 395 | /* FIFO of established children */ |
396 | struct open_request *accept_queue; | 396 | struct request_sock *accept_queue; |
397 | struct open_request *accept_queue_tail; | 397 | struct request_sock *accept_queue_tail; |
398 | 398 | ||
399 | unsigned int keepalive_time; /* time before keep alive takes place */ | 399 | unsigned int keepalive_time; /* time before keep alive takes place */ |
400 | unsigned int keepalive_intvl; /* time interval between keep alive probes */ | 400 | unsigned int keepalive_intvl; /* time interval between keep alive probes */ |