linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / include / net / neighbour.h

diff --git a/include/net/neighbour.h b/include/net/neighbour.h
index 4901ee4..6fa9ae1 100644 (file)
--- 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,