[PATCH net-next 2/2] net: neighbour: Document {mcast,ucast}_solicit, mcast_resolicit.

[PATCH net-next 2/2] net: neighbour: Document {mcast,ucast}_solicit, mcast_resolicit.

[YOSHIFUJI Hideaki]

Signed-off-by: YOSHIFUJI Hideaki <hideaki.yoshifuji@miraclelinux.com>
---
 Documentation/networking/ip-sysctl.txt | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt
index 4412f69..6c07c2b 100644
--- a/Documentation/networking/ip-sysctl.txt
+++ b/Documentation/networking/ip-sysctl.txt
@@ -1126,11 +1126,23 @@ arp_accept - BOOLEAN
 	gratuitous arp frame, the arp table will be updated regardless
 	if this setting is on or off.
 
+mcast_solicit - INTEGER
+	The maximum number of multicast probes in INCOMPLETE state,
+	when the associated hardware address is unknown.  Defaults
+	to 3.
+
+ucast_solicit - INTEGER
+	The maximum number of unicast probes in PROBE state, when
+	the hardware address is being reconfirmed.  Defaults to 3.
 
 app_solicit - INTEGER
 	The maximum number of probes to send to the user space ARP daemon
 	via netlink before dropping back to multicast probes (see
-	mcast_solicit).  Defaults to 0.
+	mcast_resolicit).  Defaults to 0.
+
+mcast_resolicit - INTEGER
+	The maximum number of multicast probes after unicast and
+	app probes in PROBE state.  Defaults to 0.
 
 disable_policy - BOOLEAN
 	Disable IPSEC policy (SPD) for this interface
-- 
1.9.1

Re: [PATCH net-next 2/2] net: neighbour: Document {mcast,ucast}_solicit, mcast_resolicit.

[David Miller]

From: YOSHIFUJI Hideaki <hideaki.yoshifuji@miraclelinux.com>
Date: Thu, 19 Mar 2015 22:42:04 +0900 (JST)

> Signed-off-by: YOSHIFUJI Hideaki <hideaki.yoshifuji@miraclelinux.com>

Also applied to net-next, thanks.

Re: [PATCH net-next 2/2] net: neighbour: Document {mcast,ucast}_solicit, mcast_resolicit.

[yzhu1]

On 03/19/2015 09:42 PM, YOSHIFUJI Hideaki wrote:
> Signed-off-by: YOSHIFUJI Hideaki <hideaki.yoshifuji@miraclelinux.com>
> ---
>   Documentation/networking/ip-sysctl.txt | 14 +++++++++++++-
>   1 file changed, 13 insertions(+), 1 deletion(-)
>
> diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt
> index 4412f69..6c07c2b 100644
> --- a/Documentation/networking/ip-sysctl.txt
> +++ b/Documentation/networking/ip-sysctl.txt
> @@ -1126,11 +1126,23 @@ arp_accept - BOOLEAN
>   	gratuitous arp frame, the arp table will be updated regardless
>   	if this setting is on or off.
>   
> +mcast_solicit - INTEGER
> +	The maximum number of multicast probes in INCOMPLETE state,
> +	when the associated hardware address is unknown.  Defaults
> +	to 3.
> +
> +ucast_solicit - INTEGER
> +	The maximum number of unicast probes in PROBE state, when
> +	the hardware address is being reconfirmed.  Defaults to 3.
>   
>   app_solicit - INTEGER
>   	The maximum number of probes to send to the user space ARP daemon
>   	via netlink before dropping back to multicast probes (see
> -	mcast_solicit).  Defaults to 0.
> +	mcast_resolicit).  Defaults to 0.
> +
> +mcast_resolicit - INTEGER
> +	The maximum number of multicast probes after unicast and
> +	app probes in PROBE state.  Defaults to 0.
Hi, YOSHIFUJI Hideaki

To be compatible with ipv6, Defaults should be 3.

Best Regards!
Zhu Yanjun

>   
>   disable_policy - BOOLEAN
>   	Disable IPSEC policy (SPD) for this interface