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/xt_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/xt_set.h')
| -rw-r--r-- | include/linux/netfilter/xt_set.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/linux/netfilter/xt_set.h b/include/linux/netfilter/xt_set.h index d6a1df1f..4210c9bf 100644 --- a/include/linux/netfilter/xt_set.h +++ b/include/linux/netfilter/xt_set.h @@ -66,6 +66,15 @@ struct xt_set_info_target_v2 { struct xt_set_info_match_v3 { struct xt_set_info match_set; + struct ip_set_counter_match0 packets; + struct ip_set_counter_match0 bytes; + __u32 flags; +}; + +/* Revision 4 match */ + +struct xt_set_info_match_v4 { + struct xt_set_info match_set; struct ip_set_counter_match packets; struct ip_set_counter_match bytes; __u32 flags; |