git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'pinctrl-v5.3-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...
[sfrench/cifs-2.6.git]
/
net
/
sched
/
act_connmark.c
diff --git
a/net/sched/act_connmark.c
b/net/sched/act_connmark.c
index 32ac04d77a455a845e61d89ec9d646d3e886b155..2b43cacf82af4aeaefdc41bf97651d832b1e31f1 100644
(file)
--- a/
net/sched/act_connmark.c
+++ b/
net/sched/act_connmark.c
@@
-231,7
+231,7
@@
static __net_init int connmark_init_net(struct net *net)
{
struct tc_action_net *tn = net_generic(net, connmark_net_id);
- return tc_action_net_init(tn, &act_connmark_ops);
+ return tc_action_net_init(
net,
tn, &act_connmark_ops);
}
static void __net_exit connmark_exit_net(struct list_head *net_list)