net: Embed hh_cache inside of struct neighbour.

[linux-2.6-block.git] / net / core / dst.c

diff --git a/net/core/dst.c b/net/core/dst.c
index 6135f3671692689b773c2289d940ecabb29c6a26..4aacc14936a052960bbd56921e0a69339aad2cab 100644 (file)
--- a/net/core/dst.c
+++ b/net/core/dst.c
@@ -172,7 +172,6 @@ void *dst_alloc(struct dst_ops *ops, struct net_device *dev,
        dst->expires = 0UL;
        dst->path = dst;
        dst->neighbour = NULL;
-       dst->hh = NULL;
 #ifdef CONFIG_XFRM
        dst->xfrm = NULL;
 #endif
@@ -226,19 +225,13 @@ struct dst_entry *dst_destroy(struct dst_entry * dst)
 {
        struct dst_entry *child;
        struct neighbour *neigh;
-       struct hh_cache *hh;
 
        smp_rmb();
 
 again:
        neigh = dst->neighbour;
-       hh = dst->hh;
        child = dst->child;
 
-       dst->hh = NULL;
-       if (hh)
-               hh_cache_put(hh);
-
        if (neigh) {
                dst->neighbour = NULL;
                neigh_release(neigh);