From 6986b7c5aac5bedf76df0a49006f21fd5285ab7a Mon Sep 17 00:00:00 2001
From: Neil Horman <nhorman@tuxdriver.com>
Date: Mon, 20 Mar 2006 22:40:03 -0800
Subject: [PATCH] --- yaml --- r: 22289 b: refs/heads/master c:
 c1b1bce8527c2c3cac7e2520ca54b7c04281033e h: refs/heads/master i:   22287:
 5ebd1d90e28e78293bb2f1828f8c5152b3152616 v: v3

---
 [refs]                                       | 2 +-
 trunk/Documentation/networking/ip-sysctl.txt | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b03a6ac0af61..67266a5e13a4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: abd596a4b68b6526c2676233e10602dd9660e9d7
+refs/heads/master: c1b1bce8527c2c3cac7e2520ca54b7c04281033e
diff --git a/trunk/Documentation/networking/ip-sysctl.txt b/trunk/Documentation/networking/ip-sysctl.txt
index 35aed1c6dd98..651298ba019a 100644
--- a/trunk/Documentation/networking/ip-sysctl.txt
+++ b/trunk/Documentation/networking/ip-sysctl.txt
@@ -619,6 +619,11 @@ arp_ignore - INTEGER
 	The max value from conf/{all,interface}/arp_ignore is used
 	when ARP request is received on the {interface}
 
+arp_accept - BOOLEAN
+	Define behavior when gratuitous arp replies are received:
+	0 - drop gratuitous arp frames
+	1 - accept gratuitous arp frames
+
 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