Automatic merge with /usr/src/ntfs-2.6.git.

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

diff --git a/include/net/neighbour.h b/include/net/neighbour.h
index 17191ac9be7062312e4ac948856c5237f6494e3e..89809891e5ab2e8e9430ccac31255d22ee364231 100644 (file)
--- a/include/net/neighbour.h
+++ b/include/net/neighbour.h
@@ -69,8 +69,6 @@ struct neigh_parms
        struct neigh_parms *next;
        int     (*neigh_setup)(struct neighbour *);
        struct neigh_table *tbl;
-       int     entries;
-       void    *priv;
 
        void    *sysctl_table;
 
@@ -193,7 +191,6 @@ struct neigh_table
        atomic_t                entries;
        rwlock_t                lock;
        unsigned long           last_rand;
-       struct neigh_parms      *parms_list;
        kmem_cache_t            *kmem_cachep;
        struct neigh_statistics *stats;
        struct neighbour        **hash_buckets;