PCI: Add pcibios_bus_add_device() weak function

[karo-tx-linux.git] / net / netfilter / xt_RATEEST.c

diff --git a/net/netfilter/xt_RATEEST.c b/net/netfilter/xt_RATEEST.c
index 190854be76294577e4542e49fc79fc2e18f5665b..604df6fae6fcb0c02d7dff8636890c0adb656d93 100644 (file)
--- a/net/netfilter/xt_RATEEST.c
+++ b/net/netfilter/xt_RATEEST.c
@@ -100,7 +100,7 @@ static int xt_rateest_tg_checkentry(const struct xt_tgchk_param *par)
        int ret;
 
        if (unlikely(!rnd_inited)) {
-               jhash_rnd = prandom_u32();
+               get_random_bytes(&jhash_rnd, sizeof(jhash_rnd));
                rnd_inited = true;
        }
 
@@ -136,7 +136,7 @@ static int xt_rateest_tg_checkentry(const struct xt_tgchk_param *par)
        cfg.est.interval        = info->interval;
        cfg.est.ewma_log        = info->ewma_log;
 
-       ret = gen_new_estimator(&est->bstats, &est->rstats,
+       ret = gen_new_estimator(&est->bstats, NULL, &est->rstats,
                                &est->lock, &cfg.opt);
        if (ret < 0)
                goto err2;