Update userspace header file from the kernel tree

diff --git a/include/libipset/linux_ip_set.h b/include/libipset/linux_ip_set.h
index ae4127de24e635ce729c544e414e8a711e9c6111..63b2e34f1b60393b9593513f899d3243055c1e7e 100644 (file)
--- 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 <linux/types.h>
 
 /* 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