From 052d3202e6cc7994bbac2e1c588801efc6c01f9e Mon Sep 17 00:00:00 2001
From: Martin Josefsson <gandalf@wlug.westbo.se>
Date: Thu, 4 Jan 2007 12:16:54 -0800
Subject: [PATCH] --- yaml --- r: 45219 b: refs/heads/master c:
 bbdc176a2f39913063aaaf95bc27e4b18fd14953 h: refs/heads/master i:   45217:
 2aa71d58d1f4b280aaa989b11490ab3a7555365b   45215:
 446ad210c740c49dd08ced494a8edeb7af63ea59 v: v3

---
 [refs]                                    | 2 +-
 trunk/net/ipv4/netfilter/ipt_MASQUERADE.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 6c23f537340f..12c3a438cfc5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c9386cfddc11e331fa7c860cccaedc2ae8f459f8
+refs/heads/master: bbdc176a2f39913063aaaf95bc27e4b18fd14953
diff --git a/trunk/net/ipv4/netfilter/ipt_MASQUERADE.c b/trunk/net/ipv4/netfilter/ipt_MASQUERADE.c
index 28b9233956b5..d669685afd04 100644
--- a/trunk/net/ipv4/netfilter/ipt_MASQUERADE.c
+++ b/trunk/net/ipv4/netfilter/ipt_MASQUERADE.c
@@ -127,10 +127,13 @@ masquerade_target(struct sk_buff **pskb,
 static inline int
 device_cmp(struct ip_conntrack *i, void *ifindex)
 {
+	int ret;
 #ifdef CONFIG_NF_NAT_NEEDED
 	struct nf_conn_nat *nat = nfct_nat(i);
+
+	if (!nat)
+		return 0;
 #endif
-	int ret;
 
 	read_lock_bh(&masq_lock);
 #ifdef CONFIG_NF_NAT_NEEDED