commit | fdeae171e52845b465971566c9a14498dda34307 | [log] [tgz] |
---|---|---|
author | Stephen Hemminger <stephen.hemminger@vyatta.com> | Fri Jan 20 08:17:59 2012 -0800 |
committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | Fri Jan 20 08:17:59 2012 -0800 |
tree | c67c9b0e09b37d2702d7862b5382113828b2272d | |
parent | 1b6f0bb5be5d71fd62ed6ccbc3665adc6e747b82 [diff] | |
parent | 5aa08f6bf4107f8aec43c0678466a314dbd0d054 [diff] |
Merge branch 'master' of nehalam:src/iproute2
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 @@ { "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 },