| Message ID | 20240315160210.8379-1-mkoutny@suse.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 9474c62ab65f30f0e56802a52bddf69a9e62b127 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | net/sched: Add module alias for sch_fq_pie | expand |
Hello: This patch was applied to netdev/net.git (main) by Paolo Abeni <pabeni@redhat.com>: On Fri, 15 Mar 2024 17:02:10 +0100 you wrote: > The commit 2c15a5aee2f3 ("net/sched: Load modules via their alias") > starts loading modules via aliases and not canonical names. The new > aliases were added in commit 241a94abcf46 ("net/sched: Add module > aliases for cls_,sch_,act_ modules") via a Coccinele script. > > sch_fq_pie.c is missing module.h header and thus Coccinele did not patch > it. Add the include and module alias manually, so that autoloading works > for sch_fq_pie too. > > [...] Here is the summary with links: - net/sched: Add module alias for sch_fq_pie https://git.kernel.org/netdev/net/c/9474c62ab65f You are awesome, thank you!
diff --git a/net/sched/sch_fq_pie.c b/net/sched/sch_fq_pie.c index 5b595773e59b..358cf304f4c9 100644 --- a/net/sched/sch_fq_pie.c +++ b/net/sched/sch_fq_pie.c @@ -10,6 +10,7 @@ */ #include <linux/jhash.h> +#include <linux/module.h> #include <linux/sizes.h> #include <linux/vmalloc.h> #include <net/pkt_cls.h> @@ -563,6 +564,7 @@ static struct Qdisc_ops fq_pie_qdisc_ops __read_mostly = { .dump_stats = fq_pie_dump_stats, .owner = THIS_MODULE, }; +MODULE_ALIAS_NET_SCH("fq_pie"); static int __init fq_pie_module_init(void) {
The commit 2c15a5aee2f3 ("net/sched: Load modules via their alias") starts loading modules via aliases and not canonical names. The new aliases were added in commit 241a94abcf46 ("net/sched: Add module aliases for cls_,sch_,act_ modules") via a Coccinele script. sch_fq_pie.c is missing module.h header and thus Coccinele did not patch it. Add the include and module alias manually, so that autoloading works for sch_fq_pie too. (Note: commit message in commit 241a94abcf46 ("net/sched: Add module aliases for cls_,sch_,act_ modules") was mangled due to '#' misinterpretation. The predicate haskernel is: | @ haskernel @ | @@ | | #include <linux/module.h> | .) Fixes: 241a94abcf46 ("net/sched: Add module aliases for cls_,sch_,act_ modules") Signed-off-by: Michal Koutný <mkoutny@suse.com> --- net/sched/sch_fq_pie.c | 2 ++ 1 file changed, 2 insertions(+) base-commit: ea80e3ed09ab2c2b75724faf5484721753e92c31