aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/ipv6_sockglue.c
diff options
context:
space:
mode:
authorEric Dumazet <dada1@cosmosbay.com>2008-01-03 23:46:48 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 18:00:36 -0500
commit65f7651788e18fadb2fbb7276af935d7871e1803 (patch)
treedcad32d4344d6d11d80061773d9d1dbc9ae92223 /net/ipv6/ipv6_sockglue.c
parent571e7682026fd0e25833d103a3eeb74be29bf199 (diff)
[NET]: prot_inuse cleanups and optimizations
1) Cleanups (all functions are prefixed by sock_prot_inuse) sock_prot_inc_use(prot) -> sock_prot_inuse_add(prot,-1) sock_prot_dec_use(prot) -> sock_prot_inuse_add(prot,-1) sock_prot_inuse() -> sock_prot_inuse_get() New functions : sock_prot_inuse_init() and sock_prot_inuse_free() to abstract pcounter use. 2) if CONFIG_PROC_FS=n, we can zap 'inuse' member from "struct proto", since nobody wants to read the inuse value. This saves 1372 bytes on i386/SMP and some cpu cycles. Signed-off-by: Eric Dumazet <dada1@cosmosbay.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/ipv6_sockglue.c')
-rw-r--r--net/ipv6/ipv6_sockglue.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
index 20fece4ad3d..bf2a686aa13 100644
--- a/net/ipv6/ipv6_sockglue.c
+++ b/net/ipv6/ipv6_sockglue.c
@@ -268,8 +268,8 @@ static int do_ipv6_setsockopt(struct sock *sk, int level, int optname,
268 struct inet_connection_sock *icsk = inet_csk(sk); 268 struct inet_connection_sock *icsk = inet_csk(sk);
269 269
270 local_bh_disable(); 270 local_bh_disable();
271 sock_prot_dec_use(sk->sk_prot); 271 sock_prot_inuse_add(sk->sk_prot, -1);
272 sock_prot_inc_use(&tcp_prot); 272 sock_prot_inuse_add(&tcp_prot, 1);
273 local_bh_enable(); 273 local_bh_enable();
274 sk->sk_prot = &tcp_prot; 274 sk->sk_prot = &tcp_prot;
275 icsk->icsk_af_ops = &ipv4_specific; 275 icsk->icsk_af_ops = &ipv4_specific;
@@ -282,8 +282,8 @@ static int do_ipv6_setsockopt(struct sock *sk, int level, int optname,
282 if (sk->sk_protocol == IPPROTO_UDPLITE) 282 if (sk->sk_protocol == IPPROTO_UDPLITE)
283 prot = &udplite_prot; 283 prot = &udplite_prot;
284 local_bh_disable(); 284 local_bh_disable();
285 sock_prot_dec_use(sk->sk_prot); 285 sock_prot_inuse_add(sk->sk_prot, -1);
286 sock_prot_inc_use(prot); 286 sock_prot_inuse_add(prot, 1);
287 local_bh_enable(); 287 local_bh_enable();
288 sk->sk_prot = prot; 288 sk->sk_prot = prot;
289 sk->sk_socket->ops = &inet_dgram_ops; 289 sk->sk_socket->ops = &inet_dgram_ops;