diff options
| author | Tom Goff <thomas.goff@ll.mit.edu> | 2016-06-23 16:11:57 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-07-27 09:55:47 -0700 |
| commit | ff790d971c10a4284c18ec4321b93246eb131e9f (patch) | |
| tree | 4f39f1f389977dd591ccc086a5fc7590bc958cf7 /net/ipv6 | |
| parent | f251447f75c78bfa048937c9d7d865c566c77116 (diff) | |
| download | lwn-ff790d971c10a4284c18ec4321b93246eb131e9f.tar.gz lwn-ff790d971c10a4284c18ec4321b93246eb131e9f.zip | |
ipmr/ip6mr: Initialize the last assert time of mfc entries.
[ Upstream commit 70a0dec45174c976c64b4c8c1d0898581f759948 ]
This fixes wrong-interface signaling on 32-bit platforms for entries
created when jiffies > 2^31 + MFC_ASSERT_THRESH.
Signed-off-by: Tom Goff <thomas.goff@ll.mit.edu>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/ip6mr.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c index 8b61288e5746..86d30e60242a 100644 --- a/net/ipv6/ip6mr.c +++ b/net/ipv6/ip6mr.c @@ -1076,6 +1076,7 @@ static struct mfc6_cache *ip6mr_cache_alloc(void) struct mfc6_cache *c = kmem_cache_zalloc(mrt_cachep, GFP_KERNEL); if (c == NULL) return NULL; + c->mfc_un.res.last_assert = jiffies - MFC_ASSERT_THRESH - 1; c->mfc_un.res.minvif = MAXMIFS; return c; } |