diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-04-11 10:05:36 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-04-11 10:05:36 +0300 |
| commit | 36a4dfc37856cae40e4d864950f768d8b7d4f9f5 (patch) | |
| tree | 3aa6a1459a699b986632f64b740e8e98e3ce6500 /net/l2tp/l2tp_eth.c | |
| parent | a481db34b9beb7a9647c23f2320dd38a2b1d681f (diff) | |
| parent | 39da7c509acff13fc8cb12ec1bb20337c988ed36 (diff) | |
| download | linux-36a4dfc37856cae40e4d864950f768d8b7d4f9f5.tar.xz | |
Merge tag 'v4.11-rc6' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/l2tp/l2tp_eth.c')
| -rw-r--r-- | net/l2tp/l2tp_eth.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/net/l2tp/l2tp_eth.c b/net/l2tp/l2tp_eth.c index 8bf18a5f66e0..6fd41d7afe1e 100644 --- a/net/l2tp/l2tp_eth.c +++ b/net/l2tp/l2tp_eth.c @@ -221,12 +221,6 @@ static int l2tp_eth_create(struct net *net, u32 tunnel_id, u32 session_id, u32 p goto out; } - session = l2tp_session_find(net, tunnel, session_id); - if (session) { - rc = -EEXIST; - goto out; - } - if (cfg->ifname) { dev = dev_get_by_name(net, cfg->ifname); if (dev) { @@ -240,8 +234,8 @@ static int l2tp_eth_create(struct net *net, u32 tunnel_id, u32 session_id, u32 p session = l2tp_session_create(sizeof(*spriv), tunnel, session_id, peer_session_id, cfg); - if (!session) { - rc = -ENOMEM; + if (IS_ERR(session)) { + rc = PTR_ERR(session); goto out; } |