---

yaml --- r: 190767 b: refs/heads/master c: bbd7254 h: refs/heads/master i: 190765: 6d43ea7 190763: b9caaea 190759: e8a4143 190751: a4921c4 v: v3
git-mirror · May 10, 2010 · 97a03b7 · 97a03b7
1 parent 19a7630
commit 97a03b7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ccc2d97cb7c798e785c9f198de243e2b59f7073b
+refs/heads/master: bbd725435ddb1cac732f7a8c23c21ff67f24c60f
diff --git a/trunk/net/ipv4/ipmr.c b/trunk/net/ipv4/ipmr.c
@@ -754,7 +754,8 @@ ipmr_cache_unresolved(struct net *net, vifi_t vifi, struct sk_buff *skb)
 		c->next = mfc_unres_queue;
 		mfc_unres_queue = c;
 
-		mod_timer(&ipmr_expire_timer, c->mfc_un.unres.expires);
+		if (atomic_read(&net->ipv4.cache_resolve_queue_len) == 1)
+			mod_timer(&ipmr_expire_timer, c->mfc_un.unres.expires);
 	}
 
 	/*