From b7e09087a157b8887fae0015f67906dfd8c2dc7c Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Sat, 16 Jul 2011 14:25:54 -0700
Subject: [PATCH] --- yaml --- r: 256483 b: refs/heads/master c:
 fec8292d9cb662274b583c5c69fdfa6932e593a5 h: refs/heads/master i:   256481:
 1b9f41da87a85e689943bebabcbeda39d70d71f9   256479:
 5d2449019360c72f1c3852a59768db8103b69628 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 7e51a2d4f449..35572e2a1e27 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: faa2831445cdc95774584045fe10f749fa62244e
+refs/heads/master: fec8292d9cb662274b583c5c69fdfa6932e593a5
diff --git a/trunk/net/ipv4/ip_output.c b/trunk/net/ipv4/ip_output.c
index a621b96aed15..1ac674a68c77 100644
--- a/trunk/net/ipv4/ip_output.c
+++ b/trunk/net/ipv4/ip_output.c
@@ -210,7 +210,7 @@ static inline int ip_finish_output2(struct sk_buff *skb)
 		if (hh->hh_len)
 			return neigh_hh_output(hh, skb);
 		else
-			return dst->neighbour->output(skb);
+			return neigh->output(skb);
 	}
 	if (net_ratelimit())
 		printk(KERN_DEBUG "ip_finish_output2: No header cache and no neighbour!\n");