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 'powerpc-5.3-5' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...
[sfrench/cifs-2.6.git]
/
net
/
sched
/
act_skbedit.c
diff --git
a/net/sched/act_skbedit.c
b/net/sched/act_skbedit.c
index 37dced00b63d16de7797c34ff0c10ed4812fe0b4..6a8d3337c577493dc9dcc2b70e7946abbc165cfa 100644
(file)
--- a/
net/sched/act_skbedit.c
+++ b/
net/sched/act_skbedit.c
@@
-336,7
+336,7
@@
static __net_init int skbedit_init_net(struct net *net)
{
struct tc_action_net *tn = net_generic(net, skbedit_net_id);
- return tc_action_net_init(tn, &act_skbedit_ops);
+ return tc_action_net_init(
net,
tn, &act_skbedit_ops);
}
static void __net_exit skbedit_exit_net(struct list_head *net_list)