diff options
| author | David S. Miller <davem@davemloft.net> | 2012-05-09 18:07:44 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-05-09 18:07:44 -0400 |
| commit | a49d1a905ed96c7a790d9535e2bc62d3f2f55a05 (patch) | |
| tree | 709bdaab23aa7ef98aad0cdfd4d8ecd8324650cc /net/netfilter/xt_limit.c | |
| parent | 2e7d21c54adbab6d10481eddc685328f89bb6389 (diff) | |
| parent | 0197dee7d3182bb6b6a21955860dfa14fa022d84 (diff) | |
Merge git://1984.lsi.us.es/net-next
Diffstat (limited to 'net/netfilter/xt_limit.c')
| -rw-r--r-- | net/netfilter/xt_limit.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/netfilter/xt_limit.c b/net/netfilter/xt_limit.c index 32b7a579a03..5c22ce8ab30 100644 --- a/net/netfilter/xt_limit.c +++ b/net/netfilter/xt_limit.c @@ -88,8 +88,7 @@ limit_mt(const struct sk_buff *skb, struct xt_action_param *par) } /* Precision saver. */ -static u_int32_t -user2credits(u_int32_t user) +static u32 user2credits(u32 user) { /* If multiplying would overflow... */ if (user > 0xFFFFFFFF / (HZ*CREDITS_PER_JIFFY)) @@ -123,7 +122,7 @@ static int limit_mt_check(const struct xt_mtchk_param *par) 128. */ priv->prev = jiffies; priv->credit = user2credits(r->avg * r->burst); /* Credits full. */ - r->credit_cap = user2credits(r->avg * r->burst); /* Credits full. */ + r->credit_cap = priv->credit; /* Credits full. */ r->cost = user2credits(r->avg); } return 0; |