From 01f1fd720d83ddd85ee829bb4c13d4ff431d2e18 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Sat, 3 Dec 2011 18:29:30 -0500
Subject: [PATCH] --- yaml --- r: 278331 b: refs/heads/master c:
 04a6f4417bfd17c3860e8fb37387cb78265ffe44 h: refs/heads/master i:   278329:
 9ba8f31bb0f378dfc7f16f4eeeacf64125bc70d3   278327:
 83400a3e41e4a6d30ea1c28ef568ae1b49116409 v: v3

---
 [refs]                    | 2 +-
 trunk/include/net/ndisc.h | 9 ---------
 trunk/net/ipv6/route.c    | 7 ++++---
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 4c1aeab312aa..25620f4e5732 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3830847396fa6d7f9a5fec0ca9819c47ac8a64e8
+refs/heads/master: 04a6f4417bfd17c3860e8fb37387cb78265ffe44
diff --git a/trunk/include/net/ndisc.h b/trunk/include/net/ndisc.h
index 62beeb97c4b1..c977c377c015 100644
--- a/trunk/include/net/ndisc.h
+++ b/trunk/include/net/ndisc.h
@@ -145,13 +145,4 @@ int ndisc_ifinfo_sysctl_strategy(ctl_table *ctl,
 extern void 			inet6_ifinfo_notify(int event,
 						    struct inet6_dev *idev);
 
-static inline struct neighbour * ndisc_get_neigh(struct net_device *dev, const struct in6_addr *addr)
-{
-
-	if (dev)
-		return __neigh_lookup_errno(&nd_tbl, addr, dev);
-
-	return ERR_PTR(-ENODEV);
-}
-
 #endif
diff --git a/trunk/net/ipv6/route.c b/trunk/net/ipv6/route.c
index 897a13f7c6b1..1138b0a5566d 100644
--- a/trunk/net/ipv6/route.c
+++ b/trunk/net/ipv6/route.c
@@ -744,7 +744,8 @@ static struct rt6_info *rt6_alloc_cow(const struct rt6_info *ort,
 #endif
 
 	retry:
-		neigh = ndisc_get_neigh(rt->rt6i_dev, &rt->rt6i_gateway);
+		neigh = __neigh_lookup_errno(&nd_tbl, &rt->rt6i_gateway,
+					     rt->rt6i_dev);
 		if (IS_ERR(neigh)) {
 			struct net *net = dev_net(rt->rt6i_dev);
 			int saved_rt_min_interval =
@@ -1085,7 +1086,7 @@ struct dst_entry *icmp6_dst_alloc(struct net_device *dev,
 	if (neigh)
 		neigh_hold(neigh);
 	else {
-		neigh = ndisc_get_neigh(dev, addr);
+		neigh = __neigh_lookup_errno(&nd_tbl, addr, dev);
 		if (IS_ERR(neigh))
 			neigh = NULL;
 	}
@@ -2082,7 +2083,7 @@ struct rt6_info *addrconf_dst_alloc(struct inet6_dev *idev,
 		rt->rt6i_flags |= RTF_ANYCAST;
 	else
 		rt->rt6i_flags |= RTF_LOCAL;
-	neigh = ndisc_get_neigh(rt->rt6i_dev, &rt->rt6i_gateway);
+	neigh = __neigh_lookup_errno(&nd_tbl, &rt->rt6i_gateway, rt->rt6i_dev);
 	if (IS_ERR(neigh)) {
 		dst_free(&rt->dst);