diff options
-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); | |||
59 | 59 | ||
60 | #define DCCP_RTO_MAX ((unsigned)(120 * HZ)) /* FIXME: using TCP value */ | 60 | #define DCCP_RTO_MAX ((unsigned)(120 * HZ)) /* FIXME: using TCP value */ |
61 | 61 | ||
62 | extern struct proto dccp_v4_prot; | 62 | extern struct proto dccp_prot; |
63 | 63 | ||
64 | /* is seq1 < seq2 ? */ | 64 | /* is seq1 < seq2 ? */ |
65 | static inline int before48(const u64 seq1, const u64 seq2) | 65 | 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 = { | |||
1317 | .send_reset = dccp_v4_ctl_send_reset, | 1317 | .send_reset = dccp_v4_ctl_send_reset, |
1318 | }; | 1318 | }; |
1319 | 1319 | ||
1320 | struct proto dccp_v4_prot = { | 1320 | struct proto dccp_prot = { |
1321 | .name = "DCCP", | 1321 | .name = "DCCP", |
1322 | .owner = THIS_MODULE, | 1322 | .owner = THIS_MODULE, |
1323 | .close = dccp_close, | 1323 | .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; | |||
684 | static struct inet_protosw dccp_v4_protosw = { | 684 | static struct inet_protosw dccp_v4_protosw = { |
685 | .type = SOCK_DCCP, | 685 | .type = SOCK_DCCP, |
686 | .protocol = IPPROTO_DCCP, | 686 | .protocol = IPPROTO_DCCP, |
687 | .prot = &dccp_v4_prot, | 687 | .prot = &dccp_prot, |
688 | .ops = &inet_dccp_ops, | 688 | .ops = &inet_dccp_ops, |
689 | .capability = -1, | 689 | .capability = -1, |
690 | .no_check = 0, | 690 | .no_check = 0, |
@@ -769,7 +769,7 @@ static int __init dccp_init(void) | |||
769 | { | 769 | { |
770 | unsigned long goal; | 770 | unsigned long goal; |
771 | int ehash_order, bhash_order, i; | 771 | int ehash_order, bhash_order, i; |
772 | int rc = proto_register(&dccp_v4_prot, 1); | 772 | int rc = proto_register(&dccp_prot, 1); |
773 | 773 | ||
774 | if (rc) | 774 | if (rc) |
775 | goto out; | 775 | goto out; |
@@ -872,7 +872,7 @@ out_free_bind_bucket_cachep: | |||
872 | kmem_cache_destroy(dccp_hashinfo.bind_bucket_cachep); | 872 | kmem_cache_destroy(dccp_hashinfo.bind_bucket_cachep); |
873 | dccp_hashinfo.bind_bucket_cachep = NULL; | 873 | dccp_hashinfo.bind_bucket_cachep = NULL; |
874 | out_proto_unregister: | 874 | out_proto_unregister: |
875 | proto_unregister(&dccp_v4_prot); | 875 | proto_unregister(&dccp_prot); |
876 | goto out; | 876 | goto out; |
877 | } | 877 | } |
878 | 878 | ||
@@ -895,7 +895,7 @@ static void __exit dccp_fini(void) | |||
895 | get_order(dccp_hashinfo.ehash_size * | 895 | get_order(dccp_hashinfo.ehash_size * |
896 | sizeof(struct inet_ehash_bucket))); | 896 | sizeof(struct inet_ehash_bucket))); |
897 | kmem_cache_destroy(dccp_hashinfo.bind_bucket_cachep); | 897 | kmem_cache_destroy(dccp_hashinfo.bind_bucket_cachep); |
898 | proto_unregister(&dccp_v4_prot); | 898 | proto_unregister(&dccp_prot); |
899 | } | 899 | } |
900 | 900 | ||
901 | module_init(dccp_init); | 901 | module_init(dccp_init); |