From c12739a4f4632a52d1f75645c3067543bc2da560 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Wed, 26 May 2010 00:09:41 +0000 Subject: [PATCH] --- yaml --- r: 202587 b: refs/heads/master c: 3f8dc2362fd43a0adee2f6f05bf1ac4d619675b6 h: refs/heads/master i: 202585: 992f996fd9a5396406fd5c0f628e122e2bea38da 202583: a51c6a6b42cd99eb2087f38ef123ba8a5691f0c8 v: v3 --- [refs] | 2 +- trunk/Documentation/networking/ip-sysctl.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 36ca21f861fb..9fb2341a60ce 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9bfca3c6e5965a01b7c6d8e2f2ea30799c9d43bc +refs/heads/master: 3f8dc2362fd43a0adee2f6f05bf1ac4d619675b6 diff --git a/trunk/Documentation/networking/ip-sysctl.txt b/trunk/Documentation/networking/ip-sysctl.txt index d0536b5a4e01..f350c69b2bb4 100644 --- a/trunk/Documentation/networking/ip-sysctl.txt +++ b/trunk/Documentation/networking/ip-sysctl.txt @@ -903,7 +903,7 @@ arp_ignore - INTEGER arp_notify - BOOLEAN Define mode for notification of address and device changes. 0 - (default): do nothing - 1 - Generate gratuitous arp replies when device is brought up + 1 - Generate gratuitous arp requests when device is brought up or hardware address changes. arp_accept - BOOLEAN