aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOctavian Purdila <opurdila@ixiacom.com>2010-01-18 07:58:44 -0500
committerDavid S. Miller <davem@davemloft.net>2010-01-19 05:12:34 -0500
commit6d955180b2f9ccff444df06265160868cabb289a (patch)
tree2ceaf1e1e49664712cc13bb07833538c8723f645
parentfa44a73cc766c7f3bac71a66d564e0049b800325 (diff)
ipv4: allow warming up the ARP cache with request type gratuitous ARP
If the per device ARP_ACCEPT option is enable, currently we only allow creating new ARP cache entries for response type gratuitous ARP. Allowing gratuitous ARP to create new ARP entries (not only to update existing ones) is useful when we want to avoid unnecessary delays for the first packet of a stream. This patch allows request type gratuitous ARP to create new ARP cache entries as well. This is useful when we want to populate the ARP cache entries for a large number of hosts on the same LAN. Signed-off-by: Octavian Purdila <opurdila@ixiacom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--Documentation/networking/ip-sysctl.txt15
-rw-r--r--net/ipv4/arp.c3
2 files changed, 14 insertions, 4 deletions
diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt
index c532884f4fec..2dc7a1d97686 100644
--- a/Documentation/networking/ip-sysctl.txt
+++ b/Documentation/networking/ip-sysctl.txt
@@ -852,9 +852,18 @@ arp_notify - BOOLEAN
852 or hardware address changes. 852 or hardware address changes.
853 853
854arp_accept - BOOLEAN 854arp_accept - BOOLEAN
855 Define behavior when gratuitous arp replies are received: 855 Define behavior for gratuitous ARP frames who's IP is not
856 0 - drop gratuitous arp frames 856 already present in the ARP table:
857 1 - accept gratuitous arp frames 857 0 - don't create new entries in the ARP table
858 1 - create new entries in the ARP table
859
860 Both replies and requests type gratuitous arp will trigger the
861 ARP table to be updated, if this setting is on.
862
863 If the ARP table already contains the IP address of the
864 gratuitous arp frame, the arp table will be updated regardless
865 if this setting is on or off.
866
858 867
859app_solicit - INTEGER 868app_solicit - INTEGER
860 The maximum number of probes to send to the user space ARP daemon 869 The maximum number of probes to send to the user space ARP daemon
diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c
index 078709233bc4..1940b4df7699 100644
--- a/net/ipv4/arp.c
+++ b/net/ipv4/arp.c
@@ -907,7 +907,8 @@ static int arp_process(struct sk_buff *skb)
907 devices (strip is candidate) 907 devices (strip is candidate)
908 */ 908 */
909 if (n == NULL && 909 if (n == NULL &&
910 arp->ar_op == htons(ARPOP_REPLY) && 910 (arp->ar_op == htons(ARPOP_REPLY) ||
911 (arp->ar_op == htons(ARPOP_REQUEST) && tip == sip)) &&
911 inet_addr_type(net, sip) == RTN_UNICAST) 912 inet_addr_type(net, sip) == RTN_UNICAST)
912 n = __neigh_lookup(&arp_tbl, &sip, dev, 1); 913 n = __neigh_lookup(&arp_tbl, &sip, dev, 1);
913 } 914 }