diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2015-04-28 14:09:07 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2015-04-28 14:09:46 +0200 |
| commit | ab8c7d82f7848d318e472a3d809ec7dab969bd04 (patch) | |
| tree | 820086e98cb4c5d798f74dbe8f146314262077bb /include/linux/netfilter/ipset/ip_set.h | |
| parent | 06d14d702e481f29d5fdc33afab4347e6efb678d (diff) | |
| parent | a40cd9b784590ee09f1be4897f28bb0b2ce1096d (diff) | |
Merge branch 'ipset-next'
Get this patch into master:
"Alignment problem between 64bit kernel 32bit userspace"
As Jozsef requests.
Diffstat (limited to 'include/linux/netfilter/ipset/ip_set.h')
| -rw-r--r-- | include/linux/netfilter/ipset/ip_set.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/include/linux/netfilter/ipset/ip_set.h b/include/linux/netfilter/ipset/ip_set.h index 7f1d6041..b69bbc72 100644 --- a/include/linux/netfilter/ipset/ip_set.h +++ b/include/linux/netfilter/ipset/ip_set.h @@ -236,11 +236,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 |