X-Git-Url: http://git.onelab.eu/?p=linux-2.6.git;a=blobdiff_plain;f=include%2Fnet%2Fneighbour.h;fp=include%2Fnet%2Fneighbour.h;h=6fa9ae1907417f2a113c6509ee4031ce169c43e3;hp=4901ee446879e59795f0df8d57a1c18ce9c7ce92;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c

diff --git a/include/net/neighbour.h b/include/net/neighbour.h
index 4901ee446..6fa9ae190 100644
--- a/include/net/neighbour.h
+++ b/include/net/neighbour.h
@@ -68,7 +68,6 @@ struct neigh_parms
 	struct net_device *dev;
 	struct neigh_parms *next;
 	int	(*neigh_setup)(struct neighbour *);
-	void	(*neigh_destructor)(struct neighbour *);
 	struct neigh_table *tbl;
 
 	void	*sysctl_table;
@@ -146,6 +145,7 @@ struct neighbour
 struct neigh_ops
 {
 	int			family;
+	void			(*destructor)(struct neighbour *);
 	void			(*solicit)(struct neighbour *, struct sk_buff*);
 	void			(*error_report)(struct neighbour *, struct sk_buff*);
 	int			(*output)(struct sk_buff*);
@@ -211,7 +211,6 @@ struct neigh_table
 #define NEIGH_UPDATE_F_ADMIN			0x80000000
 
 extern void			neigh_table_init(struct neigh_table *tbl);
-extern void			neigh_table_init_no_netlink(struct neigh_table *tbl);
 extern int			neigh_table_clear(struct neigh_table *tbl);
 extern struct neighbour *	neigh_lookup(struct neigh_table *tbl,
 					     const void *pkey,