From 6c2c36a28c49f97e2a2f997d8a8b412bcaf9f514 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Wed, 4 Mar 2009 23:01:02 -0800
Subject: [PATCH] --- yaml --- r: 132147 b: refs/heads/master c:
 54acd0efab072cb70e87206329d561b297f93bbb h: refs/heads/master i:   132145:
 f1a9bd2d2db3634e31690a5eca23f24af8bbc031   132143:
 79a238547552b91ceb5a25062d14c24f73e2f4b0 v: v3

---
 [refs]               | 2 +-
 trunk/net/core/dev.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

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;