From e42c60cd7f933f07989363aab8a1d39227424e32 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Sat, 16 Jul 2011 14:30:47 -0700
Subject: [PATCH] --- yaml --- r: 256484 b: refs/heads/master c:
 a29282972cc9b80126d4e4d68251c6712bdad051 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 35572e2a1e27..3550de4d0986 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fec8292d9cb662274b583c5c69fdfa6932e593a5
+refs/heads/master: a29282972cc9b80126d4e4d68251c6712bdad051
diff --git a/trunk/net/ipv6/ip6_output.c b/trunk/net/ipv6/ip6_output.c
index f0f144cac0bd..36362e9513f0 100644
--- a/trunk/net/ipv6/ip6_output.c
+++ b/trunk/net/ipv6/ip6_output.c
@@ -141,7 +141,7 @@ static int ip6_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);
 	}
 	IP6_INC_STATS_BH(dev_net(dst->dev),
 			 ip6_dst_idev(dst), IPSTATS_MIB_OUTNOROUTES);