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/x25/af_x25.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/x25/af_x25.c')
-rw-r--r-- | net/x25/af_x25.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c index 7a46ea73fe2d..6ba67c523c16 100644 --- a/net/x25/af_x25.c +++ b/net/x25/af_x25.c | |||
@@ -549,7 +549,7 @@ static struct sock *x25_make_new(struct sock *osk) | |||
549 | if (osk->sk_type != SOCK_SEQPACKET) | 549 | if (osk->sk_type != SOCK_SEQPACKET) |
550 | goto out; | 550 | goto out; |
551 | 551 | ||
552 | if ((sk = x25_alloc_socket(osk->sk_net)) == NULL) | 552 | if ((sk = x25_alloc_socket(sock_net(osk))) == NULL) |
553 | goto out; | 553 | goto out; |
554 | 554 | ||
555 | x25 = x25_sk(sk); | 555 | x25 = x25_sk(sk); |