diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-07-07 08:58:23 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-07-07 08:58:23 +0200 |
| commit | 3ebe3bd8fbd51b5e04e93c7f3fb90bd096a86344 (patch) | |
| tree | 41b67e7a92f1935b1d5acdc714de1b13f657b7af /net/ipv6/ip6mr.c | |
| parent | c50f62454f4b489422333cb2e31401d87456bfa1 (diff) | |
| parent | 2c81a6477081966fe80b8c6daa68459bca896774 (diff) | |
| download | linux-stable-3ebe3bd8fbd51b5e04e93c7f3fb90bd096a86344.tar.gz linux-stable-3ebe3bd8fbd51b5e04e93c7f3fb90bd096a86344.tar.bz2 linux-stable-3ebe3bd8fbd51b5e04e93c7f3fb90bd096a86344.zip | |
Merge branch 'perf/urgent' into perf/core, to pick up fixes before merging new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/ipv6/ip6mr.c')
| -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 f2e2013f8346..487ef3bc7bbc 100644 --- a/net/ipv6/ip6mr.c +++ b/net/ipv6/ip6mr.c @@ -1074,6 +1074,7 @@ static struct mfc6_cache *ip6mr_cache_alloc(void) struct mfc6_cache *c = kmem_cache_zalloc(mrt_cachep, GFP_KERNEL); if (!c) return NULL; + c->mfc_un.res.last_assert = jiffies - MFC_ASSERT_THRESH - 1; c->mfc_un.res.minvif = MAXMIFS; return c; } |