From e463cf937ecfa5105199ea1efca77ab8269fcdc6 Mon Sep 17 00:00:00 2001
From: Vasiliy Kulikov <segoon@openwall.com>
Date: Mon, 6 Aug 2012 03:55:29 +0000
Subject: [PATCH] --- yaml --- r: 321495 b: refs/heads/master c:
 9871f1ad677d95ffeca80e2c21b70af9bfc9cc91 h: refs/heads/master i:   321493:
 e2cf21d6f727c256907d730f43da140c4ec1c422   321491:
 92fa805966e08f78362590e44139002b092e1ce3   321487:
 c41ac732c222cd7c91eebc4652ae77d9f5ca8cb6 v: v3

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

diff --git a/[refs] b/[refs]
index e1d229dcf45c..da66e4fff67f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 91d27a8650d5359a7a320daeb35b88cdea15e3a8
+refs/heads/master: 9871f1ad677d95ffeca80e2c21b70af9bfc9cc91
diff --git a/trunk/net/ipv4/ip_output.c b/trunk/net/ipv4/ip_output.c
index ba39a52d18c1..76dde25fb9a0 100644
--- a/trunk/net/ipv4/ip_output.c
+++ b/trunk/net/ipv4/ip_output.c
@@ -197,7 +197,7 @@ static inline int ip_finish_output2(struct sk_buff *skb)
 	neigh = __ipv4_neigh_lookup_noref(dev, nexthop);
 	if (unlikely(!neigh))
 		neigh = __neigh_create(&arp_tbl, &nexthop, dev, false);
-	if (neigh) {
+	if (!IS_ERR(neigh)) {
 		int res = dst_neigh_output(dst, neigh, skb);
 
 		rcu_read_unlock_bh();