commit 73af614aedd221df8495fc8c9993c50e87f899f2
author Jiri Pirko <jiri@resnulli.us> Sat Dec 07 19:26:55 2013 +0100
committer David S. Miller <davem@davemloft.net> Mon Dec 09 20:56:12 2013 -0500
tree 66eaab080b5add40cf2fc06f194d1c808bb2ec60
parent cb5b09c17fe60056bc8f127ffc987d361c40ed4b

neigh: use tbl->family to distinguish ipv4 from ipv6

Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: David S. Miller <davem@davemloft.net>

net/ipv4/arp.c

diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c
index 3a37c7d..f041858 100644
--- a/net/ipv4/arp.c
+++ b/net/ipv4/arp.c
@@ -1287,7 +1287,7 @@
 	dev_add_pack(&arp_packet_type);
 	arp_proc_init();
 #ifdef CONFIG_SYSCTL
-	neigh_sysctl_register(NULL, &arp_tbl.parms, "ipv4", NULL);
+	neigh_sysctl_register(NULL, &arp_tbl.parms, NULL);
 #endif
 	register_netdevice_notifier(&arp_netdev_notifier);
 }