From 4eb7c011224113bd49471e7a48da8dde5ea1a9ed Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Mon, 5 Nov 2007 23:42:25 -0800 Subject: [PATCH] --- yaml --- r: 73263 b: refs/heads/master c: c62cf5cb173a5b8446e513a14448460cad435db2 h: refs/heads/master i: 73261: 77d24e31c4ac0dee66d049fcbd1a359722fa496a 73259: c0d42d470bf4508ec405a09bd7da32fe73ff5e2d 73255: 7652b25b58fe3e0b11facf27ba74c7062a30382c 73247: 65a8567e39b2bb7bc64c6ea4b1e2b32ec5db3032 v: v3 --- [refs] | 2 +- trunk/net/dccp/ipv4.c | 3 +++ trunk/net/dccp/ipv6.c | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 6539fec20f64..3b976511587d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8295b6d9e623879344ed0ca7565336e4fd698e42 +refs/heads/master: c62cf5cb173a5b8446e513a14448460cad435db2 diff --git a/trunk/net/dccp/ipv4.c b/trunk/net/dccp/ipv4.c index 01a6a808bdb7..db17b83e8d3e 100644 --- a/trunk/net/dccp/ipv4.c +++ b/trunk/net/dccp/ipv4.c @@ -922,6 +922,8 @@ static struct timewait_sock_ops dccp_timewait_sock_ops = { .twsk_obj_size = sizeof(struct inet_timewait_sock), }; +DEFINE_PROTO_INUSE(dccp_v4) + static struct proto dccp_v4_prot = { .name = "DCCP", .owner = THIS_MODULE, @@ -950,6 +952,7 @@ static struct proto dccp_v4_prot = { .compat_setsockopt = compat_dccp_setsockopt, .compat_getsockopt = compat_dccp_getsockopt, #endif + REF_PROTO_INUSE(dccp_v4) }; static struct net_protocol dccp_v4_protocol = { diff --git a/trunk/net/dccp/ipv6.c b/trunk/net/dccp/ipv6.c index 62428ff137dd..87c98fb86fa8 100644 --- a/trunk/net/dccp/ipv6.c +++ b/trunk/net/dccp/ipv6.c @@ -1107,6 +1107,8 @@ static struct timewait_sock_ops dccp6_timewait_sock_ops = { .twsk_obj_size = sizeof(struct dccp6_timewait_sock), }; +DEFINE_PROTO_INUSE(dccp_v6) + static struct proto dccp_v6_prot = { .name = "DCCPv6", .owner = THIS_MODULE, @@ -1135,6 +1137,7 @@ static struct proto dccp_v6_prot = { .compat_setsockopt = compat_dccp_setsockopt, .compat_getsockopt = compat_dccp_getsockopt, #endif + REF_PROTO_INUSE(dccp_v6) }; static struct inet6_protocol dccp_v6_protocol = {