diff options
| author | David S. Miller <davem@davemloft.net> | 2010-06-15 13:49:24 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-06-15 13:49:24 -0700 |
| commit | 16fb62b6b4d57339a0ec931b3fb8c8d0ca6414e8 (patch) | |
| tree | a1041342f31a626baf3a08d09d5c81a65dd8ef28 /net/bridge | |
| parent | a3433f35a55f7604742cae620c6dc6edfc70db6a (diff) | |
| parent | f9181f4ffc71d7b7dd1906c9a11d51d6659220ae (diff) | |
| download | op-kernel-dev-16fb62b6b4d57339a0ec931b3fb8c8d0ca6414e8.zip op-kernel-dev-16fb62b6b4d57339a0ec931b3fb8c8d0ca6414e8.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
Diffstat (limited to 'net/bridge')
| -rw-r--r-- | net/bridge/br_netfilter.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c index f54404d..84060bc 100644 --- a/net/bridge/br_netfilter.c +++ b/net/bridge/br_netfilter.c @@ -245,8 +245,7 @@ static int br_nf_pre_routing_finish_ipv6(struct sk_buff *skb) kfree_skb(skb); return 0; } - dst_hold(&rt->dst); - skb_dst_set(skb, &rt->dst); + skb_dst_set_noref(skb, &rt->dst); skb->dev = nf_bridge->physindev; nf_bridge_update_protocol(skb); @@ -397,8 +396,7 @@ bridged_dnat: kfree_skb(skb); return 0; } - dst_hold(&rt->dst); - skb_dst_set(skb, &rt->dst); + skb_dst_set_noref(skb, &rt->dst); } skb->dev = nf_bridge->physindev; |
