diff options
author | Arnaldo Carvalho de Melo <acme@mandriva.com> | 2006-03-21 00:23:15 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2006-03-21 00:23:15 -0500 |
commit | 3e0fadc51f2fde01e0e22f481370a9b5f073bfc3 (patch) | |
tree | 0254dd8d495d2e4a2a1a9adb17b7dc10541796d8 /net/dccp/ipv6.c | |
parent | 017487d7d1e905a5bb529f6a2bc8cf8ea14e2307 (diff) |
[DCCP]: Move dccp_v4_{init,destroy}_sock to the core
Removing one more ipv6 uses ipv4 stuff case in dccp land.
Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dccp/ipv6.c')
-rw-r--r-- | net/dccp/ipv6.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c index ad5a1c66362d..84651bc6453b 100644 --- a/net/dccp/ipv6.c +++ b/net/dccp/ipv6.c | |||
@@ -1146,7 +1146,7 @@ static struct inet_connection_sock_af_ops dccp_ipv6_mapped = { | |||
1146 | */ | 1146 | */ |
1147 | static int dccp_v6_init_sock(struct sock *sk) | 1147 | static int dccp_v6_init_sock(struct sock *sk) |
1148 | { | 1148 | { |
1149 | int err = dccp_v4_init_sock(sk); | 1149 | int err = dccp_init_sock(sk); |
1150 | 1150 | ||
1151 | if (err == 0) | 1151 | if (err == 0) |
1152 | inet_csk(sk)->icsk_af_ops = &dccp_ipv6_af_ops; | 1152 | inet_csk(sk)->icsk_af_ops = &dccp_ipv6_af_ops; |
@@ -1156,7 +1156,7 @@ static int dccp_v6_init_sock(struct sock *sk) | |||
1156 | 1156 | ||
1157 | static int dccp_v6_destroy_sock(struct sock *sk) | 1157 | static int dccp_v6_destroy_sock(struct sock *sk) |
1158 | { | 1158 | { |
1159 | dccp_v4_destroy_sock(sk); | 1159 | dccp_destroy_sock(sk); |
1160 | return inet6_destroy_sock(sk); | 1160 | return inet6_destroy_sock(sk); |
1161 | } | 1161 | } |
1162 | 1162 | ||