[DCCP]: Just rename dccp_v4_prot to dccp_prot To match TCP equivalent. Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com> Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/net/dccp/dccp.h b/net/dccp/dccp.h index f97b85d..e711f85 100644 --- a/net/dccp/dccp.h +++ b/net/dccp/dccp.h
@@ -59,7 +59,7 @@ #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)
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c index 0ce7d0f..9f69a67 100644 --- a/net/dccp/ipv4.c +++ b/net/dccp/ipv4.c
@@ -1317,7 +1317,7 @@ .send_reset = dccp_v4_ctl_send_reset, }; -struct proto dccp_v4_prot = { +struct proto dccp_prot = { .name = "DCCP", .owner = THIS_MODULE, .close = dccp_close,
diff --git a/net/dccp/proto.c b/net/dccp/proto.c index 7b30c12..9cb2989 100644 --- a/net/dccp/proto.c +++ b/net/dccp/proto.c
@@ -684,7 +684,7 @@ 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 @@ { 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 @@ 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 @@ 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);