diff options
| author | David S. Miller <davem@davemloft.net> | 2010-06-15 16:49:24 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-06-15 16:49:24 -0400 |
| commit | 16fb62b6b4d57339a0ec931b3fb8c8d0ca6414e8 (patch) | |
| tree | a1041342f31a626baf3a08d09d5c81a65dd8ef28 /net/bridge | |
| parent | a3433f35a55f7604742cae620c6dc6edfc70db6a (diff) | |
| parent | f9181f4ffc71d7b7dd1906c9a11d51d6659220ae (diff) | |
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 f54404ddee53..84060bc48f11 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) | |||
| 245 | kfree_skb(skb); | 245 | kfree_skb(skb); |
| 246 | return 0; | 246 | return 0; |
| 247 | } | 247 | } |
| 248 | dst_hold(&rt->dst); | 248 | skb_dst_set_noref(skb, &rt->dst); |
| 249 | skb_dst_set(skb, &rt->dst); | ||
| 250 | 249 | ||
| 251 | skb->dev = nf_bridge->physindev; | 250 | skb->dev = nf_bridge->physindev; |
| 252 | nf_bridge_update_protocol(skb); | 251 | nf_bridge_update_protocol(skb); |
| @@ -397,8 +396,7 @@ bridged_dnat: | |||
| 397 | kfree_skb(skb); | 396 | kfree_skb(skb); |
| 398 | return 0; | 397 | return 0; |
| 399 | } | 398 | } |
| 400 | dst_hold(&rt->dst); | 399 | skb_dst_set_noref(skb, &rt->dst); |
| 401 | skb_dst_set(skb, &rt->dst); | ||
| 402 | } | 400 | } |
| 403 | 401 | ||
| 404 | skb->dev = nf_bridge->physindev; | 402 | skb->dev = nf_bridge->physindev; |