---

yaml --- r: 256484 b: refs/heads/master c: a292829 h: refs/heads/master v: v3
git-mirror · Jul 16, 2011 · e42c60c · e42c60c
1 parent b7e0908
commit e42c60c
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: fec8292d9cb662274b583c5c69fdfa6932e593a5
+refs/heads/master: a29282972cc9b80126d4e4d68251c6712bdad051
diff --git 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);