diff options
| author |   Pablo Neira Ayuso <pablo@netfilter.org> | 2019-11-13 10:42:07 +0100 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2019-11-13 10:42:07 +0100 |
| commit | 3944a4fd0d7015523d55e50fdaa40d12523f2e6a (patch) | |
| tree | 9a706003b1de45722d5219461fcff844fd6de6e8 /include | |
| parent | netfilter: nft_payload: add C-VLAN support (diff) | |
| parent | netfilter: ipset: Add wildcard support to net,iface (diff) | |
| download | linux-dev-3944a4fd0d7015523d55e50fdaa40d12523f2e6a.tar.xz linux-dev-3944a4fd0d7015523d55e50fdaa40d12523f2e6a.zip | |
Merge branch 'master' of git://blackhole.kfki.hu/nf-next
Jozsef Kadlecsik says:
====================
ipset patches for nf-next
- Add wildcard support to hash:net,iface which makes possible to
match interface prefixes besides complete interfaces names, from
Kristian Evensen.
====================
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/uapi/linux/netfilter/ipset/ip_set.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/uapi/linux/netfilter/ipset/ip_set.h b/include/uapi/linux/netfilter/ipset/ip_set.h index eea166c52c36..11a72a938eb1 100644 --- a/include/uapi/linux/netfilter/ipset/ip_set.h +++ b/include/uapi/linux/netfilter/ipset/ip_set.h @@ -205,6 +205,8 @@ enum ipset_cadt_flags { IPSET_FLAG_WITH_FORCEADD = (1 << IPSET_FLAG_BIT_WITH_FORCEADD), IPSET_FLAG_BIT_WITH_SKBINFO = 6, IPSET_FLAG_WITH_SKBINFO = (1 << IPSET_FLAG_BIT_WITH_SKBINFO), + IPSET_FLAG_BIT_IFACE_WILDCARD = 7, + IPSET_FLAG_IFACE_WILDCARD = (1 << IPSET_FLAG_BIT_IFACE_WILDCARD), IPSET_FLAG_CADT_MAX = 15, }; |