Merge branch 'master' of git://blackhole.kfki.hu/nf-next

Browse source

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>

...

This commit is contained in:

Pablo Neira Ayuso 2019-11-13 10:42:07 +01:00

parent f6ae9f120d b6520fce07

commit 3944a4fd0d

2 changed files with 20 additions and 5 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

include/uapi/linux/netfilter/ipset/ip_set.h

View file