libata: kill probe_ent and related helpers

[pandora-kernel.git] / include / net / ip6_route.h

diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h
index 249ce45..5456fdd 100644 (file)
--- a/include/net/ip6_route.h
+++ b/include/net/ip6_route.h
@@ -20,7 +20,7 @@ struct route_info {
                                route_pref:2,
                                reserved_h:3;
 #endif
-       __u32                   lifetime;
+       __be32                  lifetime;
        __u8                    prefix[0];      /* 0,8 or 16 */
 };
 
@@ -32,12 +32,9 @@ struct route_info {
 #include <linux/ip.h>
 #include <linux/ipv6.h>
 
-struct pol_chain {
-       int                     type;
-       int                     priority;
-       struct fib6_node        *rules;
-       struct pol_chain        *next;
-};
+#define RT6_LOOKUP_F_IFACE     0x1
+#define RT6_LOOKUP_F_REACHABLE 0x2
+#define RT6_LOOKUP_F_HAS_SADDR 0x4
 
 extern struct rt6_info ip6_null_entry;
 
@@ -53,8 +50,6 @@ extern void                   ip6_route_input(struct sk_buff *skb);
 extern struct dst_entry *      ip6_route_output(struct sock *sk,
                                                 struct flowi *fl);
 
-extern int                     ip6_route_me_harder(struct sk_buff *skb);
-
 extern void                    ip6_route_init(void);
 extern void                    ip6_route_cleanup(void);
 
@@ -121,12 +116,7 @@ extern void                        rt6_pmtu_discovery(struct in6_addr *daddr,
                                                   struct net_device *dev,
                                                   u32 pmtu);
 
-struct nlmsghdr;
 struct netlink_callback;
-extern int inet6_dump_fib(struct sk_buff *skb, struct netlink_callback *cb);
-extern int inet6_rtm_newroute(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg);
-extern int inet6_rtm_delroute(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg);
-extern int inet6_rtm_getroute(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg);
 
 struct rt6_rtnl_dump_arg
 {
@@ -144,21 +134,24 @@ extern rwlock_t rt6_lock;
  *     Store a destination cache entry in a socket
  */
 static inline void __ip6_dst_store(struct sock *sk, struct dst_entry *dst,
-                                  struct in6_addr *daddr)
+                                  struct in6_addr *daddr, struct in6_addr *saddr)
 {
        struct ipv6_pinfo *np = inet6_sk(sk);
        struct rt6_info *rt = (struct rt6_info *) dst;
 
        sk_setup_caps(sk, dst);
        np->daddr_cache = daddr;
+#ifdef CONFIG_IPV6_SUBTREES
+       np->saddr_cache = saddr;
+#endif
        np->dst_cookie = rt->rt6i_node ? rt->rt6i_node->fn_sernum : 0;
 }
 
 static inline void ip6_dst_store(struct sock *sk, struct dst_entry *dst,
-                                struct in6_addr *daddr)
+                                struct in6_addr *daddr, struct in6_addr *saddr)
 {
        write_lock(&sk->sk_dst_lock);
-       __ip6_dst_store(sk, dst, daddr);
+       __ip6_dst_store(sk, dst, daddr, saddr);
        write_unlock(&sk->sk_dst_lock);
 }