diff options
author | Jakub Kicinski <kuba@kernel.org> | 2023-02-03 01:49:55 +0300 |
---|---|---|
committer | Jakub Kicinski <kuba@kernel.org> | 2023-02-03 01:49:55 +0300 |
commit | 82b4a9412b4de2f68679f1403f1d229390ace27e (patch) | |
tree | 920454da3f6d509be95ae3c5c72921bfddc39c20 /samples | |
parent | b18ea3d9d214dfb23b0b6bd2acc121cb0d0fa2c5 (diff) | |
parent | edb9b8f380c3413bf783475279b1a941c7e5cec1 (diff) | |
download | linux-82b4a9412b4de2f68679f1403f1d229390ace27e.tar.xz |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
net/core/gro.c
7d2c89b32587 ("skb: Do mix page pool and page referenced frags in GRO")
b1a78b9b9886 ("net: add support for ipv4 big tcp")
https://lore.kernel.org/all/20230203094454.5766f160@canb.auug.org.au/
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'samples')
-rw-r--r-- | samples/ftrace/ftrace-direct-multi-modify.c | 1 | ||||
-rw-r--r-- | samples/ftrace/ftrace-direct-multi.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/samples/ftrace/ftrace-direct-multi-modify.c b/samples/ftrace/ftrace-direct-multi-modify.c index d52370cad0b6..a825dbd2c9cf 100644 --- a/samples/ftrace/ftrace-direct-multi-modify.c +++ b/samples/ftrace/ftrace-direct-multi-modify.c @@ -152,6 +152,7 @@ static void __exit ftrace_direct_multi_exit(void) { kthread_stop(simple_tsk); unregister_ftrace_direct_multi(&direct, my_tramp); + ftrace_free_filter(&direct); } module_init(ftrace_direct_multi_init); diff --git a/samples/ftrace/ftrace-direct-multi.c b/samples/ftrace/ftrace-direct-multi.c index ec1088922517..d955a2650605 100644 --- a/samples/ftrace/ftrace-direct-multi.c +++ b/samples/ftrace/ftrace-direct-multi.c @@ -79,6 +79,7 @@ static int __init ftrace_direct_multi_init(void) static void __exit ftrace_direct_multi_exit(void) { unregister_ftrace_direct_multi(&direct, (unsigned long) my_tramp); + ftrace_free_filter(&direct); } module_init(ftrace_direct_multi_init); |