net: Remove unused neighbour layer ops.

It's simpler to just keep these things out until there is a real user
of them, so we can see what the needs actually are, rather than keep
these things around as useless overhead.

Signed-off-by: David S. Miller <davem@davemloft.net>

3 files changed, 0 insertions, 12 deletions

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 603730804da5..6b9d4edb7c26 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -974,7 +974,6 @@ struct net_device_ops {
         int                     (*ndo_set_features)(struct net_device *dev,
                                                     netdev_features_t features);
         int                     (*ndo_neigh_construct)(struct neighbour *n);
-        void                    (*ndo_neigh_destroy)(struct neighbour *n);
 };
 
 /*
diff --git a/include/net/neighbour.h b/include/net/neighbour.h
index e31f0a86f9b7..6814c4d61c1c 100644
--- a/include/net/neighbour.h
+++ b/include/net/neighbour.h
@@ -43,7 +43,6 @@ struct neigh_parms {
 #endif
         struct net_device *dev;
         struct neigh_parms *next;
-        int     (*neigh_setup)(struct neighbour *);
         void    (*neigh_cleanup)(struct neighbour *);
         struct neigh_table *tbl;
 
diff --git a/net/core/neighbour.c b/net/core/neighbour.c
index 4af151e1bf5d..d57a40a2598c 100644
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
@@ -497,13 +497,6 @@ struct neighbour *neigh_create(struct neigh_table *tbl, const void *pkey,
                 }
         }
 
-        /* Device specific setup. */
-        if (n->parms->neigh_setup &&
-            (error = n->parms->neigh_setup(n)) < 0) {
-                rc = ERR_PTR(error);
-                goto out_neigh_release;
-        }
-
         n->confirmed = jiffies - (n->parms->base_reachable_time << 1);
 
         write_lock_bh(&tbl->lock);
@@ -717,9 +710,6 @@ void neigh_destroy(struct neighbour *neigh)
         skb_queue_purge(&neigh->arp_queue);
         neigh->arp_queue_len_bytes = 0;
 
-        if (dev->netdev_ops->ndo_neigh_destroy)
-                dev->netdev_ops->ndo_neigh_destroy(neigh);
-
         dev_put(dev);
         neigh_parms_put(neigh->parms);