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 branch 'linus' into core/objtool, to pick up dependent commits
[sfrench/cifs-2.6.git]
/
net
/
sched
/
act_vlan.c
diff --git
a/net/sched/act_vlan.c
b/net/sched/act_vlan.c
index 115fc33cc6d8b321f9c02febf861b93fe9a85740..16eb067a8d8fa20c17894db8047571789c0b96e8 100644
(file)
--- a/
net/sched/act_vlan.c
+++ b/
net/sched/act_vlan.c
@@
-269,7
+269,7
@@
static __net_init int vlan_init_net(struct net *net)
{
struct tc_action_net *tn = net_generic(net, vlan_net_id);
- return tc_action_net_init(tn, &act_vlan_ops
, net
);
+ return tc_action_net_init(tn, &act_vlan_ops);
}
static void __net_exit vlan_exit_net(struct net *net)