From b1177061401e751240c23f3f38a097b4d04d751a Mon Sep 17 00:00:00 2001
From: Florian Westphal <fw@strlen.de>
Date: Mon, 5 Sep 2011 16:05:44 +0200
Subject: [PATCH] --- yaml --- r: 279061 b: refs/heads/master c:
 ea6e574e34779fbb4526b2160411c163eac25323 h: refs/heads/master i:   279059:
 662024e8f7813f8b2ad0fad96f3e36728df26ffe v: v3

---
 [refs]                        | 2 +-
 trunk/include/net/ip6_route.h | 2 ++
 trunk/net/ipv6/route.c        | 7 +++++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d3b67a58ec6e..83c1bb6cd29c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8f97339d3feb662037b86a925e692017c0b32323
+refs/heads/master: ea6e574e34779fbb4526b2160411c163eac25323
diff --git a/trunk/include/net/ip6_route.h b/trunk/include/net/ip6_route.h
index 5e91b72fc718..9c9399c98616 100644
--- a/trunk/include/net/ip6_route.h
+++ b/trunk/include/net/ip6_route.h
@@ -70,6 +70,8 @@ extern void			ip6_route_input(struct sk_buff *skb);
 extern struct dst_entry *	ip6_route_output(struct net *net,
 						 const struct sock *sk,
 						 struct flowi6 *fl6);
+extern struct dst_entry *	ip6_route_lookup(struct net *net,
+						 struct flowi6 *fl6, int flags);
 
 extern int			ip6_route_init(void);
 extern void			ip6_route_cleanup(void);
diff --git a/trunk/net/ipv6/route.c b/trunk/net/ipv6/route.c
index 1138b0a5566d..ab48b02eb56a 100644
--- a/trunk/net/ipv6/route.c
+++ b/trunk/net/ipv6/route.c
@@ -658,6 +658,13 @@ static struct rt6_info *ip6_pol_route_lookup(struct net *net,
 
 }
 
+struct dst_entry * ip6_route_lookup(struct net *net, struct flowi6 *fl6,
+				    int flags)
+{
+	return fib6_rule_lookup(net, fl6, flags, ip6_pol_route_lookup);
+}
+EXPORT_SYMBOL_GPL(ip6_route_lookup);
+
 struct rt6_info *rt6_lookup(struct net *net, const struct in6_addr *daddr,
 			    const struct in6_addr *saddr, int oif, int strict)
 {