Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / include / net / ip6_route.h

diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h
index 2ab926860cd855b6ec7861a998d19612624980e6..8552f0a2e85400433f9481e531e0ee88fe6b59ef 100644 (file)
--- a/include/net/ip6_route.h
+++ b/include/net/ip6_route.h
@@ -3,7 +3,6 @@
 
 #define IP6_RT_PRIO_USER       1024
 #define IP6_RT_PRIO_ADDRCONF   256
-#define IP6_RT_PRIO_KERN       512
 
 struct route_info {
        __u8                    type;
@@ -56,6 +55,18 @@ static inline unsigned int rt6_flags2srcprefs(int flags)
        return (flags >> 3) & 7;
 }
 
+extern void                    rt6_bind_peer(struct rt6_info *rt,
+                                             int create);
+
+static inline struct inet_peer *rt6_get_peer(struct rt6_info *rt)
+{
+       if (rt->rt6i_peer)
+               return rt->rt6i_peer;
+
+       rt6_bind_peer(rt, 0);
+       return rt->rt6i_peer;
+}
+
 extern void                    ip6_route_input(struct sk_buff *skb);
 
 extern struct dst_entry *      ip6_route_output(struct net *net,