]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
l2tp: remove switch block in l2tp_nl_cmd_session_create()
authorLorenzo Bianconi <lorenzo.bianconi@redhat.com>
Wed, 17 Jan 2018 10:41:20 +0000 (11:41 +0100)
committerDavid S. Miller <davem@davemloft.net>
Fri, 19 Jan 2018 20:10:23 +0000 (15:10 -0500)
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>
net/l2tp/l2tp_netlink.c

index 405a5341ed1e40f363b58aa9260e285a1b35fc26..e7ea9c4b89ffc2ee942fb62d0100f38bb1b47f66 100644 (file)
@@ -620,27 +620,6 @@ static int l2tp_nl_cmd_session_create(struct sk_buff *skb, struct genl_info *inf
                goto out_tunnel;
        }
 
-       /* Check that pseudowire-specific params are present */
-       switch (cfg.pw_type) {
-       case L2TP_PWTYPE_NONE:
-               break;
-       case L2TP_PWTYPE_ETH_VLAN:
-               if (!info->attrs[L2TP_ATTR_VLAN_ID]) {
-                       ret = -EINVAL;
-                       goto out_tunnel;
-               }
-               break;
-       case L2TP_PWTYPE_ETH:
-               break;
-       case L2TP_PWTYPE_PPP:
-       case L2TP_PWTYPE_PPP_AC:
-               break;
-       case L2TP_PWTYPE_IP:
-       default:
-               ret = -EPROTONOSUPPORT;
-               break;
-       }
-
        ret = l2tp_nl_cmd_ops[cfg.pw_type]->session_create(net, tunnel,
                                                           session_id,
                                                           peer_session_id,