Merge branch 'master' of nehalam:src/iproute2

2012-01-20 08:17:59 -08:00 · 2012-01-20 08:17:59 -08:00 · fdeae171e5
parent 1b6f0bb5be 5aa08f6bf4
commit fdeae171e5
1 changed files with 1 additions and 1 deletions
--- 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 },