Merge branch 'ayourtch:master' into master

angus19 · web-flow · commit e2b19677f8b7 · 2024-08-13T14:09:12.000+08:00
diff --git a/nat46/modules/nat46-module.c b/nat46/modules/nat46-module.c
@@ -94,7 +94,7 @@ static int nat46_proc_show(struct seq_file *m, void *v)
 {
 	struct net *net;
 
-	net = (struct net *)v;
+	net = (struct net *)m->private;
 	nat64_show_all_configs(net, m);
 	return 0;
 }

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ static int nat46_proc_show(struct seq_file m, void v)`
`94`	`94`	`{`
`95`	`95`	`struct net *net;`
`96`	`96`
`97`		`- net = (struct net *)v;`
	`97`	`+ net = (struct net *)m->private;`
`98`	`98`	`nat64_show_all_configs(net, m);`
`99`	`99`	`return 0;`
`100`	`100`	`}`