Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

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

diff --git a/include/net/neighbour.h b/include/net/neighbour.h
index 665990c7dec8c127e2eb8321b80512760f0e824e..f886b58956a69b54656fc52c90a41429e7bf699a 100644 (file)
--- a/include/net/neighbour.h
+++ b/include/net/neighbour.h
@@ -154,6 +154,7 @@ struct neighbour {
        struct hh_cache         hh;
        int                     (*output)(struct neighbour *, struct sk_buff *);
        const struct neigh_ops  *ops;
+       struct list_head        gc_list;
        struct rcu_head         rcu;
        struct net_device       *dev;
        u8                      primary_key[0];
@@ -214,6 +215,8 @@ struct neigh_table {
        struct timer_list       proxy_timer;
        struct sk_buff_head     proxy_queue;
        atomic_t                entries;
+       atomic_t                gc_entries;
+       struct list_head        gc_list;
        rwlock_t                lock;
        unsigned long           last_rand;
        struct neigh_statistics __percpu *stats;