diff options
author | Pavel Emelyanov <xemul@openvz.org> | 2008-03-28 19:39:33 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-03-28 19:39:33 -0400 |
commit | bdcde3d71a67e97f25e851f3ca97c9bb5ef03e7f (patch) | |
tree | eab4a66777582718ffe2eff9038324331106ec18 /net/dccp | |
parent | 60e7663d462af3994f292cb3691ea4f7371a9220 (diff) |
[SOCK]: Drop inuse pcounter from struct proto (v2).
An uppercut - do not use the pcounter on struct proto.
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Acked-by: Eric Dumazet <dada1@cosmosbay.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dccp')
-rw-r--r-- | net/dccp/ipv4.c | 3 | ||||
-rw-r--r-- | net/dccp/ipv6.c | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c index 4ca8b0c93c80..7d62f7eb6134 100644 --- a/net/dccp/ipv4.c +++ b/net/dccp/ipv4.c | |||
@@ -915,8 +915,6 @@ static struct timewait_sock_ops dccp_timewait_sock_ops = { | |||
915 | .twsk_obj_size = sizeof(struct inet_timewait_sock), | 915 | .twsk_obj_size = sizeof(struct inet_timewait_sock), |
916 | }; | 916 | }; |
917 | 917 | ||
918 | DEFINE_PROTO_INUSE(dccp_v4) | ||
919 | |||
920 | static struct proto dccp_v4_prot = { | 918 | static struct proto dccp_v4_prot = { |
921 | .name = "DCCP", | 919 | .name = "DCCP", |
922 | .owner = THIS_MODULE, | 920 | .owner = THIS_MODULE, |
@@ -946,7 +944,6 @@ static struct proto dccp_v4_prot = { | |||
946 | .compat_setsockopt = compat_dccp_setsockopt, | 944 | .compat_setsockopt = compat_dccp_setsockopt, |
947 | .compat_getsockopt = compat_dccp_getsockopt, | 945 | .compat_getsockopt = compat_dccp_getsockopt, |
948 | #endif | 946 | #endif |
949 | REF_PROTO_INUSE(dccp_v4) | ||
950 | }; | 947 | }; |
951 | 948 | ||
952 | static struct net_protocol dccp_v4_protocol = { | 949 | static struct net_protocol dccp_v4_protocol = { |
diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c index 2fec1af1a8c3..ea3f32648618 100644 --- a/net/dccp/ipv6.c +++ b/net/dccp/ipv6.c | |||
@@ -1100,8 +1100,6 @@ static struct timewait_sock_ops dccp6_timewait_sock_ops = { | |||
1100 | .twsk_obj_size = sizeof(struct dccp6_timewait_sock), | 1100 | .twsk_obj_size = sizeof(struct dccp6_timewait_sock), |
1101 | }; | 1101 | }; |
1102 | 1102 | ||
1103 | DEFINE_PROTO_INUSE(dccp_v6) | ||
1104 | |||
1105 | static struct proto dccp_v6_prot = { | 1103 | static struct proto dccp_v6_prot = { |
1106 | .name = "DCCPv6", | 1104 | .name = "DCCPv6", |
1107 | .owner = THIS_MODULE, | 1105 | .owner = THIS_MODULE, |
@@ -1131,7 +1129,6 @@ static struct proto dccp_v6_prot = { | |||
1131 | .compat_setsockopt = compat_dccp_setsockopt, | 1129 | .compat_setsockopt = compat_dccp_setsockopt, |
1132 | .compat_getsockopt = compat_dccp_getsockopt, | 1130 | .compat_getsockopt = compat_dccp_getsockopt, |
1133 | #endif | 1131 | #endif |
1134 | REF_PROTO_INUSE(dccp_v6) | ||
1135 | }; | 1132 | }; |
1136 | 1133 | ||
1137 | static struct inet6_protocol dccp_v6_protocol = { | 1134 | static struct inet6_protocol dccp_v6_protocol = { |