diff options
| author |   David S. Miller <davem@davemloft.net> | 2011-07-14 07:53:20 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-07-14 07:53:20 -0700 |
| commit | f6b72b6217f8c24f2a54988e58af858b4e66024d (patch) | |
| tree | c59d5adcf9bb226db6f602c5078106052524cfea /net/bridge/br_netfilter.c | |
| parent | slip: remove dead code within the slip initialization (diff) | |
| download | linux-dev-f6b72b6217f8c24f2a54988e58af858b4e66024d.tar.xz linux-dev-f6b72b6217f8c24f2a54988e58af858b4e66024d.zip | |
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/bridge/br_netfilter.c')
| -rw-r--r-- | net/bridge/br_netfilter.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c index 56149ec36d7f..75ee421917c7 100644 --- a/net/bridge/br_netfilter.c +++ b/net/bridge/br_netfilter.c @@ -343,14 +343,16 @@ static int br_nf_pre_routing_finish_ipv6(struct sk_buff *skb) static int br_nf_pre_routing_finish_bridge(struct sk_buff *skb) { struct nf_bridge_info *nf_bridge = skb->nf_bridge; + struct neighbour *neigh; struct dst_entry *dst; skb->dev = bridge_parent(skb->dev); if (!skb->dev) goto free_skb; dst = skb_dst(skb); - if (dst->hh) { - neigh_hh_bridge(dst->hh, skb); + neigh = dst->neighbour; + if (neigh->hh.hh_len) { + neigh_hh_bridge(&neigh->hh, skb); skb->dev = nf_bridge->physindev; return br_handle_frame_finish(skb); } else if (dst->neighbour) { |