---

yaml --- r: 45219 b: refs/heads/master c: bbdc176 h: refs/heads/master i: 45217: 2aa71d5 45215: 446ad21 v: v3
git-mirror · Jan 4, 2007 · 052d320 · 052d320
1 parent 6d44a91
commit 052d320
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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