diff options
| author |   Pablo Neira Ayuso <pablo@netfilter.org> | 2019-07-30 13:39:20 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2019-07-30 13:39:20 +0200 |
| commit | 7cdc4412284777c76c919e2ab33b3b8dbed18559 (patch) | |
| tree | 338e69c008b1cdeb48db91e5ab02d8bce479e1df /include/uapi/linux | |
| parent | netfilter: ebtables: also count base chain policies (diff) | |
| parent | netfilter: ipset: Fix rename concurrency with listing (diff) | |
| download | linux-dev-7cdc4412284777c76c919e2ab33b3b8dbed18559.tar.xz linux-dev-7cdc4412284777c76c919e2ab33b3b8dbed18559.zip | |
Merge branch 'master' of git://blackhole.kfki.hu/nf
Jozsef Kadlecsik says:
====================
ipset patches for the nf tree
- When the support of destination MAC addresses for hash:mac sets was
introduced, it was forgotten to add the same functionality to hash:ip,mac
types of sets. The patch from Stefano Brivio adds the missing part.
- When the support of destination MAC addresses for hash:mac sets was
introduced, a copy&paste error was made in the code of the hash:ip,mac
and bitmap:ip,mac types: the MAC address in these set types is in
the second position and not in the first one. Stefano Brivio's patch
fixes the issue.
- There was still a not properly handled concurrency handling issue
between renaming and listing sets at the same time, reported by
Shijie Luo.
====================
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'include/uapi/linux')
0 files changed, 0 insertions, 0 deletions