xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

l2tp: ignore L2TP_ATTR_VLAN_ID netlink attribute

Browse Source 
The value of this attribute is never used.

Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Guillaume Nault
2018-07-27 10:59:58 +02:00
committed by David S. Miller
parent 3ae5536b80
commit ae51a7c6d5
3 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/uapi/linux/l2tp.h
View File

@@ -60,7 +60,7 @@ struct sockaddr_l2tpip6 {
/* /*
* Commands. * Commands.
* Valid TLVs of each command are:- * Valid TLVs of each command are:-
* TUNNEL_CREATE - CONN_ID, pw_type, netns, ifname, ipinfo, udpinfo, udpcsum, vlanid * TUNNEL_CREATE - CONN_ID, pw_type, netns, ifname, ipinfo, udpinfo, udpcsum
* TUNNEL_DELETE - CONN_ID * TUNNEL_DELETE - CONN_ID
* TUNNEL_MODIFY - CONN_ID, udpcsum * TUNNEL_MODIFY - CONN_ID, udpcsum
* TUNNEL_GETSTATS - CONN_ID, (stats) * TUNNEL_GETSTATS - CONN_ID, (stats)
@@ -105,7 +105,7 @@ enum {
L2TP_ATTR_SESSION_ID, /* u32 */ L2TP_ATTR_SESSION_ID, /* u32 */
L2TP_ATTR_PEER_SESSION_ID, /* u32 */ L2TP_ATTR_PEER_SESSION_ID, /* u32 */
L2TP_ATTR_UDP_CSUM, /* u8 */ L2TP_ATTR_UDP_CSUM, /* u8 */
L2TP_ATTR_VLAN_ID, /* u16 */ L2TP_ATTR_VLAN_ID, /* u16 (not used) */
L2TP_ATTR_COOKIE, /* 0, 4 or 8 bytes */ L2TP_ATTR_COOKIE, /* 0, 4 or 8 bytes */
L2TP_ATTR_PEER_COOKIE, /* 0, 4 or 8 bytes */ L2TP_ATTR_PEER_COOKIE, /* 0, 4 or 8 bytes */
L2TP_ATTR_DEBUG, /* u32, enum l2tp_debug_flags */ L2TP_ATTR_DEBUG, /* u32, enum l2tp_debug_flags */

1
net/l2tp/l2tp_core.h
View File

@@ -54,7 +54,6 @@ struct l2tp_session_cfg {
* control of LNS. */ * control of LNS. */
int debug; /* bitmask of debug message int debug; /* bitmask of debug message
* categories */ * categories */
u16 vlan_id; /* VLAN pseudowire only */
u16 l2specific_type; /* Layer 2 specific type */ u16 l2specific_type; /* Layer 2 specific type */
u8 cookie[8]; /* optional cookie */ u8 cookie[8]; /* optional cookie */
int cookie_len; /* 0, 4 or 8 bytes */ int cookie_len; /* 0, 4 or 8 bytes */

3
net/l2tp/l2tp_netlink.c
View File

@@ -591,9 +591,6 @@ static int l2tp_nl_cmd_session_create(struct sk_buff *skb, struct genl_info *inf
} }
if (info->attrs[L2TP_ATTR_IFNAME]) if (info->attrs[L2TP_ATTR_IFNAME])
cfg.ifname = nla_data(info->attrs[L2TP_ATTR_IFNAME]); cfg.ifname = nla_data(info->attrs[L2TP_ATTR_IFNAME]);
if (info->attrs[L2TP_ATTR_VLAN_ID])
cfg.vlan_id = nla_get_u16(info->attrs[L2TP_ATTR_VLAN_ID]);
} }
if (info->attrs[L2TP_ATTR_DEBUG]) if (info->attrs[L2TP_ATTR_DEBUG])