diff options
| author | Guillaume Nault <g.nault@alphalink.fr> | 2018-07-27 10:59:58 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-07-27 13:34:53 -0700 |
| commit | ae51a7c6d54876c47ae53c455434023df2c19801 (patch) | |
| tree | e57104aa53391a1f4bdb707753b7b6320f041399 /net/l2tp | |
| parent | 3ae5536b808dced0af5b2e6768a41862620c779d (diff) | |
| download | linux-stable-ae51a7c6d54876c47ae53c455434023df2c19801.tar.gz linux-stable-ae51a7c6d54876c47ae53c455434023df2c19801.tar.bz2 linux-stable-ae51a7c6d54876c47ae53c455434023df2c19801.zip | |
l2tp: ignore L2TP_ATTR_VLAN_ID netlink attribute
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>
Diffstat (limited to 'net/l2tp')
| -rw-r--r-- | net/l2tp/l2tp_core.h | 1 | ||||
| -rw-r--r-- | net/l2tp/l2tp_netlink.c | 3 |
2 files changed, 0 insertions, 4 deletions
diff --git a/net/l2tp/l2tp_core.h b/net/l2tp/l2tp_core.h index 7dbfb55ab3b5..49fd5e05538c 100644 --- a/net/l2tp/l2tp_core.h +++ b/net/l2tp/l2tp_core.h @@ -54,7 +54,6 @@ struct l2tp_session_cfg { * control of LNS. */ int debug; /* bitmask of debug message * categories */ - u16 vlan_id; /* VLAN pseudowire only */ u16 l2specific_type; /* Layer 2 specific type */ u8 cookie[8]; /* optional cookie */ int cookie_len; /* 0, 4 or 8 bytes */ diff --git a/net/l2tp/l2tp_netlink.c b/net/l2tp/l2tp_netlink.c index e4785f6966f6..8ea1deefbc37 100644 --- a/net/l2tp/l2tp_netlink.c +++ b/net/l2tp/l2tp_netlink.c @@ -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]) 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]) |