Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[linux-2.6-omap-h63xx.git] / net / netfilter / nf_sockopt.c

diff --git a/net/netfilter/nf_sockopt.c b/net/netfilter/nf_sockopt.c
index 87bc1443c52033bfd2be64179bd08321d070c1d9..01489681fa9632de60a4e070e0058696adc83087 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)
@@ -143,12 +143,12 @@ static int compat_nf_sockopt(struct sock *sk, int pf, int val,
                if (ops->compat_get)
                        ret = ops->compat_get(sk, val, opt, len);
                else
-                       ret = ops->get(sk, val, ops, len);
+                       ret = ops->get(sk, val, opt, len);
        } else {
                if (ops->compat_set)
-                       ret = ops->compat_set(sk, val, ops, *len);
+                       ret = ops->compat_set(sk, val, opt, *len);
                else
-                       ret = ops->set(sk, val, ops, *len);
+                       ret = ops->set(sk, val, opt, *len);
        }
 
        module_put(ops->owner);