|
 |
049c96 |
From cc76a807b3215f06674cc613a8d492111eea949a Mon Sep 17 00:00:00 2001
|
|
|
049c96 |
From: Phil Sutter <psutter@redhat.com>
|
|
|
049c96 |
Date: Wed, 20 Jul 2016 22:57:10 +0200
|
|
|
049c96 |
Subject: [PATCH] ip-link.8: Fix font choices
|
|
|
049c96 |
|
|
|
049c96 |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1269528
|
|
|
049c96 |
Upstream Status: iproute2.git commit 52a5986980527
|
|
|
049c96 |
Conflicts: Context changes due to missing support for 'external' VXLAN
|
|
|
049c96 |
flag and missing HSR support.
|
|
|
049c96 |
|
|
|
049c96 |
commit 52a598698052773857a2ca590b81940367774fce
|
|
|
049c96 |
Author: Phil Sutter <phil@nwl.cc>
|
|
|
049c96 |
Date: Sat Jul 9 11:22:50 2016 +0200
|
|
|
049c96 |
|
|
|
049c96 |
ip-link.8: Fix font choices
|
|
|
049c96 |
|
|
|
049c96 |
Signed-off-by: Phil Sutter <phil@nwl.cc>
|
|
|
049c96 |
---
|
|
|
049c96 |
man/man8/ip-link.8.in | 76 ++++++++++++++++++++++++++-------------------------
|
|
|
049c96 |
1 file changed, 39 insertions(+), 37 deletions(-)
|
|
|
049c96 |
|
|
|
049c96 |
diff --git a/man/man8/ip-link.8.in b/man/man8/ip-link.8.in
|
|
|
049c96 |
index be572f6..1d2fcb0 100644
|
|
|
049c96 |
--- a/man/man8/ip-link.8.in
|
|
|
049c96 |
+++ b/man/man8/ip-link.8.in
|
|
|
049c96 |
@@ -269,7 +269,7 @@ the following additional arguments are supported:
|
|
|
049c96 |
.BI "ip link add
|
|
|
049c96 |
.BI link " DEVICE "
|
|
|
049c96 |
.BI name " NAME "
|
|
|
049c96 |
-.BI type " vlan "
|
|
|
049c96 |
+.B "type vlan"
|
|
|
049c96 |
[
|
|
|
049c96 |
.BI protocol " VLAN_PROTO "
|
|
|
049c96 |
]
|
|
|
049c96 |
@@ -327,7 +327,7 @@ For a link of type
|
|
|
049c96 |
the following additional arguments are supported:
|
|
|
049c96 |
|
|
|
049c96 |
.BI "ip link add " DEVICE
|
|
|
049c96 |
-.BI type " vxlan " id " ID"
|
|
|
049c96 |
+.BI type " vxlan " id " VNI"
|
|
|
049c96 |
[
|
|
|
049c96 |
.BI dev " PHYS_DEV "
|
|
|
049c96 |
.RB " ] [ { " group " | " remote " } "
|
|
|
049c96 |
@@ -344,21 +344,21 @@ the following additional arguments are supported:
|
|
|
049c96 |
] [
|
|
|
049c96 |
.BI srcport " MIN MAX "
|
|
|
049c96 |
] [
|
|
|
049c96 |
-.I "[no]learning "
|
|
|
049c96 |
+.RB [ no ] learning
|
|
|
049c96 |
] [
|
|
|
049c96 |
-.I "[no]proxy "
|
|
|
049c96 |
+.RB [ no ] proxy
|
|
|
049c96 |
] [
|
|
|
049c96 |
-.I "[no]rsc "
|
|
|
049c96 |
+.RB [ no ] rsc
|
|
|
049c96 |
] [
|
|
|
049c96 |
-.I "[no]l2miss "
|
|
|
049c96 |
+.RB [ no ] l2miss
|
|
|
049c96 |
] [
|
|
|
049c96 |
-.I "[no]l3miss "
|
|
|
049c96 |
+.RB [ no ] l3miss
|
|
|
049c96 |
] [
|
|
|
049c96 |
-.I "[no]udpcsum "
|
|
|
049c96 |
+.RB [ no ] udpcsum
|
|
|
049c96 |
] [
|
|
|
049c96 |
-.I "[no]udp6zerocsumtx "
|
|
|
049c96 |
+.RB [ no ] udp6zerocsumtx
|
|
|
049c96 |
] [
|
|
|
049c96 |
-.I "[no]udp6zerocsumrx "
|
|
|
049c96 |
+.RB [ no ] udp6zerocsumrx
|
|
|
049c96 |
] [
|
|
|
049c96 |
.BI ageing " SECONDS "
|
|
|
049c96 |
] [
|
|
|
049c96 |
@@ -413,36 +413,36 @@ parameter.
|
|
|
049c96 |
source ports to communicate to the remote VXLAN tunnel endpoint.
|
|
|
049c96 |
|
|
|
049c96 |
.sp
|
|
|
049c96 |
-.I [no]learning
|
|
|
049c96 |
+.RB [ no ] learning
|
|
|
049c96 |
- specifies if unknown source link layer addresses and IP addresses
|
|
|
049c96 |
are entered into the VXLAN device forwarding database.
|
|
|
049c96 |
|
|
|
049c96 |
.sp
|
|
|
049c96 |
-.I [no]rsc
|
|
|
049c96 |
+.RB [ no ] rsc
|
|
|
049c96 |
- specifies if route short circuit is turned on.
|
|
|
049c96 |
|
|
|
049c96 |
.sp
|
|
|
049c96 |
-.I [no]proxy
|
|
|
049c96 |
+.RB [ no ] proxy
|
|
|
049c96 |
- specifies ARP proxy is turned on.
|
|
|
049c96 |
|
|
|
049c96 |
.sp
|
|
|
049c96 |
-.I [no]l2miss
|
|
|
049c96 |
+.RB [ no ] l2miss
|
|
|
049c96 |
- specifies if netlink LLADDR miss notifications are generated.
|
|
|
049c96 |
|
|
|
049c96 |
.sp
|
|
|
049c96 |
-.I [no]l3miss
|
|
|
049c96 |
+.RB [ no ] l3miss
|
|
|
049c96 |
- specifies if netlink IP ADDR miss notifications are generated.
|
|
|
049c96 |
|
|
|
049c96 |
.sp
|
|
|
049c96 |
-.I [no]udpcsum
|
|
|
049c96 |
+.RB [ no ] udpcsum
|
|
|
049c96 |
- specifies if UDP checksum is calculated for transmitted packets over IPv4.
|
|
|
049c96 |
|
|
|
049c96 |
.sp
|
|
|
049c96 |
-.I [no]udp6zerocsumtx
|
|
|
049c96 |
+.RB [ no ] udp6zerocsumtx
|
|
|
049c96 |
- skip UDP checksum calculation for transmitted packets over IPv6.
|
|
|
049c96 |
|
|
|
049c96 |
.sp
|
|
|
049c96 |
-.I [no]udp6zerocsumrx
|
|
|
049c96 |
+.RB [ no ] udp6zerocsumrx
|
|
|
049c96 |
- allow incoming UDP packets over IPv6 with zero checksum field.
|
|
|
049c96 |
|
|
|
049c96 |
.sp
|
|
|
049c96 |
@@ -505,18 +505,18 @@ For a link of types
|
|
|
049c96 |
the following additional arguments are supported:
|
|
|
049c96 |
|
|
|
049c96 |
.BI "ip link add " DEVICE
|
|
|
049c96 |
-.BR type " { gre | ipip | sit } "
|
|
|
049c96 |
+.BR type " { " gre " | " ipip " | " sit " }"
|
|
|
049c96 |
.BI " remote " ADDR " local " ADDR
|
|
|
049c96 |
[
|
|
|
049c96 |
-.BR encap " { fou | gue | none } "
|
|
|
049c96 |
+.BR encap " { " fou " | " gue " | " none " }"
|
|
|
049c96 |
] [
|
|
|
049c96 |
-.BI "encap-sport { " PORT " | auto } "
|
|
|
049c96 |
+.BR encap-sport " { " \fIPORT " | " auto " }"
|
|
|
049c96 |
] [
|
|
|
049c96 |
.BI "encap-dport " PORT
|
|
|
049c96 |
] [
|
|
|
049c96 |
-.I " [no]encap-csum "
|
|
|
049c96 |
+.RB [ no ] encap-csum
|
|
|
049c96 |
] [
|
|
|
049c96 |
-.I " [no]encap-remcsum "
|
|
|
049c96 |
+.RB [ no ] encap-remcsum
|
|
|
049c96 |
]
|
|
|
049c96 |
|
|
|
049c96 |
.in +8
|
|
|
049c96 |
@@ -530,12 +530,12 @@ the following additional arguments are supported:
|
|
|
049c96 |
It must be an address on another interface on this host.
|
|
|
049c96 |
|
|
|
049c96 |
.sp
|
|
|
049c96 |
-.BR encap " { fou | gue | none } "
|
|
|
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 |
-.BI "encap-sport { " PORT " | auto } "
|
|
|
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 |
@@ -544,12 +544,12 @@ indicates that the port number should be chosen automatically
|
|
|
049c96 |
encapsulated packet).
|
|
|
049c96 |
|
|
|
049c96 |
.sp
|
|
|
049c96 |
-.I [no]encap-csum
|
|
|
049c96 |
+.RB [ no ] encap-csum
|
|
|
049c96 |
- specifies if UDP checksums are enabled in the secondary
|
|
|
049c96 |
encapsulation.
|
|
|
049c96 |
|
|
|
049c96 |
.sp
|
|
|
049c96 |
-.I [no]encap-remcsum
|
|
|
049c96 |
+.RB [ no ] encap-remcsum
|
|
|
049c96 |
- specifies if Remote Checksum Offload is enabled. This is only
|
|
|
049c96 |
applicable for Generic UDP Encapsulation.
|
|
|
049c96 |
|
|
|
049c96 |
@@ -562,13 +562,15 @@ For a link of type
|
|
|
049c96 |
the following additional arguments are supported:
|
|
|
049c96 |
|
|
|
049c96 |
.BI "ip link add " DEVICE
|
|
|
049c96 |
-.BI type " { ip6gre | ip6gretap } " remote " ADDR " local " ADDR
|
|
|
049c96 |
+.BR type " { " ip6gre " | " ip6gretap " }"
|
|
|
049c96 |
+.BI remote " ADDR " local " ADDR"
|
|
|
049c96 |
[
|
|
|
049c96 |
-.I "[i|o]seq]"
|
|
|
049c96 |
+.RB [ i | o ] seq
|
|
|
049c96 |
] [
|
|
|
049c96 |
-.I "[i|o]key" KEY
|
|
|
049c96 |
+.RB [ i | o ] key
|
|
|
049c96 |
+.I KEY
|
|
|
049c96 |
] [
|
|
|
049c96 |
-.I " [i|o]csum "
|
|
|
049c96 |
+.RB [ i | o ] csum
|
|
|
049c96 |
] [
|
|
|
049c96 |
.BI hoplimit " TTL "
|
|
|
049c96 |
] [
|
|
|
049c96 |
@@ -594,7 +596,7 @@ the following additional arguments are supported:
|
|
|
049c96 |
It must be an address on another interface on this host.
|
|
|
049c96 |
|
|
|
049c96 |
.sp
|
|
|
049c96 |
-.BI [i|o]seq
|
|
|
049c96 |
+.RB [ i | o ] seq
|
|
|
049c96 |
- serialize packets.
|
|
|
049c96 |
The
|
|
|
049c96 |
.B oseq
|
|
|
049c96 |
@@ -604,7 +606,7 @@ The
|
|
|
049c96 |
flag requires that all input packets are serialized.
|
|
|
049c96 |
|
|
|
049c96 |
.sp
|
|
|
049c96 |
-.BI [i|o]key " KEY"
|
|
|
049c96 |
+.RB [ i | o ] key " \fIKEY"
|
|
|
049c96 |
- use keyed GRE with key
|
|
|
049c96 |
.IR KEY ". "KEY
|
|
|
049c96 |
is either a number or an IPv4 address-like dotted quad.
|
|
|
049c96 |
@@ -616,7 +618,7 @@ The
|
|
|
049c96 |
parameters specify different keys for input and output.
|
|
|
049c96 |
|
|
|
049c96 |
.sp
|
|
|
049c96 |
-.BI [i|o]csum
|
|
|
049c96 |
+.RB [ i | o ] csum
|
|
|
049c96 |
- generate/require checksums for tunneled packets.
|
|
|
049c96 |
The
|
|
|
049c96 |
.B ocsum
|
|
|
049c96 |
@@ -668,7 +670,7 @@ For a link of type
|
|
|
049c96 |
the following additional arguments are supported:
|
|
|
049c96 |
|
|
|
049c96 |
.BI "ip link add " DEVICE " name " NAME
|
|
|
049c96 |
-.BI type " ipoib [ " pkey " PKEY ] [" mode " MODE " ]
|
|
|
049c96 |
+.BR "type ipoib " [ " pkey \fIPKEY" " ] [ " mode " \fIMODE \fR]"
|
|
|
049c96 |
|
|
|
049c96 |
.in +8
|
|
|
049c96 |
.sp
|
|
|
049c96 |
@@ -685,7 +687,7 @@ For a link of type
|
|
|
049c96 |
the following additional arguments are supported:
|
|
|
049c96 |
|
|
|
049c96 |
.BI "ip link add " DEVICE
|
|
|
049c96 |
-.BI type " geneve " id " ID " remote " IPADDR"
|
|
|
049c96 |
+.BI type " geneve " id " VNI " remote " IPADDR"
|
|
|
049c96 |
[
|
|
|
049c96 |
.BI ttl " TTL "
|
|
|
049c96 |
] [
|
|
|
049c96 |
@@ -728,7 +730,7 @@ the following additional arguments are supported:
|
|
|
049c96 |
.BI "ip link add link " DEVICE " name " NAME
|
|
|
049c96 |
.BR type " { " macvlan " | " macvtap " } "
|
|
|
049c96 |
.BR mode " { " private " | " vepa " | " bridge " | " passthru
|
|
|
049c96 |
-.BR " [ " nopromisc " ] } "
|
|
|
049c96 |
+.RB " [ " nopromisc " ] } "
|
|
|
049c96 |
|
|
|
049c96 |
.in +8
|
|
|
049c96 |
.sp
|
|
|
049c96 |
--
|
|
|
049c96 |
1.8.3.1
|
|
|
049c96 |
|