---

yaml --- r: 184173 b: refs/heads/master c: 857b409 h: refs/heads/master i: 184171: 3ebfa1e v: v3
git-mirror · Feb 12, 2010 · 8b2df03 · 8b2df03
1 parent 2b60914
commit 8b2df03
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b2907e501945d5d13326a6a7441c13e41cd0e799
+refs/heads/master: 857b409a48bdc33e824dff2d730e271b964e78bd
diff --git a/trunk/include/net/netfilter/nf_conntrack_expect.h b/trunk/include/net/netfilter/nf_conntrack_expect.h
@@ -56,11 +56,7 @@ struct nf_conntrack_expect {
 
 static inline struct net *nf_ct_exp_net(struct nf_conntrack_expect *exp)
 {
-#ifdef CONFIG_NET_NS
-	return exp->master->ct_net;	/* by definition */
-#else
-	return &init_net;
-#endif
+	return nf_ct_net(exp->master);
 }
 
 struct nf_conntrack_expect_policy {