From 842f197be24dc1cdff8a95f78c4a0a50825c23bb Mon Sep 17 00:00:00 2001 From: Jozsef Kadlecsik Date: Thu, 25 Jun 2015 10:24:18 +0200 Subject: Update userspace header file from the kernel tree --- include/libipset/linux_ip_set.h | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'include/libipset') diff --git a/include/libipset/linux_ip_set.h b/include/libipset/linux_ip_set.h index ae4127d..63b2e34 100644 --- a/include/libipset/linux_ip_set.h +++ b/include/libipset/linux_ip_set.h @@ -10,7 +10,6 @@ #ifndef _UAPI_IP_SET_H #define _UAPI_IP_SET_H - #include /* The protocol version */ @@ -19,7 +18,7 @@ /* The max length of strings including NUL: set and type identifiers */ #define IPSET_MAXNAMELEN 32 -/* The maximum permissible length we will accept over netlink (inc. comments) */ +/* The maximum permissible comment length we will accept over netlink */ #define IPSET_MAX_COMMENT_SIZE 255 /* Message types and commands */ @@ -257,11 +256,17 @@ enum { IPSET_COUNTER_GT, }; -struct ip_set_counter_match { +/* Backward compatibility for set match v3 */ +struct ip_set_counter_match0 { __u8 op; __u64 value; }; +struct ip_set_counter_match { + __aligned_u64 value; + __u8 op; +}; + /* Interface to iptables/ip6tables */ #define SO_IP_SET 83 -- cgit v1.2.3