From 8b2df0348ae04971f48931025fd1426d3da5b7a6 Mon Sep 17 00:00:00 2001
From: Alexey Dobriyan <adobriyan@gmail.com>
Date: Fri, 12 Feb 2010 06:24:46 +0100
Subject: [PATCH] --- yaml --- r: 184173 b: refs/heads/master c:
 857b409a48bdc33e824dff2d730e271b964e78bd h: refs/heads/master i:   184171:
 3ebfa1e774450a154b21eed487f79f8aa6955ac5 v: v3

---
 [refs]                                            | 2 +-
 trunk/include/net/netfilter/nf_conntrack_expect.h | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 11778a119f55..1508e2122311 100644
--- 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
index 917e170fa752..4b47ec19ef39 100644
--- 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 {