diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2017-11-13 09:39:12 -0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2017-11-13 09:39:12 -0300 |
| commit | 7862edc4191123f9c7e7ec0a7b356d332a61c41e (patch) | |
| tree | f3a2416c08c7ce46ce72d9fdf55b5a32328164ee /net/sched/act_connmark.c | |
| parent | fcdfafcb73be8fa45909327bbddca46fb362a675 (diff) | |
| parent | 516fb7f2e73dcc303fb97fc3593209fcacf2d982 (diff) | |
Merge remote-tracking branch 'torvalds/master' into perf/core
To pick up fixes.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'net/sched/act_connmark.c')
| -rw-r--r-- | net/sched/act_connmark.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/act_connmark.c b/net/sched/act_connmark.c index 34e52d01a5dd..10b7a8855a6c 100644 --- a/net/sched/act_connmark.c +++ b/net/sched/act_connmark.c @@ -206,7 +206,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, net); + return tc_action_net_init(tn, &act_connmark_ops); } static void __net_exit connmark_exit_net(struct net *net) |