From 99d6ff2101ff2dd6b9de5f02b01afb8791a63eea Mon Sep 17 00:00:00 2001 From: Guillaume Nault Date: Fri, 27 Jul 2018 12:26:30 +0200 Subject: [PATCH] l2tp: drop data_seq This option can't be set by user and is never printed. Furthermore, L2TP_ATTR_DATA_SEQ has always been a noop in Linux. Signed-off-by: Guillaume Nault Signed-off-by: David Ahern --- ip/ipl2tp.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/ip/ipl2tp.c b/ip/ipl2tp.c index 05e96387..aca9912c 100644 --- a/ip/ipl2tp.c +++ b/ip/ipl2tp.c @@ -60,7 +60,6 @@ struct l2tp_parm { unsigned int recv_seq:1; unsigned int send_seq:1; unsigned int lns_mode:1; - unsigned int data_seq:2; unsigned int tunnel:1; unsigned int session:1; int reorder_timeout; @@ -167,8 +166,6 @@ static int create_session(struct l2tp_parm *p) addattr8(&req.n, 1024, L2TP_ATTR_SEND_SEQ, 1); if (p->lns_mode) addattr(&req.n, 1024, L2TP_ATTR_LNS_MODE); - if (p->data_seq) - addattr8(&req.n, 1024, L2TP_ATTR_DATA_SEQ, p->data_seq); if (p->reorder_timeout) addattr64(&req.n, 1024, L2TP_ATTR_RECV_TIMEOUT, p->reorder_timeout); @@ -359,8 +356,6 @@ static int get_response(struct nlmsghdr *n, void *arg) p->pw_type = rta_getattr_u16(attrs[L2TP_ATTR_PW_TYPE]); if (attrs[L2TP_ATTR_ENCAP_TYPE]) p->encap = rta_getattr_u16(attrs[L2TP_ATTR_ENCAP_TYPE]); - if (attrs[L2TP_ATTR_DATA_SEQ]) - p->data_seq = rta_getattr_u16(attrs[L2TP_ATTR_DATA_SEQ]); if (attrs[L2TP_ATTR_CONN_ID]) p->tunnel_id = rta_getattr_u32(attrs[L2TP_ATTR_CONN_ID]); if (attrs[L2TP_ATTR_PEER_CONN_ID]) -- 2.39.2