|
 |
049c96 |
From 53c41b7d2b6e2a37065e7963fa9c0938b9d936d2 Mon Sep 17 00:00:00 2001
|
|
|
049c96 |
From: Phil Sutter <psutter@redhat.com>
|
|
|
049c96 |
Date: Wed, 3 Aug 2016 13:19:05 +0200
|
|
|
049c96 |
Subject: [PATCH] man: ip-link: Drop fou and gue related documentation
|
|
|
049c96 |
|
|
|
049c96 |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1013584
|
|
|
049c96 |
Upstream Status: RHEL only
|
|
|
049c96 |
|
|
|
049c96 |
This is a partial revert of commit 90f1df715eb38 ("iproute: Descriptions
|
|
|
049c96 |
of fou and gue options in ip-link man pages") which, besides useful
|
|
|
049c96 |
additions, also documents options not supported in iproute as shipped
|
|
|
049c96 |
with RHEL7.
|
|
|
049c96 |
---
|
|
|
049c96 |
man/man8/ip-link.8.in | 44 --------------------------------------------
|
|
|
049c96 |
1 file changed, 44 deletions(-)
|
|
|
049c96 |
|
|
|
049c96 |
diff --git a/man/man8/ip-link.8.in b/man/man8/ip-link.8.in
|
|
|
049c96 |
index dc9728c..b9d9933 100644
|
|
|
049c96 |
--- a/man/man8/ip-link.8.in
|
|
|
049c96 |
+++ b/man/man8/ip-link.8.in
|
|
|
049c96 |
@@ -511,17 +511,6 @@ the following additional arguments are supported:
|
|
|
049c96 |
.BI "ip link add " DEVICE
|
|
|
049c96 |
.BR type " { " gre " | " ipip " | " sit " }"
|
|
|
049c96 |
.BI " remote " ADDR " local " ADDR
|
|
|
049c96 |
-[
|
|
|
049c96 |
-.BR encap " { " fou " | " gue " | " none " }"
|
|
|
049c96 |
-] [
|
|
|
049c96 |
-.BR encap-sport " { " \fIPORT " | " auto " }"
|
|
|
049c96 |
-] [
|
|
|
049c96 |
-.BI "encap-dport " PORT
|
|
|
049c96 |
-] [
|
|
|
049c96 |
-.RB [ no ] encap-csum
|
|
|
049c96 |
-] [
|
|
|
049c96 |
-.RB [ no ] encap-remcsum
|
|
|
049c96 |
-]
|
|
|
049c96 |
|
|
|
049c96 |
.in +8
|
|
|
049c96 |
.sp
|
|
|
049c96 |
@@ -533,30 +522,6 @@ the following additional arguments are supported:
|
|
|
049c96 |
- specifies the fixed local address for tunneled packets.
|
|
|
049c96 |
It must be an address on another interface on this host.
|
|
|
049c96 |
|
|
|
049c96 |
-.sp
|
|
|
049c96 |
-.BR encap " { " fou " | " gue " | " none " }"
|
|
|
049c96 |
-- specifies type of secondary UDP encapsulation. "fou" indicates
|
|
|
049c96 |
-Foo-Over-UDP, "gue" indicates Generic UDP Encapsulation.
|
|
|
049c96 |
-
|
|
|
049c96 |
-.sp
|
|
|
049c96 |
-.BR encap-sport " { " \fIPORT " | " auto " }"
|
|
|
049c96 |
-- specifies the source port in UDP encapsulation.
|
|
|
049c96 |
-.IR PORT
|
|
|
049c96 |
-indicates the port by number, "auto"
|
|
|
049c96 |
-indicates that the port number should be chosen automatically
|
|
|
049c96 |
-(the kernel picks a flow based on the flow hash of the
|
|
|
049c96 |
-encapsulated packet).
|
|
|
049c96 |
-
|
|
|
049c96 |
-.sp
|
|
|
049c96 |
-.RB [ no ] encap-csum
|
|
|
049c96 |
-- specifies if UDP checksums are enabled in the secondary
|
|
|
049c96 |
-encapsulation.
|
|
|
049c96 |
-
|
|
|
049c96 |
-.sp
|
|
|
049c96 |
-.RB [ no ] encap-remcsum
|
|
|
049c96 |
-- specifies if Remote Checksum Offload is enabled. This is only
|
|
|
049c96 |
-applicable for Generic UDP Encapsulation.
|
|
|
049c96 |
-
|
|
|
049c96 |
.in -8
|
|
|
049c96 |
|
|
|
049c96 |
.TP
|
|
|
049c96 |
@@ -1293,15 +1258,6 @@ ip link help gre
|
|
|
049c96 |
.RS 4
|
|
|
049c96 |
Display help for the gre link type.
|
|
|
049c96 |
.RE
|
|
|
049c96 |
-.PP
|
|
|
049c96 |
-ip link add name tun1 type ipip remote 192.168.1.1
|
|
|
049c96 |
-local 192.168.1.2 ttl 225 encap gue encap-sport auto
|
|
|
049c96 |
-encap-dport 5555 encap-csum encap-remcsum
|
|
|
049c96 |
-.RS 4
|
|
|
049c96 |
-Creates an IPIP that is encapsulated with Generic UDP Encapsulation,
|
|
|
049c96 |
-and the outer UDP checksum and remote checksum offload are enabled.
|
|
|
049c96 |
-
|
|
|
049c96 |
-.RE
|
|
|
049c96 |
|
|
|
049c96 |
.SH SEE ALSO
|
|
|
049c96 |
.br
|
|
|
049c96 |
--
|
|
|
049c96 |
1.8.3.1
|
|
|
049c96 |
|