Commit 34ca6860 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo Committed by David S. Miller
Browse files

[DCCP]: Just rename dccp_v4_prot to dccp_prot 



To match TCP equivalent.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@mandriva.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3cf3dc6c

net/dccp/dccp.h

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ extern void dccp_time_wait(struct sock *sk, int state, int timeo); 


#define DCCP_RTO_MAX ((unsigned)(120 * HZ)) /* FIXME: using TCP value */



extern struct proto dccp_v4_prot;

extern struct proto dccp_prot;



/* is seq1 < seq2 ? */

static inline int before48(const u64 seq1, const u64 seq2)

net/dccp/ipv4.c

+1 −1
Original line number Diff line number Diff line
@@ -1317,7 +1317,7 @@ static struct request_sock_ops dccp_request_sock_ops = { 
	.send_reset	= dccp_v4_ctl_send_reset,

};



struct proto dccp_v4_prot = {

struct proto dccp_prot = {

	.name			= "DCCP",

	.owner			= THIS_MODULE,

	.close			= dccp_close,

net/dccp/proto.c

+4 −4
Original line number Diff line number Diff line
@@ -684,7 +684,7 @@ extern struct net_proto_family inet_family_ops; 
static struct inet_protosw dccp_v4_protosw = {

	.type		= SOCK_DCCP,

	.protocol	= IPPROTO_DCCP,

	.prot		= &dccp_v4_prot,

	.prot		= &dccp_prot,

	.ops		= &inet_dccp_ops,

	.capability	= -1,

	.no_check	= 0,
@@ -769,7 +769,7 @@ static int __init dccp_init(void) 
{

	unsigned long goal;

	int ehash_order, bhash_order, i;

	int rc = proto_register(&dccp_v4_prot, 1);

	int rc = proto_register(&dccp_prot, 1);



	if (rc)

		goto out;
@@ -872,7 +872,7 @@ static int __init dccp_init(void) 
	kmem_cache_destroy(dccp_hashinfo.bind_bucket_cachep);

	dccp_hashinfo.bind_bucket_cachep = NULL;

out_proto_unregister:

	proto_unregister(&dccp_v4_prot);

	proto_unregister(&dccp_prot);

	goto out;

}
@@ -895,7 +895,7 @@ static void __exit dccp_fini(void) 
		   get_order(dccp_hashinfo.ehash_size *

			     sizeof(struct inet_ehash_bucket)));

	kmem_cache_destroy(dccp_hashinfo.bind_bucket_cachep);

	proto_unregister(&dccp_v4_prot);

	proto_unregister(&dccp_prot);

}



module_init(dccp_init);