---

yaml --- r: 112104 b: refs/heads/master c: 4de6f16 h: refs/heads/master v: v3
git-mirror · Oct 8, 2008 · 4dd786b · 4dd786b
1 parent 3188c22
commit 4dd786b
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 12 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cfd6e3d74751b62b6d0844e24c911776e40a0135
+refs/heads/master: 4de6f16b9ec2422fa7ef9c22f7b1c8d5a55499b4
diff --git a/trunk/net/netfilter/core.c b/trunk/net/netfilter/core.c
@@ -165,14 +165,6 @@ int nf_hook_slow(u_int8_t pf, unsigned int hook, struct sk_buff *skb,
 	unsigned int verdict;
 	int ret = 0;
 
-#ifdef CONFIG_NET_NS
-	struct net *net;
-
-	net = indev == NULL ? dev_net(outdev) : dev_net(indev);
-	if (net != &init_net)
-		return 1;
-#endif
-
 	/* We may already have this, but read-locks nest anyway */
 	rcu_read_lock();
 

diff --git a/trunk/net/netfilter/nf_sockopt.c b/trunk/net/netfilter/nf_sockopt.c
@@ -65,9 +65,6 @@ static struct nf_sockopt_ops *nf_sockopt_find(struct sock *sk, u_int8_t pf,
 {
 	struct nf_sockopt_ops *ops;
 
-	if (!net_eq(sock_net(sk), &init_net))
-		return ERR_PTR(-ENOPROTOOPT);
-
 	if (mutex_lock_interruptible(&nf_sockopt_mutex) != 0)
 		return ERR_PTR(-EINTR);