From: Pablo Neira Ayuso Date: Tue, 30 Jul 2019 11:39:20 +0000 (+0200) Subject: Merge branch 'master' of git://blackhole.kfki.hu/nf X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=7cdc4412284777c76c919e2ab33b3b8dbed18559;p=openwrt%2Fstaging%2Fblogic.git 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 --- 7cdc4412284777c76c919e2ab33b3b8dbed18559