---

yaml --- r: 34703 b: refs/heads/master c: 57dab5d h: refs/heads/master i: 34701: 2080586 34699: 889a627 34695: 8d63a24 34687: 8d46736 v: v3
git-mirror · Sep 22, 2006 · 0c459bd · 0c459bd
1 parent 13d08aa
commit 0c459bd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ecb70c95c45ece0935b076295388267f6d8db65c
+refs/heads/master: 57dab5d0bfee21663ed20222b4cedeb0655ba1f3
diff --git a/trunk/net/netfilter/xt_limit.c b/trunk/net/netfilter/xt_limit.c
@@ -122,16 +122,16 @@ ipt_limit_checkentry(const char *tablename,
 		return 0;
 	}
 
-	/* User avg in seconds * XT_LIMIT_SCALE: convert to jiffies *
-	   128. */
-	r->prev = jiffies;
-	r->credit = user2credits(r->avg * r->burst);	 /* Credits full. */
-	r->credit_cap = user2credits(r->avg * r->burst); /* Credits full. */
-	r->cost = user2credits(r->avg);
-
 	/* For SMP, we only want to use one set of counters. */
 	r->master = r;
-
+	if (r->cost == 0) {
+		/* User avg in seconds * XT_LIMIT_SCALE: convert to jiffies *
+		   128. */
+		r->prev = jiffies;
+		r->credit = user2credits(r->avg * r->burst);	 /* Credits full. */
+		r->credit_cap = user2credits(r->avg * r->burst); /* Credits full. */
+		r->cost = user2credits(r->avg);
+	}
 	return 1;
 }