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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[sfrench/cifs-2.6.git]
/
net
/
sched
/
act_mirred.c
diff --git
a/net/sched/act_mirred.c
b/net/sched/act_mirred.c
index 416627c66f081f26ff9284de86411c3e05390b8e..84759cfd5a3398555cba7012d0cc949b7b7e6033 100644
(file)
--- a/
net/sched/act_mirred.c
+++ b/
net/sched/act_mirred.c
@@
-343,7
+343,7
@@
static __net_init int mirred_init_net(struct net *net)
{
struct tc_action_net *tn = net_generic(net, mirred_net_id);
- return tc_action_net_init(tn, &act_mirred_ops);
+ return tc_action_net_init(tn, &act_mirred_ops
, net
);
}
static void __net_exit mirred_exit_net(struct net *net)