diff --git a/[refs] b/[refs]
index ede5631fad60..7de46c7c7e49 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 87786945fe4b0e60e8f1db62d5ee8a3cec539a67
+refs/heads/master: 54acd0efab072cb70e87206329d561b297f93bbb
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
index 9e4afe650e7a..2dd484ed3dbb 100644
--- a/trunk/net/core/dev.c
+++ b/trunk/net/core/dev.c
@@ -4339,6 +4339,7 @@ int register_netdevice(struct net_device *dev)
 		dev->do_ioctl = ops->ndo_do_ioctl;
 		dev->set_config = ops->ndo_set_config;
 		dev->change_mtu = ops->ndo_change_mtu;
+		dev->neigh_setup = ops->ndo_neigh_setup;
 		dev->tx_timeout = ops->ndo_tx_timeout;
 		dev->get_stats = ops->ndo_get_stats;
 		dev->vlan_rx_register = ops->ndo_vlan_rx_register;