git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
[pandora-kernel.git]
/
net
/
netfilter
/
nf_sockopt.c
diff --git
a/net/netfilter/nf_sockopt.c
b/net/netfilter/nf_sockopt.c
index
3dd4b3c
..
0148968
100644
(file)
--- 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 (
!net_eq(sock_net(sk), &init_net)
)
return ERR_PTR(-ENOPROTOOPT);
if (mutex_lock_interruptible(&nf_sockopt_mutex) != 0)