From patchwork Fri Jul 27 10:26:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guillaume Nault X-Patchwork-Id: 950130 X-Patchwork-Delegate: dsahern@gmail.com Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=alphalink.fr Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41cQ9r6Qt8z9s0R for ; Fri, 27 Jul 2018 20:26:40 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730981AbeG0Lrv (ORCPT ); Fri, 27 Jul 2018 07:47:51 -0400 Received: from zimbra.alphalink.fr ([217.15.80.77]:37846 "EHLO zimbra.alphalink.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729493AbeG0Lru (ORCPT ); Fri, 27 Jul 2018 07:47:50 -0400 Received: from localhost (localhost [127.0.0.1]) by mail-2-cbv2.admin.alphalink.fr (Postfix) with ESMTP id 81E862B5212A; Fri, 27 Jul 2018 12:26:32 +0200 (CEST) Received: from zimbra.alphalink.fr ([127.0.0.1]) by localhost (mail-2-cbv2.admin.alphalink.fr [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id B3kKDhU99rwN; Fri, 27 Jul 2018 12:26:30 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail-2-cbv2.admin.alphalink.fr (Postfix) with ESMTP id 65EDD2B5212D; Fri, 27 Jul 2018 12:26:30 +0200 (CEST) X-Virus-Scanned: amavisd-new at mail-2-cbv2.admin.alphalink.fr Received: from zimbra.alphalink.fr ([127.0.0.1]) by localhost (mail-2-cbv2.admin.alphalink.fr [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id EjPiuiuDuH5C; Fri, 27 Jul 2018 12:26:30 +0200 (CEST) Received: from c-dev-0.admin.alphalink.fr (94-84-15-217.reverse.alphalink.fr [217.15.84.94]) by mail-2-cbv2.admin.alphalink.fr (Postfix) with ESMTP id 3888E2B52094; Fri, 27 Jul 2018 12:26:30 +0200 (CEST) Received: by c-dev-0.admin.alphalink.fr (Postfix, from userid 1000) id 1E74B601CF; Fri, 27 Jul 2018 12:26:30 +0200 (CEST) Date: Fri, 27 Jul 2018 12:26:30 +0200 From: Guillaume Nault To: netdev@vger.kernel.org Cc: Stephen Hemminger Subject: [PATCH iproute2 1/3] l2tp: drop data_seq Message-ID: <289a916292ee1851593fb59c992a3948be1ed07b.1532685939.git.g.nault@alphalink.fr> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Mutt-Fcc: =Sent User-Agent: Mutt/1.10.1 (2018-07-13) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- 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]) From patchwork Fri Jul 27 10:26:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guillaume Nault X-Patchwork-Id: 950129 X-Patchwork-Delegate: dsahern@gmail.com Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=alphalink.fr Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41cQ9p52lWz9s0R for ; Fri, 27 Jul 2018 20:26:38 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731020AbeG0Lrv (ORCPT ); Fri, 27 Jul 2018 07:47:51 -0400 Received: from zimbra.alphalink.fr ([217.15.80.77]:37850 "EHLO zimbra.alphalink.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729489AbeG0Lru (ORCPT ); Fri, 27 Jul 2018 07:47:50 -0400 Received: from localhost (localhost [127.0.0.1]) by mail-2-cbv2.admin.alphalink.fr (Postfix) with ESMTP id CC0962B52129; Fri, 27 Jul 2018 12:26:32 +0200 (CEST) Received: from zimbra.alphalink.fr ([127.0.0.1]) by localhost (mail-2-cbv2.admin.alphalink.fr [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id 5Fx_khhEdeHQ; Fri, 27 Jul 2018 12:26:31 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail-2-cbv2.admin.alphalink.fr (Postfix) with ESMTP id 996892B5212F; Fri, 27 Jul 2018 12:26:31 +0200 (CEST) X-Virus-Scanned: amavisd-new at mail-2-cbv2.admin.alphalink.fr Received: from zimbra.alphalink.fr ([127.0.0.1]) by localhost (mail-2-cbv2.admin.alphalink.fr [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id Pzs3Pb9wyYVe; Fri, 27 Jul 2018 12:26:31 +0200 (CEST) Received: from c-dev-0.admin.alphalink.fr (94-84-15-217.reverse.alphalink.fr [217.15.84.94]) by mail-2-cbv2.admin.alphalink.fr (Postfix) with ESMTP id 44E342B52129; Fri, 27 Jul 2018 12:26:31 +0200 (CEST) Received: by c-dev-0.admin.alphalink.fr (Postfix, from userid 1000) id 2B01A601CF; Fri, 27 Jul 2018 12:26:31 +0200 (CEST) Date: Fri, 27 Jul 2018 12:26:31 +0200 From: Guillaume Nault To: netdev@vger.kernel.org Cc: Stephen Hemminger Subject: [PATCH iproute2 2/3] l2tp: drop mtu Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Mutt-Fcc: =Sent User-Agent: Mutt/1.10.1 (2018-07-13) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This option can't be set by user and is never printed. Signed-off-by: Guillaume Nault --- ip/ipl2tp.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/ip/ipl2tp.c b/ip/ipl2tp.c index aca9912c..41fefb85 100644 --- a/ip/ipl2tp.c +++ b/ip/ipl2tp.c @@ -53,7 +53,6 @@ struct l2tp_parm { inet_prefix peer_ip; uint16_t pw_type; - uint16_t mtu; unsigned int udp6_csum_tx:1; unsigned int udp6_csum_rx:1; unsigned int udp_csum:1; @@ -158,8 +157,6 @@ static int create_session(struct l2tp_parm *p) addattr8(&req.n, 1024, L2TP_ATTR_L2SPEC_TYPE, p->l2spec_type); addattr8(&req.n, 1024, L2TP_ATTR_L2SPEC_LEN, p->l2spec_len); - if (p->mtu) - addattr16(&req.n, 1024, L2TP_ATTR_MTU, p->mtu); if (p->recv_seq) addattr8(&req.n, 1024, L2TP_ATTR_RECV_SEQ, 1); if (p->send_seq) @@ -413,8 +410,6 @@ static int get_response(struct nlmsghdr *n, void *arg) p->local_udp_port = rta_getattr_u16(attrs[L2TP_ATTR_UDP_SPORT]); if (attrs[L2TP_ATTR_UDP_DPORT]) p->peer_udp_port = rta_getattr_u16(attrs[L2TP_ATTR_UDP_DPORT]); - if (attrs[L2TP_ATTR_MTU]) - p->mtu = rta_getattr_u16(attrs[L2TP_ATTR_MTU]); if (attrs[L2TP_ATTR_IFNAME]) p->ifname = rta_getattr_str(attrs[L2TP_ATTR_IFNAME]); From patchwork Fri Jul 27 10:26:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guillaume Nault X-Patchwork-Id: 950128 X-Patchwork-Delegate: dsahern@gmail.com Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=alphalink.fr Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41cQ9m5xRFz9s0n for ; Fri, 27 Jul 2018 20:26:36 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731100AbeG0Lrv (ORCPT ); Fri, 27 Jul 2018 07:47:51 -0400 Received: from zimbra.alphalink.fr ([217.15.80.77]:37858 "EHLO zimbra.alphalink.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730931AbeG0Lrv (ORCPT ); Fri, 27 Jul 2018 07:47:51 -0400 Received: from localhost (localhost [127.0.0.1]) by mail-2-cbv2.admin.alphalink.fr (Postfix) with ESMTP id A3C522B5212D; Fri, 27 Jul 2018 12:26:33 +0200 (CEST) Received: from zimbra.alphalink.fr ([127.0.0.1]) by localhost (mail-2-cbv2.admin.alphalink.fr [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id dSt4g2qa_83s; Fri, 27 Jul 2018 12:26:32 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail-2-cbv2.admin.alphalink.fr (Postfix) with ESMTP id 908E42B5212E; Fri, 27 Jul 2018 12:26:32 +0200 (CEST) X-Virus-Scanned: amavisd-new at mail-2-cbv2.admin.alphalink.fr Received: from zimbra.alphalink.fr ([127.0.0.1]) by localhost (mail-2-cbv2.admin.alphalink.fr [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id OHdOxwbAeM0c; Fri, 27 Jul 2018 12:26:32 +0200 (CEST) Received: from c-dev-0.admin.alphalink.fr (94-84-15-217.reverse.alphalink.fr [217.15.84.94]) by mail-2-cbv2.admin.alphalink.fr (Postfix) with ESMTP id 531452B52129; Fri, 27 Jul 2018 12:26:32 +0200 (CEST) Received: by c-dev-0.admin.alphalink.fr (Postfix, from userid 1000) id 25410601CF; Fri, 27 Jul 2018 12:26:32 +0200 (CEST) Date: Fri, 27 Jul 2018 12:26:32 +0200 From: Guillaume Nault To: netdev@vger.kernel.org Cc: Stephen Hemminger Subject: [PATCH iproute2 3/3] l2tp: drop lns_mode Message-ID: <1c4b94177c31480f66bd90d270a1192d03a080a5.1532685939.git.g.nault@alphalink.fr> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Mutt-Fcc: =Sent User-Agent: Mutt/1.10.1 (2018-07-13) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This option is never set. Signed-off-by: Guillaume Nault --- ip/ipl2tp.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/ip/ipl2tp.c b/ip/ipl2tp.c index 41fefb85..5e7f0390 100644 --- a/ip/ipl2tp.c +++ b/ip/ipl2tp.c @@ -58,7 +58,6 @@ struct l2tp_parm { unsigned int udp_csum:1; unsigned int recv_seq:1; unsigned int send_seq:1; - unsigned int lns_mode:1; unsigned int tunnel:1; unsigned int session:1; int reorder_timeout; @@ -161,8 +160,6 @@ static int create_session(struct l2tp_parm *p) addattr8(&req.n, 1024, L2TP_ATTR_RECV_SEQ, 1); if (p->send_seq) addattr8(&req.n, 1024, L2TP_ATTR_SEND_SEQ, 1); - if (p->lns_mode) - addattr(&req.n, 1024, L2TP_ATTR_LNS_MODE); if (p->reorder_timeout) addattr64(&req.n, 1024, L2TP_ATTR_RECV_TIMEOUT, p->reorder_timeout);