diff options
| author |  David S. Miller <davem@davemloft.net>
| 2017-09-05 20:03:35 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net>
| 2017-09-05 20:03:35 -0700 |
| commit | 18fb0b46d555dc42f52f69428dcd52f133877078 (patch) | |
| tree | 7696741f50fb1a373aee3601074e30f6e366e425 /net/l2tp/l2tp_netlink.c | |
| parent | Merge branch 'xgene-Misc-bug-fixes' (diff) | |
| parent | net: dsa: loop: Do not unregister invalid fixed PHY (diff) | |
| download | linux-18fb0b46d555dc42f52f69428dcd52f133877078.tar.gz linux-18fb0b46d555dc42f52f69428dcd52f133877078.tar.bz2 linux-18fb0b46d555dc42f52f69428dcd52f133877078.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/l2tp/l2tp_netlink.c')
| -rw-r--r-- | net/l2tp/l2tp_netlink.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/l2tp/l2tp_netlink.c b/net/l2tp/l2tp_netlink.c index 57427d430f10..7135f4645d3a 100644 --- a/net/l2tp/l2tp_netlink.c +++ b/net/l2tp/l2tp_netlink.c @@ -643,10 +643,10 @@ static int l2tp_nl_cmd_session_create(struct sk_buff *skb, struct genl_info *inf break; } - ret = -EPROTONOSUPPORT; - if (l2tp_nl_cmd_ops[cfg.pw_type]->session_create) - ret = (*l2tp_nl_cmd_ops[cfg.pw_type]->session_create)(net, tunnel_id, - session_id, peer_session_id, &cfg); + ret = l2tp_nl_cmd_ops[cfg.pw_type]->session_create(net, tunnel, + session_id, + peer_session_id, + &cfg); if (ret >= 0) { session = l2tp_session_get(net, tunnel, session_id, false); |