From: David S. Miller <davem@davemloft.net>
Date: Sat, 16 Jul 2011 21:30:47 +0000 (-0700)
Subject: ipv6: Use calculated 'neigh' instead of re-evaluating dst->neighbour
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a29282972cc9b80126d4e4d68251c6712bdad051;p=openwrt%2Fstaging%2Fblogic.git

ipv6: Use calculated 'neigh' instead of re-evaluating dst->neighbour

Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index f0f144cac0bd..36362e9513f0 100644
--- a/net/ipv6/ip6_output.c
+++ b/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);