diff options
| author | YOSHIFUJI Hideaki | 2008-03-25 18:26:21 +0100 |
|---|---|---|
| committer | YOSHIFUJI Hideaki | 2008-03-25 20:39:55 +0100 |
| commit | 3b1e0a655f8eba44ab1ee2a1068d169ccfb853b9 (patch) | |
| tree | 09edb35f32ebcfb1b4dad904425128a110ef16ee /net/netfilter | |
| parent | [NET] NETNS: Omit net_device->nd_net without CONFIG_NET_NS. (diff) | |
| download | kernel-qcow2-linux-3b1e0a655f8eba44ab1ee2a1068d169ccfb853b9.tar.gz kernel-qcow2-linux-3b1e0a655f8eba44ab1ee2a1068d169ccfb853b9.tar.xz kernel-qcow2-linux-3b1e0a655f8eba44ab1ee2a1068d169ccfb853b9.zip | |
[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/netfilter')
| -rw-r--r-- | net/netfilter/nf_sockopt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/nf_sockopt.c b/net/netfilter/nf_sockopt.c index 3dd4b3c76d81..69d699f95f4c 100644 --- a/net/netfilter/nf_sockopt.c +++ b/net/netfilter/nf_sockopt.c @@ -65,7 +65,7 @@ static struct nf_sockopt_ops *nf_sockopt_find(struct sock *sk, int pf, { struct nf_sockopt_ops *ops; - if (sk->sk_net != &init_net) + if (sock_net(sk) != &init_net) return ERR_PTR(-ENOPROTOOPT); if (mutex_lock_interruptible(&nf_sockopt_mutex) != 0) |