]> git.ipfire.org Git - thirdparty/nftables.git/commit
projects / thirdparty / nftables.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 3def289) | patch
Revert "intervals: do not merge intervals with different timeout"
authorPablo Neira Ayuso <pablo@netfilter.org>
Thu, 17 Apr 2025 11:23:10 +0000 (13:23 +0200)
committerPablo Neira Ayuso <pablo@netfilter.org>
Thu, 17 Apr 2025 20:01:09 +0000 (22:01 +0200)
commit63ed8af82ba0e595c571c5f16257186968ff9833
treea2447fb8055ab7ff4396c2e53ab52497d6acaea3tree | snapshot
parent3def289a06d8db2f8708cad6993014c40db564e5commit | diff
Revert "intervals: do not merge intervals with different timeout"

This reverts commit da0bac050c8b2588242727f9915a1ea8bc48ceb2.

This results in an error when adding an interval that overlaps an
existing interval in the kernel, this defeats the purpose of the
auto-merge feature.

Reported-by: Slavko <linux@slavino.sk>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
src/intervals.c diff | blob | blame | history
Mirror of git://git.netfilter.org/nftables