: Move dccp_v4_{init,destroy}_sock to the core
PATCH 2/7 : 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 <[email protected]>
---
net/dccp/dccp.h | 4 +- net/dccp/ipv4.c | 106 +++--------------------------------------------------- net/dccp/ipv6.c | 4 +- net/dccp/proto.c | 102 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 112 insertions(+), 104 deletions(-)
8f62e07749b62f28242dc9fb7db5c0531d33401e
net/dccp/dccp.h +2 -2
@@ -228,8 +228,8 @@ extern int dccp_rcv_state_process(structextern int dccp_rcv_established (struct sock *sk,struct sk_buff *skb,const struct dccp_hdr *dh,const unsigned len); -extern int dccp_v4_init_sock (struct sock *sk); -extern int dccp_v4_destroy_sock (struct sock *sk); +extern int dccp_init_sock (struct sock *sk); +extern int dccp_destroy_sock (struct sock *sk);extern void dccp_close (struct sock *sk,long timeout); extern struct sk_buff *dccp_make_response(struct sock *sk,
net/dccp/ipv4.c +6 -98
120 lines not on this page · raw message
net/dccp/ipv6.c +2 -2
@@ -1146,7 +1146,7 @@ static struct inet_connection_sock_af_op*/ static int dccp_v6_init_sock (struct sock *sk) { -int err =dccp_v4_init_sock (sk); +int err =dccp_init_sock (sk);if (err =0 )inet_csk (sk)->icsk_af_ops = &dccp_ipv6_af_ops;
@@ -1156,7 +1156,7 @@ static int dccp_v6_init_sock(struct sockstatic int dccp_v6_destroy_sock (struct sock *sk) { -dccp_v4_destroy_sock (sk); +dccp_destroy_sock (sk);return inet6_destroy_sock (sk); }
net/dccp/proto.c +100 -0
106 lines not on this page · raw message
Signature · 1 line
1.2.2.gd27d