aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6
diff options
context:
space:
mode:
authorPavel Emelyanov <xemul@openvz.org>2008-03-28 19:39:33 -0400
committerDavid S. Miller <davem@davemloft.net>2008-03-28 19:39:33 -0400
commitbdcde3d71a67e97f25e851f3ca97c9bb5ef03e7f (patch)
treeeab4a66777582718ffe2eff9038324331106ec18 /net/ipv6
parent60e7663d462af3994f292cb3691ea4f7371a9220 (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/ipv6')
-rw-r--r--net/ipv6/raw.c3
-rw-r--r--net/ipv6/tcp_ipv6.c3
-rw-r--r--net/ipv6/udp.c3
-rw-r--r--net/ipv6/udplite.c3
4 files changed, 0 insertions, 12 deletions
diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
index 830da460369..c1e495f105a 100644
--- a/net/ipv6/raw.c
+++ b/net/ipv6/raw.c
@@ -1171,8 +1171,6 @@ static int rawv6_init_sk(struct sock *sk)
1171 return(0); 1171 return(0);
1172} 1172}
1173 1173
1174DEFINE_PROTO_INUSE(rawv6)
1175
1176struct proto rawv6_prot = { 1174struct proto rawv6_prot = {
1177 .name = "RAWv6", 1175 .name = "RAWv6",
1178 .owner = THIS_MODULE, 1176 .owner = THIS_MODULE,
@@ -1196,7 +1194,6 @@ struct proto rawv6_prot = {
1196 .compat_setsockopt = compat_rawv6_setsockopt, 1194 .compat_setsockopt = compat_rawv6_setsockopt,
1197 .compat_getsockopt = compat_rawv6_getsockopt, 1195 .compat_getsockopt = compat_rawv6_getsockopt,
1198#endif 1196#endif
1199 REF_PROTO_INUSE(rawv6)
1200}; 1197};
1201 1198
1202#ifdef CONFIG_PROC_FS 1199#ifdef CONFIG_PROC_FS
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 323c7e06ef4..6d851c3c3db 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -2140,8 +2140,6 @@ void tcp6_proc_exit(struct net *net)
2140} 2140}
2141#endif 2141#endif
2142 2142
2143DEFINE_PROTO_INUSE(tcpv6)
2144
2145struct proto tcpv6_prot = { 2143struct proto tcpv6_prot = {
2146 .name = "TCPv6", 2144 .name = "TCPv6",
2147 .owner = THIS_MODULE, 2145 .owner = THIS_MODULE,
@@ -2177,7 +2175,6 @@ struct proto tcpv6_prot = {
2177 .compat_setsockopt = compat_tcp_setsockopt, 2175 .compat_setsockopt = compat_tcp_setsockopt,
2178 .compat_getsockopt = compat_tcp_getsockopt, 2176 .compat_getsockopt = compat_tcp_getsockopt,
2179#endif 2177#endif
2180 REF_PROTO_INUSE(tcpv6)
2181}; 2178};
2182 2179
2183static struct inet6_protocol tcpv6_protocol = { 2180static struct inet6_protocol tcpv6_protocol = {
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index aacbc82ecf0..463ae4d448a 100644
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -999,8 +999,6 @@ void udp6_proc_exit(struct net *net) {
999 999
1000/* ------------------------------------------------------------------------ */ 1000/* ------------------------------------------------------------------------ */
1001 1001
1002DEFINE_PROTO_INUSE(udpv6)
1003
1004struct proto udpv6_prot = { 1002struct proto udpv6_prot = {
1005 .name = "UDPv6", 1003 .name = "UDPv6",
1006 .owner = THIS_MODULE, 1004 .owner = THIS_MODULE,
@@ -1027,7 +1025,6 @@ struct proto udpv6_prot = {
1027 .compat_setsockopt = compat_udpv6_setsockopt, 1025 .compat_setsockopt = compat_udpv6_setsockopt,
1028 .compat_getsockopt = compat_udpv6_getsockopt, 1026 .compat_getsockopt = compat_udpv6_getsockopt,
1029#endif 1027#endif
1030 REF_PROTO_INUSE(udpv6)
1031}; 1028};
1032 1029
1033static struct inet_protosw udpv6_protosw = { 1030static struct inet_protosw udpv6_protosw = {
diff --git a/net/ipv6/udplite.c b/net/ipv6/udplite.c
index 706c5c375a0..c5f5357d115 100644
--- a/net/ipv6/udplite.c
+++ b/net/ipv6/udplite.c
@@ -35,8 +35,6 @@ static struct inet6_protocol udplitev6_protocol = {
35 .flags = INET6_PROTO_NOPOLICY|INET6_PROTO_FINAL, 35 .flags = INET6_PROTO_NOPOLICY|INET6_PROTO_FINAL,
36}; 36};
37 37
38DEFINE_PROTO_INUSE(udplitev6)
39
40struct proto udplitev6_prot = { 38struct proto udplitev6_prot = {
41 .name = "UDPLITEv6", 39 .name = "UDPLITEv6",
42 .owner = THIS_MODULE, 40 .owner = THIS_MODULE,
@@ -60,7 +58,6 @@ struct proto udplitev6_prot = {
60 .compat_setsockopt = compat_udpv6_setsockopt, 58 .compat_setsockopt = compat_udpv6_setsockopt,
61 .compat_getsockopt = compat_udpv6_getsockopt, 59 .compat_getsockopt = compat_udpv6_getsockopt,
62#endif 60#endif
63 REF_PROTO_INUSE(udplitev6)
64}; 61};
65 62
66static struct inet_protosw udplite6_protosw = { 63static struct inet_protosw udplite6_protosw = {