|
 |
4aca6e |
From 64afb125ce17483937f3988a7b76ef0e100c2fcc Mon Sep 17 00:00:00 2001
|
|
|
4aca6e |
From: Phil Sutter <psutter@redhat.com>
|
|
|
4aca6e |
Date: Tue, 28 Feb 2017 12:21:21 +0100
|
|
|
4aca6e |
Subject: [PATCH] Revert "man: ip-link: Remove bits about proxy_arp and
|
|
|
4aca6e |
proxy_arp_wifi"
|
|
|
4aca6e |
|
|
|
4aca6e |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1374360
|
|
|
4aca6e |
Upstream Status: RHEL only.
|
|
|
4aca6e |
|
|
|
4aca6e |
This reverts commit 75b314be0b22357ef564e451bc8d8dd1b9de74aa.
|
|
|
4aca6e |
---
|
|
|
4aca6e |
man/man8/ip-link.8.in | 15 ++++++++++++++-
|
|
|
4aca6e |
1 file changed, 14 insertions(+), 1 deletion(-)
|
|
|
4aca6e |
|
|
|
4aca6e |
diff --git a/man/man8/ip-link.8.in b/man/man8/ip-link.8.in
|
|
|
4aca6e |
index cfd996a..73cd86d 100644
|
|
|
4aca6e |
--- a/man/man8/ip-link.8.in
|
|
|
4aca6e |
+++ b/man/man8/ip-link.8.in
|
|
|
4aca6e |
@@ -1130,6 +1130,10 @@ the following additional arguments are supported:
|
|
|
4aca6e |
] [
|
|
|
4aca6e |
.BR flood " { " on " | " off " }"
|
|
|
4aca6e |
] [
|
|
|
4aca6e |
+.BR proxy_arp " { " on " | " off " }"
|
|
|
4aca6e |
+] [
|
|
|
4aca6e |
+.BR proxy_arp_wifi " { " on " | " off " }"
|
|
|
4aca6e |
+] [
|
|
|
4aca6e |
.BI mcast_router " MULTICAST_ROUTER"
|
|
|
4aca6e |
] [
|
|
|
4aca6e |
.BR mcast_fast_leave " { " on " | " off "} ]"
|
|
|
4aca6e |
@@ -1170,7 +1174,16 @@ port to be reflected back.
|
|
|
4aca6e |
|
|
|
4aca6e |
.BR flood " { " on " | " off " }"
|
|
|
4aca6e |
- open the flood gates on this port, i.e. forward all unicast frames to this
|
|
|
4aca6e |
-port also.
|
|
|
4aca6e |
+port also. Requires
|
|
|
4aca6e |
+.BR proxy_arp " and " proxy_arp_wifi
|
|
|
4aca6e |
+to be turned off.
|
|
|
4aca6e |
+
|
|
|
4aca6e |
+.BR proxy_arp " { " on " | " off " }"
|
|
|
4aca6e |
+- enable proxy ARP on this port.
|
|
|
4aca6e |
+
|
|
|
4aca6e |
+.BR proxy_arp_wifi " { " on " | " off " }"
|
|
|
4aca6e |
+- enable proxy ARP on this port which meets extended requirements by IEEE
|
|
|
4aca6e |
+802.11 and Hotspot 2.0 specifications.
|
|
|
4aca6e |
|
|
|
4aca6e |
.BI mcast_router " MULTICAST_ROUTER"
|
|
|
4aca6e |
- configure this port for having multicast routers attached. A port with a
|
|
|
4aca6e |
--
|
|
|
4aca6e |
1.8.3.1
|
|
|
4aca6e |
|