diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2021-01-27 17:53:45 -0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2021-01-27 17:53:46 -0800 |
| commit | 0f764eec3ea23b7b2c64fb54c9a219553921e93a (patch) | |
| tree | 6450fe98d1e0562124b7cea364744cf509a9c192 /drivers/net/can/grcan.c | |
| parent | 45a81464819aa5ada8930157eca028d3fd197994 (diff) | |
| parent | ce5379963b2884e9d23bea0c5674a7251414c84b (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
Pablo Neira Ayuso says:
====================
Netfilter fixes for net
1) Honor stateful expressions defined in the set from the dynset
extension. The set definition provides a stateful expression
that must be used by the dynset expression in case it is specified.
2) Missing timeout extension in the set element in the dynset
extension leads to inconsistent ruleset listing, not allowing
the user to restore timeout and expiration on ruleset reload.
3) Do not dump the stateful expression from the dynset extension
if it coming from the set definition.
* git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf:
netfilter: nft_dynset: dump expressions when set definition contains no expressions
netfilter: nft_dynset: add timeout extension to template
netfilter: nft_dynset: honor stateful expressions in set definition
====================
Link: https://lore.kernel.org/r/20210127132512.5472-1-pablo@netfilter.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/can/grcan.c')
0 files changed, 0 insertions, 0 deletions