| Message ID | 4BE7CD4D.6050704@indakom.de |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Andreas Meissner <andreas.meissner@indakom.de> Date: Mon, 10 May 2010 11:09:33 +0200 > from: Andreas Meissner <andreas.meissner@sphairon.com> > > 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. > > Signed-off by: Andreas Meissner <andreas.meissner@sphairon.com> > --- > 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. Looks great, applied thanks! -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
--- net/ipv4/ipmr.c.orig 2010-05-10 10:07:38.000000000 +0200 +++ net/ipv4/ipmr.c 2010-05-10 10:08:39.000000000 +0200 @@ -753,7 +753,8 @@ 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); } /*
from: Andreas Meissner <andreas.meissner@sphairon.com> 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. Signed-off by: Andreas Meissner <andreas.meissner@sphairon.com> --- 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. --- ipv4/ipmr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html