diff options
| author | David S. Miller <davem@davemloft.net> | 2011-07-17 22:34:11 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-07-18 08:11:17 +0200 |
| commit | 8f40b161de4f27402b4c0659ad2ae83fad5a0cdd (patch) | |
| tree | 9e2dbd4ba8a66916c690b0e5791ac25ea0958c26 /net/bridge | |
| parent | net: vlan, qlcnic: make vlan_find_dev private (diff) | |
| download | linux-8f40b161de4f27402b4c0659ad2ae83fad5a0cdd.tar.xz linux-8f40b161de4f27402b4c0659ad2ae83fad5a0cdd.zip | |
neigh: Pass neighbour entry to output ops.
This will get us closer to being able to do "neigh stuff"
completely independent of the underlying dst_entry for
protocols (ipv4/ipv6) that wish to do so.
We will also be able to make dst entries neigh-less.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge')
| -rw-r--r-- | net/bridge/br_netfilter.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c index 75ee421917c7..1fe43fdf9973 100644 --- a/net/bridge/br_netfilter.c +++ b/net/bridge/br_netfilter.c @@ -355,14 +355,14 @@ static int br_nf_pre_routing_finish_bridge(struct sk_buff *skb) neigh_hh_bridge(&neigh->hh, skb); skb->dev = nf_bridge->physindev; return br_handle_frame_finish(skb); - } else if (dst->neighbour) { + } else { /* the neighbour function below overwrites the complete * MAC header, so we save the Ethernet source address and * protocol number. */ skb_copy_from_linear_data_offset(skb, -(ETH_HLEN-ETH_ALEN), skb->nf_bridge->data, ETH_HLEN-ETH_ALEN); /* tell br_dev_xmit to continue with forwarding */ nf_bridge->mask |= BRNF_BRIDGED_DNAT; - return dst->neighbour->output(skb); + return neigh->output(neigh, skb); } free_skb: kfree_skb(skb); |