Patchwork iproute2: l2tp support

login
register
mail settings
Submitter stephen hemminger
Date Jan. 20, 2012, 7:06 p.m.
Message ID <20120120110604.1101991b@nehalam.linuxnetplumber.net>
Download mbox | patch
Permalink /patch/137090/
State Accepted
Delegated to: stephen hemminger
Headers show

Comments

stephen hemminger - Jan. 20, 2012, 7:06 p.m.
On Thu, 29 Dec 2011 09:42:14 -0800
Stephen Hemminger <shemminger@vyatta.com> 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 <shemminger@vyatta.com>
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

Patch

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 },