diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-07-20 09:46:42 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-07-20 09:46:42 +0200 |
| commit | 4fffe71dd913cca5532da594e2f48a0db6b494dc (patch) | |
| tree | 6e0dc83582382506e8b70760d8b59a50d93bfa5a /net/ipv4/ipmr.c | |
| parent | 4b3b234f434d440fcd749b9636131b76e2ce561e (diff) | |
| parent | 47ef4ad2684d380dd6d596140fb79395115c3950 (diff) | |
| download | linux-4fffe71dd913cca5532da594e2f48a0db6b494dc.tar.gz linux-4fffe71dd913cca5532da594e2f48a0db6b494dc.tar.xz | |
Merge branch 'linus' into x86/cpu, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/ipv4/ipmr.c')
| -rw-r--r-- | net/ipv4/ipmr.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c index 21a38e296fe2..5ad48ec77710 100644 --- a/net/ipv4/ipmr.c +++ b/net/ipv4/ipmr.c @@ -891,8 +891,10 @@ static struct mfc_cache *ipmr_cache_alloc(void) { 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; + } return c; } |