diff --git a/[refs] b/[refs] index 6df3a7ab47df..a2384feae7af 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9f5e97e53675caeda48e9988122a30470f4d309d +refs/heads/master: 86c657f6b5bbf2f3ec2213eca528998134a9b344 diff --git a/trunk/net/ipv4/route.c b/trunk/net/ipv4/route.c index f99d9dbb7720..9725223ffe9d 100644 --- a/trunk/net/ipv4/route.c +++ b/trunk/net/ipv4/route.c @@ -778,7 +778,7 @@ static void rt_worker_func(struct work_struct *work) * many times (2^24) without giving recent rt_genid. * Jenkins hash is strong enough that litle changes of rt_genid are OK. */ -static void rt_cache_invalidate(void) +static void rt_cache_invalidate(struct net *net) { unsigned char shuffle; @@ -792,7 +792,7 @@ static void rt_cache_invalidate(void) */ void rt_cache_flush(struct net *net, int delay) { - rt_cache_invalidate(); + rt_cache_invalidate(net); if (delay >= 0) rt_do_flush(!in_softirq()); } @@ -803,7 +803,7 @@ void rt_cache_flush(struct net *net, int delay) static void rt_secret_rebuild(unsigned long __net) { struct net *net = (struct net *)__net; - rt_cache_invalidate(); + rt_cache_invalidate(net); mod_timer(&net->ipv4.rt_secret_timer, jiffies + ip_rt_secret_interval); }