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/ipv6/tcp_ipv6.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/ipv6/tcp_ipv6.c')
-rw-r--r-- | net/ipv6/tcp_ipv6.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index 086deffff9c9..323c7e06ef43 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c | |||
@@ -1218,7 +1218,7 @@ static struct sock *tcp_v6_hnd_req(struct sock *sk,struct sk_buff *skb) | |||
1218 | if (req) | 1218 | if (req) |
1219 | return tcp_check_req(sk, skb, req, prev); | 1219 | return tcp_check_req(sk, skb, req, prev); |
1220 | 1220 | ||
1221 | nsk = __inet6_lookup_established(sk->sk_net, &tcp_hashinfo, | 1221 | nsk = __inet6_lookup_established(sock_net(sk), &tcp_hashinfo, |
1222 | &ipv6_hdr(skb)->saddr, th->source, | 1222 | &ipv6_hdr(skb)->saddr, th->source, |
1223 | &ipv6_hdr(skb)->daddr, ntohs(th->dest), inet6_iif(skb)); | 1223 | &ipv6_hdr(skb)->daddr, ntohs(th->dest), inet6_iif(skb)); |
1224 | 1224 | ||