From 97a03b73a01fb4f3bbb4676ea6cfe6c068bf1ce3 Mon Sep 17 00:00:00 2001 From: Andreas Meissner Date: Mon, 10 May 2010 04:47:49 -0700 Subject: [PATCH] --- yaml --- r: 190767 b: refs/heads/master c: bbd725435ddb1cac732f7a8c23c21ff67f24c60f h: refs/heads/master i: 190765: 6d43ea7e1753d08717796d59c0a43312ace0d7a7 190763: b9caaea3d643462f44c844a0d92e9b783be262df 190759: e8a414327c5f041033ca98acdebfe45981c08024 190751: a4921c4b0be83d975209f3082afcdc24395b4df4 v: v3 --- [refs] | 2 +- trunk/net/ipv4/ipmr.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 3d6d0c3f8dfe..bacb2e36a25b 100644 --- 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 index 9d4f6d1340a4..ec19a890c9a0 100644 --- 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); } /*