dect
/
linux-2.6
Archived
13
0
Fork 0

IPv4: unresolved multicast route cleanup

Fixes the expiration timer for unresolved multicast route entries.
In case new multicast routing requests come in faster than the 
expiration timeout occurs (e.g. zap through multicast TV streams), the 
timer is prevented from being called at time for already existing entries.

As the single timer is resetted to default whenever a new entry is made, 
the timeout for existing unresolved entires are missed and/or not 
updated. As a consequence new requests are denied when the limit of 
unresolved entries has been reached because old entries live longer than 
they are supposed to.

The solution is to reset the timer only for the first unresolved entry 
in the multicast routing cache. All other timers are already set and 
updated correctly within the timer function itself by now.

Signed-off by: Andreas Meissner <andreas.meissner@sphairon.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Andreas Meissner 2010-05-10 04:47:49 -07:00 committed by David S. Miller
parent ccc2d97cb7
commit bbd725435d
1 changed files with 2 additions and 1 deletions

View File

@ -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);
}
/*