From 6b19d6070e802ee0e522b440146cc690d33867e8 Mon Sep 17 00:00:00 2001
From: Jesper Juhl <jesper.juhl@gmail.com>
Date: Thu, 5 Jan 2006 12:16:16 -0800
Subject: [PATCH] --- yaml --- r: 16223 b: refs/heads/master c:
 d695aa8a1f133359485e15db06d53e15e7309e4d h: refs/heads/master i:   16221:
 96fabb6dee37f859e1c36fdea976739e54055ddb   16219:
 7234bd24afc75b121c40f20710d2567b6a588bcf   16215:
 88932ba4e15154a83949079216535d886ce95274   16207:
 5b606a3fc76c0c0fcc62f588aec60c7c80b26692   16191:
 a68d7bcf665f1ad0b0bea7caaa8d282b8388dcd0 v: v3

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

diff --git a/[refs] b/[refs]
index 83c9103c0e33..d6db82462907 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3e4ead4fe5d0d9fdd7ad6749e6e608d39dd46e8a
+refs/heads/master: d695aa8a1f133359485e15db06d53e15e7309e4d
diff --git a/trunk/net/netfilter/nf_conntrack_core.c b/trunk/net/netfilter/nf_conntrack_core.c
index a7c7b490cf22..0c5b01d732d8 100644
--- a/trunk/net/netfilter/nf_conntrack_core.c
+++ b/trunk/net/netfilter/nf_conntrack_core.c
@@ -1129,6 +1129,7 @@ static inline int refresh_timer(struct nf_conntrack_expect *i)
 int nf_conntrack_expect_related(struct nf_conntrack_expect *expect)
 {
 	struct nf_conntrack_expect *i;
+	struct nf_conn *master = expect->master;
 	int ret;
 
 	DEBUGP("nf_conntrack_expect_related %p\n", related_to);
@@ -1149,9 +1150,9 @@ int nf_conntrack_expect_related(struct nf_conntrack_expect *expect)
 		}
 	}
 	/* Will be over limit? */
-	if (expect->master->helper->max_expected && 
-	    expect->master->expecting >= expect->master->helper->max_expected)
-		evict_oldest_expect(expect->master);
+	if (master->helper->max_expected && 
+	    master->expecting >= master->helper->max_expected)
+		evict_oldest_expect(master);
 
 	nf_conntrack_expect_insert(expect);
 	nf_conntrack_expect_event(IPEXP_NEW, expect);