Merge to Fedora kernel-2.6.18-1.2257_FC5 patched with stable patch-2.6.18.5-vs2.0...

[linux-2.6.git] / net / sched / act_gact.c

diff --git a/net/sched/act_gact.c b/net/sched/act_gact.c
index e75a147..a29d0f6 100644 (file)
--- a/net/sched/act_gact.c
+++ b/net/sched/act_gact.c
@@ -54,14 +54,14 @@ static DEFINE_RWLOCK(gact_lock);
 #ifdef CONFIG_GACT_PROB
 static int gact_net_rand(struct tcf_gact *p)
 {
-       if (net_random()%p->pval)
+       if (!p->pval || net_random()%p->pval)
                return p->action;
        return p->paction;
 }
 
 static int gact_determ(struct tcf_gact *p)
 {
-       if (p->bstats.packets%p->pval)
+       if (!p->pval || p->bstats.packets%p->pval)
                return p->action;
        return p->paction;
 }