From f890f953abf4d68c6752b85dc08c43369dafe29f Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Mon, 10 May 2010 11:33:06 +0000
Subject: [PATCH] --- yaml --- r: 195147 b: refs/heads/master c:
 4a94445c9a5cf5461fb41d80040033b9a8e2a85a h: refs/heads/master i:   195145:
 b8b0b61b117a2852d3c7eacb687d02d8dd813971   195143:
 8e43062ef964e9d0bdafddff69f04620e65beca8 v: v3

---
 [refs]                       | 2 +-
 trunk/net/ipv4/arp.c         | 2 +-
 trunk/net/ipv4/ip_input.c    | 4 ++--
 trunk/net/ipv4/xfrm4_input.c | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index a2d4261dc708..49f0d07ae5ee 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 407eadd996dc62a827db85f1d0c286a98fd5d336
+refs/heads/master: 4a94445c9a5cf5461fb41d80040033b9a8e2a85a
diff --git a/trunk/net/ipv4/arp.c b/trunk/net/ipv4/arp.c
index 80769f1f9fab..f094b75810db 100644
--- a/trunk/net/ipv4/arp.c
+++ b/trunk/net/ipv4/arp.c
@@ -854,7 +854,7 @@ static int arp_process(struct sk_buff *skb)
 	}
 
 	if (arp->ar_op == htons(ARPOP_REQUEST) &&
-	    ip_route_input(skb, tip, sip, 0, dev) == 0) {
+	    ip_route_input_noref(skb, tip, sip, 0, dev) == 0) {
 
 		rt = skb_rtable(skb);
 		addr_type = rt->rt_type;
diff --git a/trunk/net/ipv4/ip_input.c b/trunk/net/ipv4/ip_input.c
index af76de5f76de..d930dc5e4d85 100644
--- a/trunk/net/ipv4/ip_input.c
+++ b/trunk/net/ipv4/ip_input.c
@@ -331,8 +331,8 @@ static int ip_rcv_finish(struct sk_buff *skb)
 	 *	how the packet travels inside Linux networking.
 	 */
 	if (skb_dst(skb) == NULL) {
-		int err = ip_route_input(skb, iph->daddr, iph->saddr, iph->tos,
-					 skb->dev);
+		int err = ip_route_input_noref(skb, iph->daddr, iph->saddr,
+					       iph->tos, skb->dev);
 		if (unlikely(err)) {
 			if (err == -EHOSTUNREACH)
 				IP_INC_STATS_BH(dev_net(skb->dev),
diff --git a/trunk/net/ipv4/xfrm4_input.c b/trunk/net/ipv4/xfrm4_input.c
index abcd7ed65db1..ad8fbb871aa0 100644
--- a/trunk/net/ipv4/xfrm4_input.c
+++ b/trunk/net/ipv4/xfrm4_input.c
@@ -27,8 +27,8 @@ static inline int xfrm4_rcv_encap_finish(struct sk_buff *skb)
 	if (skb_dst(skb) == NULL) {
 		const struct iphdr *iph = ip_hdr(skb);
 
-		if (ip_route_input(skb, iph->daddr, iph->saddr, iph->tos,
-				   skb->dev))
+		if (ip_route_input_noref(skb, iph->daddr, iph->saddr,
+					 iph->tos, skb->dev))
 			goto drop;
 	}
 	return dst_input(skb);