diff options
author | YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> | 2008-03-25 13:26:21 -0400 |
---|---|---|
committer | YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> | 2008-03-25 15:39:55 -0400 |
commit | 3b1e0a655f8eba44ab1ee2a1068d169ccfb853b9 (patch) | |
tree | 09edb35f32ebcfb1b4dad904425128a110ef16ee /net/decnet/af_decnet.c | |
parent | c346dca10840a874240c78efe3f39acf4312a1f2 (diff) |
[NET] NETNS: Omit sock->sk_net without CONFIG_NET_NS.
Introduce per-sock inlines: sock_net(), sock_net_set()
and per-inet_timewait_sock inlines: twsk_net(), twsk_net_set().
Without CONFIG_NET_NS, no namespace other than &init_net exists.
Let's explicitly define them to help compiler optimizations.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Diffstat (limited to 'net/decnet/af_decnet.c')
-rw-r--r-- | net/decnet/af_decnet.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c index 3554fb3d251c..fc2efe899e91 100644 --- a/net/decnet/af_decnet.c +++ b/net/decnet/af_decnet.c | |||
@@ -1094,7 +1094,7 @@ static int dn_accept(struct socket *sock, struct socket *newsock, int flags) | |||
1094 | 1094 | ||
1095 | cb = DN_SKB_CB(skb); | 1095 | cb = DN_SKB_CB(skb); |
1096 | sk->sk_ack_backlog--; | 1096 | sk->sk_ack_backlog--; |
1097 | newsk = dn_alloc_sock(sk->sk_net, newsock, sk->sk_allocation); | 1097 | newsk = dn_alloc_sock(sock_net(sk), newsock, sk->sk_allocation); |
1098 | if (newsk == NULL) { | 1098 | if (newsk == NULL) { |
1099 | release_sock(sk); | 1099 | release_sock(sk); |
1100 | kfree_skb(skb); | 1100 | kfree_skb(skb); |