|
 |
049c96 |
From a858036c46f6887ac0dc5211f5884876913fb432 Mon Sep 17 00:00:00 2001
|
|
|
049c96 |
From: Phil Sutter <psutter@redhat.com>
|
|
|
049c96 |
Date: Fri, 22 Jul 2016 12:08:03 +0200
|
|
|
049c96 |
Subject: [PATCH] Document VF link state control in the ip-link man page
|
|
|
049c96 |
|
|
|
049c96 |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1264146
|
|
|
049c96 |
Upstream Status: iproute2.git commit 63f60e3ab3655
|
|
|
049c96 |
Conflicts: Multiple due to mistakes when resolving conflicts while
|
|
|
049c96 |
backporting commit ca611d6408c9b ("man: ip-link.8: Fix and
|
|
|
049c96 |
improve synopsis").
|
|
|
049c96 |
|
|
|
049c96 |
This commit is strictly speaking not related to bz#1264146, but it helps
|
|
|
049c96 |
preventing conflicts with the real fix for that BZ. Also it was
|
|
|
049c96 |
forgotten when backporting for bz#1061593 so it adds missing
|
|
|
049c96 |
documentation bits about a feature we already have.
|
|
|
049c96 |
|
|
|
049c96 |
commit 63f60e3ab3655b5d1b62d3a9f641ef7b638d2361
|
|
|
049c96 |
Author: Or Gerlitz <ogerlitz@mellanox.com>
|
|
|
049c96 |
Date: Sun May 11 09:22:19 2014 +0300
|
|
|
049c96 |
|
|
|
049c96 |
Document VF link state control in the ip-link man page
|
|
|
049c96 |
|
|
|
049c96 |
Document the support added by commit 07fa9c1 "Add VF link state
|
|
|
049c96 |
control" in the ip-link man page.
|
|
|
049c96 |
|
|
|
049c96 |
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
|
|
|
049c96 |
---
|
|
|
049c96 |
man/man8/ip-link.8.in | 20 +++++++++++++-------
|
|
|
049c96 |
1 file changed, 13 insertions(+), 7 deletions(-)
|
|
|
049c96 |
|
|
|
049c96 |
diff --git a/man/man8/ip-link.8.in b/man/man8/ip-link.8.in
|
|
|
049c96 |
index 1d2fcb0..d98fe91 100644
|
|
|
049c96 |
--- a/man/man8/ip-link.8.in
|
|
|
049c96 |
+++ b/man/man8/ip-link.8.in
|
|
|
049c96 |
@@ -101,16 +101,16 @@ ip-link \- network device configuration
|
|
|
049c96 |
.RB "[ " vlan
|
|
|
049c96 |
.IR VLANID " [ "
|
|
|
049c96 |
.B qos
|
|
|
049c96 |
-.IR VLAN-QOS " ] ] ["
|
|
|
049c96 |
-.B trust { on | off }
|
|
|
049c96 |
-] |
|
|
|
049c96 |
+.IR VLAN-QOS " ] ]"
|
|
|
049c96 |
.br
|
|
|
049c96 |
.RB "[ " rate
|
|
|
049c96 |
.IR TXRATE " ]"
|
|
|
049c96 |
.br
|
|
|
049c96 |
.RB "[ " spoofchk " { " on " | " off " } ]"
|
|
|
049c96 |
.br
|
|
|
049c96 |
-.RB "[ " state " { " auto " | " enable " | " disable " } ] ]"
|
|
|
049c96 |
+.RB "[ " state " { " auto " | " enable " | " disable " } ]"
|
|
|
049c96 |
+.br
|
|
|
049c96 |
+.RB "[ " trust " { " on " | " off " } ] ]"
|
|
|
049c96 |
.br
|
|
|
049c96 |
.in -9
|
|
|
049c96 |
.RB "[ " master
|
|
|
049c96 |
@@ -322,7 +322,7 @@ the following additional arguments are supported:
|
|
|
049c96 |
|
|
|
049c96 |
.TP
|
|
|
049c96 |
VXLAN Type Support
|
|
|
049c96 |
-For a link of type
|
|
|
049c96 |
+For a link of type
|
|
|
049c96 |
.I VXLAN
|
|
|
049c96 |
the following additional arguments are supported:
|
|
|
049c96 |
|
|
|
049c96 |
@@ -557,7 +557,7 @@ applicable for Generic UDP Encapsulation.
|
|
|
049c96 |
|
|
|
049c96 |
.TP
|
|
|
049c96 |
IP6GRE/IP6GRETAP Type Support
|
|
|
049c96 |
-For a link of type
|
|
|
049c96 |
+For a link of type
|
|
|
049c96 |
.I IP6GRE/IP6GRETAP
|
|
|
049c96 |
the following additional arguments are supported:
|
|
|
049c96 |
|
|
|
049c96 |
@@ -641,7 +641,7 @@ flag is equivalent to the combination
|
|
|
049c96 |
|
|
|
049c96 |
.sp
|
|
|
049c96 |
.BI flowlabel " FLOWLABEL"
|
|
|
049c96 |
-- specifies a fixed flowlabel.
|
|
|
049c96 |
+- specifies a fixed flowlabel.
|
|
|
049c96 |
|
|
|
049c96 |
.sp
|
|
|
049c96 |
.BI tclass " TCLASS"
|
|
|
049c96 |
@@ -1028,6 +1028,12 @@ parameter must be specified.
|
|
|
049c96 |
.BI spoofchk " on|off"
|
|
|
049c96 |
- turn packet spoof checking on or off for the specified VF.
|
|
|
049c96 |
.sp
|
|
|
049c96 |
+.BI state " auto|enable|disable"
|
|
|
049c96 |
+- set the virtual link state as seen by the specified VF. Setting to auto means a
|
|
|
049c96 |
+reflection of the PF link state, enable lets the VF to communicate with other VFs on
|
|
|
049c96 |
+this host even if the PF link state is down, disable causes the HW to drop any packets
|
|
|
049c96 |
+sent by the VF.
|
|
|
049c96 |
+.sp
|
|
|
049c96 |
.BI trust " on|off"
|
|
|
049c96 |
- trust the specified VF user. This enables that VF user can set a specific feature
|
|
|
049c96 |
which may impact security and/or performance. (e.g. VF multicast promiscuous mode)
|
|
|
049c96 |
--
|
|
|
049c96 |
1.8.3.1
|
|
|
049c96 |
|