diff options
Diffstat (limited to 'net/ipv4')
-rw-r--r-- | net/ipv4/arp.c | 3 | ||||
-rw-r--r-- | net/ipv4/devinet.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c index 1940b4df7699..c4dd13542802 100644 --- a/net/ipv4/arp.c +++ b/net/ipv4/arp.c | |||
@@ -1284,8 +1284,7 @@ void __init arp_init(void) | |||
1284 | dev_add_pack(&arp_packet_type); | 1284 | dev_add_pack(&arp_packet_type); |
1285 | arp_proc_init(); | 1285 | arp_proc_init(); |
1286 | #ifdef CONFIG_SYSCTL | 1286 | #ifdef CONFIG_SYSCTL |
1287 | neigh_sysctl_register(NULL, &arp_tbl.parms, NET_IPV4, | 1287 | neigh_sysctl_register(NULL, &arp_tbl.parms, "ipv4", NULL); |
1288 | NET_IPV4_NEIGH, "ipv4", NULL); | ||
1289 | #endif | 1288 | #endif |
1290 | register_netdevice_notifier(&arp_netdev_notifier); | 1289 | register_netdevice_notifier(&arp_netdev_notifier); |
1291 | } | 1290 | } |
diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c index b1eddee9bf94..014982b61564 100644 --- a/net/ipv4/devinet.c +++ b/net/ipv4/devinet.c | |||
@@ -1487,8 +1487,7 @@ static void __devinet_sysctl_unregister(struct ipv4_devconf *cnf) | |||
1487 | 1487 | ||
1488 | static void devinet_sysctl_register(struct in_device *idev) | 1488 | static void devinet_sysctl_register(struct in_device *idev) |
1489 | { | 1489 | { |
1490 | neigh_sysctl_register(idev->dev, idev->arp_parms, NET_IPV4, | 1490 | neigh_sysctl_register(idev->dev, idev->arp_parms, "ipv4", NULL); |
1491 | NET_IPV4_NEIGH, "ipv4", NULL); | ||
1492 | __devinet_sysctl_register(dev_net(idev->dev), idev->dev->name, | 1491 | __devinet_sysctl_register(dev_net(idev->dev), idev->dev->name, |
1493 | &idev->cnf); | 1492 | &idev->cnf); |
1494 | } | 1493 | } |