diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-09-02 20:31:18 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-09-02 20:31:18 +0300 |
| commit | 7a81146204859c6f8d8daf3ab7a25af17dfecd5f (patch) | |
| tree | 6bcd14e38f8f44621521faf66565a97ee6ad461e /net/sched/act_tunnel_key.c | |
| parent | 96e46dcfb8534494859936b3da4f3018de53a53f (diff) | |
| parent | 089cf7f6ecb266b6a4164919a2e69bd2f938374a (diff) | |
| download | linux-7a81146204859c6f8d8daf3ab7a25af17dfecd5f.tar.xz | |
Merge 5.3-rc7 into usb-next
We need the usb fixes in here for testing
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/sched/act_tunnel_key.c')
| -rw-r--r-- | net/sched/act_tunnel_key.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/act_tunnel_key.c b/net/sched/act_tunnel_key.c index 6d0debdc9b97..2f83a79f76aa 100644 --- a/net/sched/act_tunnel_key.c +++ b/net/sched/act_tunnel_key.c @@ -600,7 +600,7 @@ static __net_init int tunnel_key_init_net(struct net *net) { struct tc_action_net *tn = net_generic(net, tunnel_key_net_id); - return tc_action_net_init(tn, &act_tunnel_key_ops); + return tc_action_net_init(net, tn, &act_tunnel_key_ops); } static void __net_exit tunnel_key_exit_net(struct list_head *net_list) |