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>
This commit is contained in:
parent
24949304c9
commit
30c3e9d470
@ -620,27 +620,6 @@ static int l2tp_nl_cmd_session_create(struct sk_buff *skb, struct genl_info *inf
|
|||||||
goto out_tunnel;
|
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,
|
ret = l2tp_nl_cmd_ops[cfg.pw_type]->session_create(net, tunnel,
|
||||||
session_id,
|
session_id,
|
||||||
peer_session_id,
|
peer_session_id,
|
||||||
|
Loading…
Reference in New Issue
Block a user