diff options
| author | Changli Gao <xiaosuo@gmail.com> | 2010-07-23 14:07:47 +0200 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2010-07-23 14:07:47 +0200 |
| commit | 49daf6a22622d4e1619aeaad5f9f0472bf89daff (patch) | |
| tree | a86af0b0f846fc187eaa45ffdad96976bfd38331 | |
| parent | netfilter: xt_quota: use per-rule spin lock (diff) | |
| download | linux-49daf6a22622d4e1619aeaad5f9f0472bf89daff.tar.xz linux-49daf6a22622d4e1619aeaad5f9f0472bf89daff.zip | |
xt_quota: report initial quota value instead of current value to userspace
We should copy the initial value to userspace for iptables-save and
to allow removal of specific quota rules.
Signed-off-by: Changli Gao <xiaosuo@gmail.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
| -rw-r--r-- | include/linux/netfilter/xt_quota.h | 2 | ||||
| -rw-r--r-- | net/netfilter/xt_quota.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/include/linux/netfilter/xt_quota.h b/include/linux/netfilter/xt_quota.h index 8dc89dfc1361..b0d28c659ab7 100644 --- a/include/linux/netfilter/xt_quota.h +++ b/include/linux/netfilter/xt_quota.h @@ -11,9 +11,9 @@ struct xt_quota_priv; struct xt_quota_info { u_int32_t flags; u_int32_t pad; + aligned_u64 quota; /* Used internally by the kernel */ - aligned_u64 quota; struct xt_quota_priv *master; }; diff --git a/net/netfilter/xt_quota.c b/net/netfilter/xt_quota.c index 304b1fda1a0d..70eb2b4984dd 100644 --- a/net/netfilter/xt_quota.c +++ b/net/netfilter/xt_quota.c @@ -36,8 +36,6 @@ quota_mt(const struct sk_buff *skb, struct xt_action_param *par) /* we do not allow even small packets from now on */ priv->quota = 0; } - /* Copy quota back to matchinfo so that iptables can display it */ - q->quota = priv->quota; spin_unlock_bh(&priv->lock); return ret; |