diff options
| author | David S. Miller <davem@davemloft.net> | 2011-07-14 18:53:20 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-07-14 18:53:20 +0400 |
| commit | f6b72b6217f8c24f2a54988e58af858b4e66024d (patch) | |
| tree | c59d5adcf9bb226db6f602c5078106052524cfea /net/core/dst.c | |
| parent | 390fd0b388e4f85549e5d60bdeb21364b344d9b9 (diff) | |
| download | linux-f6b72b6217f8c24f2a54988e58af858b4e66024d.tar.xz | |
net: Embed hh_cache inside of struct neighbour.
Now that there is a one-to-one correspondance between neighbour
and hh_cache entries, we no longer need:
1) dynamic allocation
2) attachment to dst->hh
3) refcounting
Initialization of the hh_cache entry is indicated by hh_len
being non-zero, and such initialization is always done with
the neighbour's lock held as a writer.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/dst.c')
| -rw-r--r-- | net/core/dst.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/net/core/dst.c b/net/core/dst.c index 6135f3671692..4aacc14936a0 100644 --- 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); |