diff options
| author | Arnaldo Carvalho de Melo <acme@mandriva.com> | 2005-12-13 23:23:32 -0800 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-01-03 13:10:49 -0800 |
| commit | 34ca6860810342441f801226b19ae6c9e0ecb34f (patch) | |
| tree | 4daae6985e70f28100f2244e73fcd70394f180b9 /net | |
| parent | 3cf3dc6c2e05e67b12e522f547c0b71d509a516c (diff) | |
| download | blackbird-op-linux-34ca6860810342441f801226b19ae6c9e0ecb34f.tar.gz blackbird-op-linux-34ca6860810342441f801226b19ae6c9e0ecb34f.zip | |
[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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/dccp/dccp.h | 2 | ||||
| -rw-r--r-- | net/dccp/ipv4.c | 2 | ||||
| -rw-r--r-- | net/dccp/proto.c | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/net/dccp/dccp.h b/net/dccp/dccp.h index f97b85d55ad8..e711f850053b 100644 --- a/net/dccp/dccp.h +++ b/net/dccp/dccp.h @@ -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) diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c index 0ce7d0fe5ee7..9f69a67a4b01 100644 --- a/net/dccp/ipv4.c +++ b/net/dccp/ipv4.c @@ -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, diff --git a/net/dccp/proto.c b/net/dccp/proto.c index 7b30c12147c2..9cb2989f93b2 100644 --- a/net/dccp/proto.c +++ b/net/dccp/proto.c @@ -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 @@ out_free_bind_bucket_cachep: 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); |
