summaryrefslogtreecommitdiffstats
path: root/include/uapi/linux/netfilter
diff options
context:
space:
mode:
authorPablo Neira Ayuso2018-10-19 11:48:24 +0200
committerPablo Neira Ayuso2018-10-19 14:00:34 +0200
commitaf510ebd8913bee016492832f532ed919b51c09c (patch)
tree078b91ac2572e5aa61029954015289ae1366df42 /include/uapi/linux/netfilter
parentnetfilter: nfnetlink_log: remove empty nfnetlink_log.h header file (diff)
downloadkernel-qcow2-linux-af510ebd8913bee016492832f532ed919b51c09c.tar.gz
kernel-qcow2-linux-af510ebd8913bee016492832f532ed919b51c09c.tar.xz
kernel-qcow2-linux-af510ebd8913bee016492832f532ed919b51c09c.zip
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/netfilter')
-rw-r--r--include/uapi/linux/netfilter/xt_quota.h8
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 */