|
 |
049c96 |
From 2f5dccc695c146101b4fc796e0f31fc71e97aaff Mon Sep 17 00:00:00 2001
|
|
|
049c96 |
From: Phil Sutter <psutter@redhat.com>
|
|
|
049c96 |
Date: Mon, 7 Mar 2016 15:57:01 +0100
|
|
|
049c96 |
Subject: [PATCH] man ip-link: Add missing link types - vti,ipvlan,nlmon
|
|
|
049c96 |
|
|
|
049c96 |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1013584
|
|
|
049c96 |
Upstream Status: iproute2.git commit b6d6b5a1cdd91
|
|
|
049c96 |
|
|
|
049c96 |
commit b6d6b5a1cdd91c878ab2541f38402a44ffb75ee7
|
|
|
049c96 |
Author: Vadim Kochan <vadim4j@gmail.com>
|
|
|
049c96 |
Date: Sat Apr 4 19:00:55 2015 +0300
|
|
|
049c96 |
|
|
|
049c96 |
man ip-link: Add missing link types - vti,ipvlan,nlmon
|
|
|
049c96 |
|
|
|
049c96 |
Signed-off-by: Vadim Kochan <vadim4j@gmail.com>
|
|
|
049c96 |
---
|
|
|
049c96 |
man/man8/ip-link.8.in | 14 +++++++++++++-
|
|
|
049c96 |
1 file changed, 13 insertions(+), 1 deletion(-)
|
|
|
049c96 |
|
|
|
049c96 |
diff --git a/man/man8/ip-link.8.in b/man/man8/ip-link.8.in
|
|
|
049c96 |
index d8fca23..339b5c5 100644
|
|
|
049c96 |
--- a/man/man8/ip-link.8.in
|
|
|
049c96 |
+++ b/man/man8/ip-link.8.in
|
|
|
049c96 |
@@ -68,7 +68,10 @@ ip-link \- network device configuration
|
|
|
049c96 |
.BR gre " |"
|
|
|
049c96 |
.BR gretap " |"
|
|
|
049c96 |
.BR ip6gre " |"
|
|
|
049c96 |
-.BR ip6gretap " ]"
|
|
|
049c96 |
+.BR ip6gretap " |"
|
|
|
049c96 |
+.BR vti " |"
|
|
|
049c96 |
+.BR nlmon " |"
|
|
|
049c96 |
+.BR ipvlan " ]"
|
|
|
049c96 |
|
|
|
049c96 |
.ti -8
|
|
|
049c96 |
.BI "ip link delete " DEVICE
|
|
|
049c96 |
@@ -212,6 +215,15 @@ Link types:
|
|
|
049c96 |
.sp
|
|
|
049c96 |
.BR ip6gretap
|
|
|
049c96 |
- Virtual L2 tunnel interface GRE over IPv6
|
|
|
049c96 |
+.sp
|
|
|
049c96 |
+.BR vti
|
|
|
049c96 |
+- Virtual tunnel interface
|
|
|
049c96 |
+.sp
|
|
|
049c96 |
+.BR nlmon
|
|
|
049c96 |
+- Netlink monitoring device
|
|
|
049c96 |
+.sp
|
|
|
049c96 |
+.BR ipvlan
|
|
|
049c96 |
+- Interface for L3 (IPv6/IPv4) based VLANs
|
|
|
049c96 |
.in -8
|
|
|
049c96 |
|
|
|
049c96 |
.TP
|
|
|
049c96 |
--
|
|
|
049c96 |
1.8.3.1
|
|
|
049c96 |
|