From dc554d1476de48fd1b68fc0dc153de75dfba48d6 Mon Sep 17 00:00:00 2001
From: Thomas Graf <tgraf@suug.ch>
Date: Fri, 10 Feb 2012 04:07:11 +0000
Subject: [PATCH] --- yaml --- r: 287547 b: refs/heads/master c:
 70620c46ac2b45c24b0f22002fdf5ddd1f7daf81 h: refs/heads/master i:   287545:
 b92799631c1e07eb781503a537adcc0c59099b25   287543:
 9cf1a512a3f79fa666275b43e735ff35e03355a3 v: v3

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

diff --git a/[refs] b/[refs]
index d0d1b3bb1766..ff06912c6325 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5dc7883f2a7c25f8df40d7479687153558cd531b
+refs/heads/master: 70620c46ac2b45c24b0f22002fdf5ddd1f7daf81
diff --git a/trunk/net/ipv4/arp.c b/trunk/net/ipv4/arp.c
index 59402be133f0..63e49890ad31 100644
--- a/trunk/net/ipv4/arp.c
+++ b/trunk/net/ipv4/arp.c
@@ -863,7 +863,8 @@ static int arp_process(struct sk_buff *skb)
 			if (addr_type == RTN_UNICAST  &&
 			    (arp_fwd_proxy(in_dev, dev, rt) ||
 			     arp_fwd_pvlan(in_dev, dev, rt, sip, tip) ||
-			     pneigh_lookup(&arp_tbl, net, &tip, dev, 0))) {
+			     (rt->dst.dev != dev &&
+			      pneigh_lookup(&arp_tbl, net, &tip, dev, 0)))) {
 				n = neigh_event_ns(&arp_tbl, sha, &sip, dev);
 				if (n)
 					neigh_release(n);