|
 |
049c96 |
From 6e7aaccce27c114aad2ef88aa2bf11844ad0282c Mon Sep 17 00:00:00 2001
|
|
|
049c96 |
From: Davide Caratti <dcaratti@redhat.com>
|
|
|
049c96 |
Date: Wed, 3 Aug 2016 17:22:09 +0200
|
|
|
049c96 |
Subject: [PATCH] man: macsec: fix macsec related typos
|
|
|
049c96 |
|
|
|
049c96 |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1354702
|
|
|
049c96 |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1354319
|
|
|
049c96 |
Upstream Status: iproute2.git commit c0ab80a4907a
|
|
|
049c96 |
|
|
|
049c96 |
commit c0ab80a4907a102e48b3a8f4150e77671e5af81d
|
|
|
049c96 |
Author: Davide Caratti <dcaratti@redhat.com>
|
|
|
049c96 |
Date: Tue Jul 26 11:03:18 2016 +0200
|
|
|
049c96 |
|
|
|
049c96 |
man: macsec: fix macsec related typos
|
|
|
049c96 |
|
|
|
049c96 |
- ip-macsec.8: fix wrong 'device' keyword in 'ip link add device eth0';
|
|
|
049c96 |
add missing description of 'validate' keyword; remove spurious bracket
|
|
|
049c96 |
near 'encrypt' keyword; add missing reference to configuration of 'port'
|
|
|
049c96 |
and 'sci'
|
|
|
049c96 |
- ip-link.8 fix wrong 'es' and 'encoding' keywords in MACsec section
|
|
|
049c96 |
|
|
|
049c96 |
Signed-off-by: Davide Caratti <dcaratti@redhat.com>
|
|
|
049c96 |
|
|
|
049c96 |
Signed-off-by: Davide Caratti <dcaratti@redhat.com>
|
|
|
049c96 |
---
|
|
|
049c96 |
man/man8/ip-link.8.in | 8 ++++----
|
|
|
049c96 |
man/man8/ip-macsec.8 | 11 ++++++++---
|
|
|
049c96 |
2 files changed, 12 insertions(+), 7 deletions(-)
|
|
|
049c96 |
|
|
|
049c96 |
diff --git a/man/man8/ip-link.8.in b/man/man8/ip-link.8.in
|
|
|
049c96 |
index b9d9933..9acb6b2 100644
|
|
|
049c96 |
--- a/man/man8/ip-link.8.in
|
|
|
049c96 |
+++ b/man/man8/ip-link.8.in
|
|
|
049c96 |
@@ -755,14 +755,14 @@ the following additional arguments are supported:
|
|
|
049c96 |
.BR encrypt " {"
|
|
|
049c96 |
.BR on " | " off " } ] [ "
|
|
|
049c96 |
.BR send_sci " { " on " | " off " } ] ["
|
|
|
049c96 |
-.BR es " { " on " | " off " } ] ["
|
|
|
049c96 |
+.BR end_station " { " on " | " off " } ] ["
|
|
|
049c96 |
.BR scb " { " on " | " off " } ] ["
|
|
|
049c96 |
.BR protect " { " on " | " off " } ] ["
|
|
|
049c96 |
.BR replay " { " on " | " off " }"
|
|
|
049c96 |
.BR window " { "
|
|
|
049c96 |
.IR 0..2^32-1 " } ] ["
|
|
|
049c96 |
.BR validate " { " strict " | " check " | " disabled " } ] ["
|
|
|
049c96 |
-.BR encoding " { "
|
|
|
049c96 |
+.BR encodingsa " { "
|
|
|
049c96 |
.IR 0..3 " } ]"
|
|
|
049c96 |
|
|
|
049c96 |
.in +8
|
|
|
049c96 |
@@ -787,7 +787,7 @@ the following additional arguments are supported:
|
|
|
049c96 |
- specifies whether the SCI is included in every packet, or only when it is necessary.
|
|
|
049c96 |
|
|
|
049c96 |
.sp
|
|
|
049c96 |
-.BR "es on " or " es off"
|
|
|
049c96 |
+.BR "end_station on " or " end_station off"
|
|
|
049c96 |
- sets the End Station bit.
|
|
|
049c96 |
|
|
|
049c96 |
.sp
|
|
|
049c96 |
@@ -815,7 +815,7 @@ the following additional arguments are supported:
|
|
|
049c96 |
- sets the validation mode on the device.
|
|
|
049c96 |
|
|
|
049c96 |
.sp
|
|
|
049c96 |
-.BI encoding " AN "
|
|
|
049c96 |
+.BI encodingsa " AN "
|
|
|
049c96 |
- sets the active secure association for transmission.
|
|
|
049c96 |
|
|
|
049c96 |
.in -8
|
|
|
049c96 |
diff --git a/man/man8/ip-macsec.8 b/man/man8/ip-macsec.8
|
|
|
049c96 |
index e8455d7..f928c43 100644
|
|
|
049c96 |
--- a/man/man8/ip-macsec.8
|
|
|
049c96 |
+++ b/man/man8/ip-macsec.8
|
|
|
049c96 |
@@ -3,10 +3,14 @@
|
|
|
049c96 |
ip-macsec \- MACsec device configuration
|
|
|
049c96 |
.SH "SYNOPSIS"
|
|
|
049c96 |
.BI "ip link add link " DEVICE " name " NAME " type macsec "
|
|
|
049c96 |
-[ [
|
|
|
049c96 |
+[
|
|
|
049c96 |
+.BI port " PORT"
|
|
|
049c96 |
+|
|
|
|
049c96 |
+.BI sci " SCI"
|
|
|
049c96 |
+] [ [
|
|
|
049c96 |
.BR cipher " { " default " | " gcm-aes-128 " } ] "
|
|
|
049c96 |
.BI icvlen " ICVLEN"
|
|
|
049c96 |
-] [ [
|
|
|
049c96 |
+] [
|
|
|
049c96 |
.BR encrypt " { " on " | " off " } ] ["
|
|
|
049c96 |
.BR send_sci " { " on " | " off " } ] ["
|
|
|
049c96 |
.BR end_station " { " on " | " off " } ] ["
|
|
|
049c96 |
@@ -15,6 +19,7 @@ ip-macsec \- MACsec device configuration
|
|
|
049c96 |
.BR replay " { " on " | " off " } ] ["
|
|
|
049c96 |
.BI window " WINDOW"
|
|
|
049c96 |
] [
|
|
|
049c96 |
+.BR validate " { " strict " | " check " | " disabled " } ] ["
|
|
|
049c96 |
.BI encodingsa " SA"
|
|
|
049c96 |
]
|
|
|
049c96 |
|
|
|
049c96 |
@@ -74,7 +79,7 @@ type.
|
|
|
049c96 |
.PP
|
|
|
049c96 |
.SS Create a MACsec device on link eth0
|
|
|
049c96 |
.nf
|
|
|
049c96 |
-# ip link add device eth0 macsec0 type macsec port 11 encrypt on
|
|
|
049c96 |
+# ip link add link eth0 macsec0 type macsec port 11 encrypt on
|
|
|
049c96 |
.PP
|
|
|
049c96 |
.SS Configure a secure association on that device
|
|
|
049c96 |
.nf
|
|
|
049c96 |
--
|
|
|
049c96 |
1.8.3.1
|
|
|
049c96 |
|