aboutsummaryrefslogtreecommitdiffstats
path: root/net/dccp/dccp.h
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@mandriva.com>2006-03-21 01:00:37 -0500
committerDavid S. Miller <davem@davemloft.net>2006-03-21 01:00:37 -0500
commit72478873571d869906f7a250b09e12fa5b65e321 (patch)
tree562e6179922a5eef9c1f3eb7b1bf3813a6e53545 /net/dccp/dccp.h
parentc25a18ba347f091d1ce620ba33e6772b60a528e1 (diff)
[DCCP] ipv6: Add missing ipv6 control socket
I guess I forgot to add it, nah, now it just works: 18:04:33.274066 IP6 ::1.1476 > ::1.5001: request (service=0) 18:04:33.334482 IP6 ::1.5001 > ::1.1476: reset (code=bad_service_code) Ditched IP_DCCP_UNLOAD_HACK, as now we would have to do it for both IPv6 and IPv4, so I'll come up with another way for freeing the control sockets in upcoming changesets. Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dccp/dccp.h')
-rw-r--r--net/dccp/dccp.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/net/dccp/dccp.h b/net/dccp/dccp.h
index 6fcc9d47ae8c..d57d21351149 100644
--- a/net/dccp/dccp.h
+++ b/net/dccp/dccp.h
@@ -177,7 +177,7 @@ extern int dccp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
177extern int dccp_rcv_established(struct sock *sk, struct sk_buff *skb, 177extern int dccp_rcv_established(struct sock *sk, struct sk_buff *skb,
178 const struct dccp_hdr *dh, const unsigned len); 178 const struct dccp_hdr *dh, const unsigned len);
179 179
180extern int dccp_init_sock(struct sock *sk); 180extern int dccp_init_sock(struct sock *sk, const __u8 ctl_sock_initialized);
181extern int dccp_destroy_sock(struct sock *sk); 181extern int dccp_destroy_sock(struct sock *sk);
182 182
183extern void dccp_close(struct sock *sk, long timeout); 183extern void dccp_close(struct sock *sk, long timeout);
@@ -337,8 +337,6 @@ extern void dccp_insert_option(struct sock *sk, struct sk_buff *skb,
337 unsigned char option, 337 unsigned char option,
338 const void *value, unsigned char len); 338 const void *value, unsigned char len);
339 339
340extern struct socket *dccp_ctl_socket;
341
342extern void dccp_timestamp(const struct sock *sk, struct timeval *tv); 340extern void dccp_timestamp(const struct sock *sk, struct timeval *tv);
343 341
344static inline suseconds_t timeval_usecs(const struct timeval *tv) 342static inline suseconds_t timeval_usecs(const struct timeval *tv)