---

yaml --- r: 22289 b: refs/heads/master c: c1b1bce h: refs/heads/master i: 22287: 5ebd1d9 v: v3
git-mirror · Mar 21, 2006 · 6986b7c · 6986b7c
1 parent 0be1014
commit 6986b7c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git 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
@@ -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