From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Tue, 1 Jun 2010 09:48:31 +0000 (+0200)
Subject: netfilter: br_netfilter: use skb_set_noref()
X-Git-Tag: v3.12-rc1~9497^2~374^2~26
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a8b563894d6fee9b90b7d6ed76f8ec28ad45bcbe;p=kernel%2Fkernel-generic.git

netfilter: br_netfilter: use skb_set_noref()

Avoid dirtying bridge_parent_rtable refcount, using new dst noref
infrastructure.

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
---

diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c
index 4442099..cbea5af 100644
--- a/net/bridge/br_netfilter.c
+++ b/net/bridge/br_netfilter.c
@@ -244,8 +244,7 @@ static int br_nf_pre_routing_finish_ipv6(struct sk_buff *skb)
 		kfree_skb(skb);
 		return 0;
 	}
-	dst_hold(&rt->u.dst);
-	skb_dst_set(skb, &rt->u.dst);
+	skb_dst_set_noref(skb, &rt->u.dst);
 
 	skb->dev = nf_bridge->physindev;
 	nf_bridge_update_protocol(skb);
@@ -396,8 +395,7 @@ bridged_dnat:
 			kfree_skb(skb);
 			return 0;
 		}
-		dst_hold(&rt->u.dst);
-		skb_dst_set(skb, &rt->u.dst);
+		skb_dst_set_noref(skb, &rt->u.dst);
 	}
 
 	skb->dev = nf_bridge->physindev;