History

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. ====================

Pablo Neira Ayuso committed 7 years ago

Commit 3944a4f2 parents f6ae9f1 b6520fc2 files · +20 −5Browse files

Showing the changes to include/uapi/linux (1 of 2 files). Show all

Unified · Split

include/uapi/linux/netfilter/ipset/ip_set.h+2−0
@@ -205,6 +205,8 @@ enum ipset_cadt_flags { · 204 unmodified lines
205 IPSET_FLAG_WITH_FORCEADD = (1 << IPSET_FLAG_BIT_WITH_FORCEADD),205 IPSET_FLAG_WITH_FORCEADD = (1 << IPSET_FLAG_BIT_WITH_FORCEADD),
206 IPSET_FLAG_BIT_WITH_SKBINFO = 6,206 IPSET_FLAG_BIT_WITH_SKBINFO = 6,
207 IPSET_FLAG_WITH_SKBINFO = (1 << IPSET_FLAG_BIT_WITH_SKBINFO),207 IPSET_FLAG_WITH_SKBINFO = (1 << IPSET_FLAG_BIT_WITH_SKBINFO),
208 IPSET_FLAG_BIT_IFACE_WILDCARD = 7,
209 IPSET_FLAG_IFACE_WILDCARD = (1 << IPSET_FLAG_BIT_IFACE_WILDCARD),
208 IPSET_FLAG_CADT_MAX = 15,210 IPSET_FLAG_CADT_MAX = 15,
209};211};
210 212