From patchwork Fri Jan 20 19:06:04 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: stephen hemminger X-Patchwork-Id: 137090 X-Patchwork-Delegate: shemminger@vyatta.com Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 45F60B6F13 for ; Sat, 21 Jan 2012 06:06:12 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754722Ab2ATTGL (ORCPT ); Fri, 20 Jan 2012 14:06:11 -0500 Received: from mail.vyatta.com ([76.74.103.46]:50544 "EHLO mail.vyatta.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753777Ab2ATTGI (ORCPT ); Fri, 20 Jan 2012 14:06:08 -0500 Received: from localhost (localhost.localdomain [127.0.0.1]) by mail.vyatta.com (Postfix) with ESMTP id 9933F141001C; Fri, 20 Jan 2012 11:06:07 -0800 (PST) X-Virus-Scanned: amavisd-new at tahiti.vyatta.com Received: from mail.vyatta.com ([127.0.0.1]) by localhost (mail.vyatta.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id reqQdKigzLgC; Fri, 20 Jan 2012 11:06:06 -0800 (PST) Received: from nehalam.linuxnetplumber.net (static-50-53-80-93.bvtn.or.frontiernet.net [50.53.80.93]) by mail.vyatta.com (Postfix) with ESMTPSA id 40989141000F; Fri, 20 Jan 2012 11:06:06 -0800 (PST) Date: Fri, 20 Jan 2012 11:06:04 -0800 From: Stephen Hemminger To: Stephen Hemminger Cc: James Chapman , netdev@vger.kernel.org Subject: Re: iproute2: l2tp support Message-ID: <20120120110604.1101991b@nehalam.linuxnetplumber.net> In-Reply-To: <20111229094214.238a1b8f@nehalam.linuxnetplumber.net> References: <20111229094214.238a1b8f@nehalam.linuxnetplumber.net> Organization: Vyatta X-Mailer: Claws Mail 3.8.0 (GTK+ 2.24.8; x86_64-pc-linux-gnu) Mime-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Thu, 29 Dec 2011 09:42:14 -0800 Stephen Hemminger wrote: > I updated the latest iproute2 in git to include support for L2TP. > It is based on James's code but instead of using libnl, it uses netlink > directly (like I asked when rejecting the original patch). > > In order to make netlink code in iproute2 cleaner, several libnetlink > have been updated. > * unused junk argument to rtnl_dump_filter and rtnl_talk have > been removed. > * addattr_xx functions for building attributes added. > * rta_getattr_XXX inline functions for the common case of > looking at basic type attributes > > This will show up in 3.2 version of iproute2 which is ready and > waiting for kernel release. The addition of l2tp broke the common syntax of 'ip l' since it would match ip l2tp rather than ip link. Just added the following patch: commit 5aa08f6bf4107f8aec43c0678466a314dbd0d054 Author: Stephen Hemminger Date: Fri Jan 20 08:16:02 2012 -0800 ip: make 'ip l' be 'ip link' Restore compatiablity for those lazy typists. --- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/ip/ip.c b/ip/ip.c index 7b4bacb..20dc3b5 100644 --- a/ip/ip.c +++ b/ip/ip.c @@ -72,8 +72,8 @@ static const struct cmd { { "neighbour", do_ipneigh }, { "ntable", do_ipntable }, { "ntbl", do_ipntable }, - { "l2tp", do_ipl2tp }, { "link", do_iplink }, + { "l2tp", do_ipl2tp }, { "tunnel", do_iptunnel }, { "tunl", do_iptunnel }, { "tuntap", do_iptuntap },