Commit 093582b9 authored by Tom Goff's avatar Tom Goff Committed by Ben Hutchings

ipmr/ip6mr: Initialize the last assert time of mfc entries.

[ Upstream commit 70a0dec4 ]

This fixes wrong-interface signaling on 32-bit platforms for entries
created when jiffies > 2^31 + MFC_ASSERT_THRESH.
Signed-off-by: default avatarTom Goff <thomas.goff@ll.mit.edu>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
parent 91fbc717
...@@ -830,8 +830,10 @@ static struct mfc_cache *ipmr_cache_alloc(void) ...@@ -830,8 +830,10 @@ static struct mfc_cache *ipmr_cache_alloc(void)
{ {
struct mfc_cache *c = kmem_cache_zalloc(mrt_cachep, GFP_KERNEL); struct mfc_cache *c = kmem_cache_zalloc(mrt_cachep, GFP_KERNEL);
if (c) if (c) {
c->mfc_un.res.last_assert = jiffies - MFC_ASSERT_THRESH - 1;
c->mfc_un.res.minvif = MAXVIFS; c->mfc_un.res.minvif = MAXVIFS;
}
return c; return c;
} }
......
...@@ -1022,6 +1022,7 @@ static struct mfc6_cache *ip6mr_cache_alloc(void) ...@@ -1022,6 +1022,7 @@ static struct mfc6_cache *ip6mr_cache_alloc(void)
struct mfc6_cache *c = kmem_cache_zalloc(mrt_cachep, GFP_KERNEL); struct mfc6_cache *c = kmem_cache_zalloc(mrt_cachep, GFP_KERNEL);
if (c == NULL) if (c == NULL)
return NULL; return NULL;
c->mfc_un.res.last_assert = jiffies - MFC_ASSERT_THRESH - 1;
c->mfc_un.res.minvif = MAXMIFS; c->mfc_un.res.minvif = MAXMIFS;
return c; return c;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment