---

yaml --- r: 321495 b: refs/heads/master c: 9871f1a h: refs/heads/master i: 321493: e2cf21d 321491: 92fa805 321487: c41ac73 v: v3
git-mirror · Aug 6, 2012 · e463cf9 · e463cf9
1 parent 695249b
commit e463cf9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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();