Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/shemminger...

[mirror_iproute2.git] / ip / ip.c

diff --git a/ip/ip.c b/ip/ip.c
index 5ebd215817b99d7a1732160f9e4477eb1d674be5..e0cf17534dd6f27b89cf8bc553895b152a58c05d 100644 (file)
--- a/ip/ip.c
+++ b/ip/ip.c
@@ -42,7 +42,7 @@ static void usage(void)
 "Usage: ip [ OPTIONS ] OBJECT { COMMAND | help }\n"
 "       ip [ -force ] -batch filename\n"
 "where  OBJECT := { link | addr | addrlabel | route | rule | neigh | ntable |\n"
-"                   tunnel | maddr | mroute | monitor | xfrm }\n"
+"                   tunnel | tuntap | maddr | mroute | monitor | xfrm }\n"
 "       OPTIONS := { -V[ersion] | -s[tatistics] | -d[etails] | -r[esolve] |\n"
 "                    -f[amily] { inet | inet6 | ipx | dnet | link } |\n"
 "                    -o[neline] | -t[imestamp] | -b[atch] [filename] |\n"
@@ -71,6 +71,8 @@ static const struct cmd {
        { "link",       do_iplink },
        { "tunnel",     do_iptunnel },
        { "tunl",       do_iptunnel },
+       { "tuntap",     do_iptuntap },
+       { "tap",        do_iptuntap },
        { "monitor",    do_ipmonitor },
        { "xfrm",       do_xfrm },
        { "mroute",     do_multiroute },