---

yaml
---
r: 16223
b: refs/heads/master
c: d695aa8
h: refs/heads/master
i:
  16221: 96fabb6
  16219: 7234bd2
  16215: 88932ba
  16207: 5b606a3
  16191: a68d7bc
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3e4ead4fe5d0d9fdd7ad6749e6e608d39dd46e8a
+refs/heads/master: d695aa8a1f133359485e15db06d53e15e7309e4d

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);