diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /net/ipv4/arp.c | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'net/ipv4/arp.c')
| -rw-r--r-- | net/ipv4/arp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c index 4e80f336c0cf..c95cd93acf29 100644 --- a/net/ipv4/arp.c +++ b/net/ipv4/arp.c | |||
| @@ -1240,7 +1240,7 @@ void __init arp_init(void) | |||
| 1240 | arp_proc_init(); | 1240 | arp_proc_init(); |
| 1241 | #ifdef CONFIG_SYSCTL | 1241 | #ifdef CONFIG_SYSCTL |
| 1242 | neigh_sysctl_register(NULL, &arp_tbl.parms, NET_IPV4, | 1242 | neigh_sysctl_register(NULL, &arp_tbl.parms, NET_IPV4, |
| 1243 | NET_IPV4_NEIGH, "ipv4", NULL, NULL); | 1243 | NET_IPV4_NEIGH, "ipv4", NULL); |
| 1244 | #endif | 1244 | #endif |
| 1245 | register_netdevice_notifier(&arp_netdev_notifier); | 1245 | register_netdevice_notifier(&arp_netdev_notifier); |
| 1246 | } | 1246 | } |