|
|
049c96 |
From 594bd9247ca5f02d46a8a94bc25f9edf2e82f6d3 Mon Sep 17 00:00:00 2001
|
|
|
049c96 |
From: Davide Caratti <dcaratti@redhat.com>
|
|
|
049c96 |
Date: Wed, 3 Aug 2016 17:22:10 +0200
|
|
|
049c96 |
Subject: [PATCH] ip {link,address}: add 'macsec' item to TYPE list
|
|
|
049c96 |
|
|
|
049c96 |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1354702
|
|
|
049c96 |
Upstream Status: iproute2.git commit fd4df5b21180
|
|
|
049c96 |
Conflicts: context conflicts in TYPE lists due to missing HSR, lowpan
|
|
|
049c96 |
and VRF support, and because of upstream commit 577cfe0b677e not yet
|
|
|
049c96 |
merged.
|
|
|
049c96 |
|
|
|
049c96 |
commit fd4df5b21180f9b32259d859e6fcbbb08d0e03c4
|
|
|
049c96 |
Author: Davide Caratti <dcaratti@redhat.com>
|
|
|
049c96 |
Date: Tue Jul 26 11:03:19 2016 +0200
|
|
|
049c96 |
|
|
|
049c96 |
ip {link,address}: add 'macsec' item to TYPE list
|
|
|
049c96 |
|
|
|
049c96 |
fix output of "ip address help" and "ip link help". Update TYPE list in man
|
|
|
049c96 |
pages ip-address.8 and ip-link.8 as well.
|
|
|
049c96 |
|
|
|
049c96 |
Signed-off-by: Davide Caratti <dcaratti@redhat.com>
|
|
|
049c96 |
|
|
|
049c96 |
Signed-off-by: Davide Caratti <dcaratti@redhat.com>
|
|
|
049c96 |
---
|
|
|
049c96 |
ip/ipaddress.c | 2 +-
|
|
|
049c96 |
ip/iplink.c | 2 +-
|
|
|
049c96 |
man/man8/ip-address.8.in | 3 ++-
|
|
|
049c96 |
man/man8/ip-link.8.in | 3 ++-
|
|
|
049c96 |
4 files changed, 6 insertions(+), 4 deletions(-)
|
|
|
049c96 |
|
|
|
049c96 |
diff --git a/ip/ipaddress.c b/ip/ipaddress.c
|
|
|
049c96 |
index 97a8f2f..62a25bc 100644
|
|
|
049c96 |
--- a/ip/ipaddress.c
|
|
|
049c96 |
+++ b/ip/ipaddress.c
|
|
|
049c96 |
@@ -94,7 +94,7 @@ static void usage(void)
|
|
|
049c96 |
fprintf(stderr, "TYPE := { vlan | veth | vcan | dummy | ifb | macvlan | macvtap |\n");
|
|
|
049c96 |
fprintf(stderr, " bridge | bond | ipoib | ip6tnl | ipip | sit | vxlan |\n");
|
|
|
049c96 |
fprintf(stderr, " gre | gretap | ip6gre | ip6gretap | vti | nlmon |\n");
|
|
|
049c96 |
- fprintf(stderr, " bond_slave | ipvlan | geneve | bridge_slave | vrf }\n");
|
|
|
049c96 |
+ fprintf(stderr, " bond_slave | ipvlan | geneve | bridge_slave | vrf | macsec }\n");
|
|
|
049c96 |
|
|
|
049c96 |
exit(-1);
|
|
|
049c96 |
}
|
|
|
049c96 |
diff --git a/ip/iplink.c b/ip/iplink.c
|
|
|
049c96 |
index 3dac893..e9c2874 100644
|
|
|
049c96 |
--- a/ip/iplink.c
|
|
|
049c96 |
+++ b/ip/iplink.c
|
|
|
049c96 |
@@ -95,7 +95,7 @@ void iplink_usage(void)
|
|
|
049c96 |
fprintf(stderr, "TYPE := { vlan | veth | vcan | dummy | ifb | macvlan | macvtap |\n");
|
|
|
049c96 |
fprintf(stderr, " bridge | bond | ipoib | ip6tnl | ipip | sit | vxlan |\n");
|
|
|
049c96 |
fprintf(stderr, " gre | gretap | ip6gre | ip6gretap | vti | nlmon |\n");
|
|
|
049c96 |
- fprintf(stderr, " bond_slave | geneve }\n");
|
|
|
049c96 |
+ fprintf(stderr, " bond_slave | geneve | macsec }\n");
|
|
|
049c96 |
}
|
|
|
049c96 |
exit(-1);
|
|
|
049c96 |
}
|
|
|
049c96 |
diff --git a/man/man8/ip-address.8.in b/man/man8/ip-address.8.in
|
|
|
049c96 |
index 08a79ec..be514ca 100644
|
|
|
049c96 |
--- a/man/man8/ip-address.8.in
|
|
|
049c96 |
+++ b/man/man8/ip-address.8.in
|
|
|
049c96 |
@@ -121,7 +121,8 @@ ip-address \- protocol address management
|
|
|
049c96 |
.BR vti " |"
|
|
|
049c96 |
.BR nlmon " |"
|
|
|
049c96 |
.BR lowpan " |"
|
|
|
049c96 |
-.BR geneve " ]"
|
|
|
049c96 |
+.BR geneve " |"
|
|
|
049c96 |
+.BR macsec " ]"
|
|
|
049c96 |
|
|
|
049c96 |
.SH "DESCRIPTION"
|
|
|
049c96 |
The
|
|
|
049c96 |
diff --git a/man/man8/ip-link.8.in b/man/man8/ip-link.8.in
|
|
|
049c96 |
index 9acb6b2..2633521 100644
|
|
|
049c96 |
--- a/man/man8/ip-link.8.in
|
|
|
049c96 |
+++ b/man/man8/ip-link.8.in
|
|
|
049c96 |
@@ -167,7 +167,8 @@ ip-link \- network device configuration
|
|
|
049c96 |
.BR ip6gretap " |"
|
|
|
049c96 |
.BR vti " |"
|
|
|
049c96 |
.BR nlmon " |"
|
|
|
049c96 |
-.BR geneve " ]"
|
|
|
049c96 |
+.BR geneve " |"
|
|
|
049c96 |
+.BR macsec " ]"
|
|
|
049c96 |
|
|
|
049c96 |
.ti -8
|
|
|
049c96 |
.IR ETYPE " := [ " TYPE " |"
|
|
|
049c96 |
--
|
|
|
049c96 |
1.8.3.1
|
|
|
049c96 |
|