diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2018-10-19 12:48:24 +0300 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2018-10-19 15:00:34 +0300 |
| commit | af510ebd8913bee016492832f532ed919b51c09c (patch) | |
| tree | 078b91ac2572e5aa61029954015289ae1366df42 /include/uapi/linux | |
| parent | 468c041cff57e87f18e1022cacf9f5c98bf00b58 (diff) | |
| download | linux-af510ebd8913bee016492832f532ed919b51c09c.tar.xz | |
Revert "netfilter: xt_quota: fix the behavior of xt_quota module"
This reverts commit e9837e55b0200da544a095a1fca36efd7fd3ba30.
When talking to Maze and Chenbo, we agreed to keep this back by now
due to problems in the ruleset listing path with 32-bit arches.
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/netfilter/xt_quota.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/include/uapi/linux/netfilter/xt_quota.h b/include/uapi/linux/netfilter/xt_quota.h index d72fd52adbba..f3ba5d9e58b6 100644 --- a/include/uapi/linux/netfilter/xt_quota.h +++ b/include/uapi/linux/netfilter/xt_quota.h @@ -15,11 +15,9 @@ struct xt_quota_info { __u32 flags; __u32 pad; __aligned_u64 quota; -#ifdef __KERNEL__ - atomic64_t counter; -#else - __aligned_u64 remain; -#endif + + /* Used internally by the kernel */ + struct xt_quota_priv *master; }; #endif /* _XT_QUOTA_H */ |