diff options
author | Lorenzo Bianconi <lorenzo.bianconi@redhat.com> | 2018-01-17 05:41:20 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-01-19 15:10:23 -0500 |
commit | 30c3e9d470358a6741e00e1034a1ea85c6a516f0 (patch) | |
tree | 5e5ff32d154452a327907dca5c61495fcfb076c6 /net | |
parent | 24949304c9ed7a409ac42ec63e19835519ffc44a (diff) |
l2tp: remove switch block in l2tp_nl_cmd_session_create()
Remove the switch block in l2tp_nl_cmd_session_create() that
checks pseudowire-specific parameters since just L2TP_PWTYPE_ETH and
L2TP_PWTYPE_PPP are currently supported and no actual checks are
performed. Moreover the L2TP_PWTYPE_IP/default case presents a harmless
issue in error handling (break instead of goto out_tunnel)
Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
Acked-by: Guillaume Nault <g.nault@alphalink.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r-- | net/l2tp/l2tp_netlink.c | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/net/l2tp/l2tp_netlink.c b/net/l2tp/l2tp_netlink.c index 405a5341ed1e..e7ea9c4b89ff 100644 --- a/net/l2tp/l2tp_netlink.c +++ b/net/l2tp/l2tp_netlink.c | |||
@@ -620,27 +620,6 @@ static int l2tp_nl_cmd_session_create(struct sk_buff *skb, struct genl_info *inf | |||
620 | goto out_tunnel; | 620 | goto out_tunnel; |
621 | } | 621 | } |
622 | 622 | ||
623 | /* Check that pseudowire-specific params are present */ | ||
624 | switch (cfg.pw_type) { | ||
625 | case L2TP_PWTYPE_NONE: | ||
626 | break; | ||
627 | case L2TP_PWTYPE_ETH_VLAN: | ||
628 | if (!info->attrs[L2TP_ATTR_VLAN_ID]) { | ||
629 | ret = -EINVAL; | ||
630 | goto out_tunnel; | ||
631 | } | ||
632 | break; | ||
633 | case L2TP_PWTYPE_ETH: | ||
634 | break; | ||
635 | case L2TP_PWTYPE_PPP: | ||
636 | case L2TP_PWTYPE_PPP_AC: | ||
637 | break; | ||
638 | case L2TP_PWTYPE_IP: | ||
639 | default: | ||
640 | ret = -EPROTONOSUPPORT; | ||
641 | break; | ||
642 | } | ||
643 | |||
644 | ret = l2tp_nl_cmd_ops[cfg.pw_type]->session_create(net, tunnel, | 623 | ret = l2tp_nl_cmd_ops[cfg.pw_type]->session_create(net, tunnel, |
645 | session_id, | 624 | session_id, |
646 | peer_session_id, | 625 | peer_session_id, |