Merge tag 'jfs-3.10' of git://github.com/kleikamp/linux-shaggy

[firefly-linux-kernel-4.4.55.git] / net / netfilter / nf_conntrack_core.c

diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
index ebb81d64436c947577f1021df981b390787ff117..0283baedcdfb5b48627002607731dabb992e15ae 100644 (file)
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -266,7 +266,7 @@ static void death_by_event(unsigned long ul_conntrack)
        if (nf_conntrack_event(IPCT_DESTROY, ct) < 0) {
                /* bad luck, let's retry again */
                ecache->timeout.expires = jiffies +
-                       (random32() % net->ct.sysctl_events_retry_timeout);
+                       (prandom_u32() % net->ct.sysctl_events_retry_timeout);
                add_timer(&ecache->timeout);
                return;
        }
@@ -285,7 +285,7 @@ void nf_ct_dying_timeout(struct nf_conn *ct)
        /* set a new timer to retry event delivery */
        setup_timer(&ecache->timeout, death_by_event, (unsigned long)ct);
        ecache->timeout.expires = jiffies +
-               (random32() % net->ct.sysctl_events_retry_timeout);
+               (prandom_u32() % net->ct.sysctl_events_retry_timeout);
        add_timer(&ecache->timeout);
 }
 EXPORT_SYMBOL_GPL(nf_ct_dying_timeout);