hwmon: ina219: add precision multiplier
[linux-2.6.git] / include / net / ip6_route.h
index 4a808de..2ad92ca 100644 (file)
@@ -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;
@@ -22,8 +21,6 @@ struct route_info {
        __u8                    prefix[0];      /* 0,8 or 16 */
 };
 
-#ifdef __KERNEL__
-
 #include <net/flow.h>
 #include <net/ip6_fib.h>
 #include <net/sock.h>
@@ -37,12 +34,44 @@ struct route_info {
 #define RT6_LOOKUP_F_SRCPREF_PUBLIC    0x00000010
 #define RT6_LOOKUP_F_SRCPREF_COA       0x00000020
 
+/*
+ * rt6_srcprefs2flags() and rt6_flags2srcprefs() translate
+ * between IPV6_ADDR_PREFERENCES socket option values
+ *     IPV6_PREFER_SRC_TMP    = 0x1
+ *     IPV6_PREFER_SRC_PUBLIC = 0x2
+ *     IPV6_PREFER_SRC_COA    = 0x4
+ * and above RT6_LOOKUP_F_SRCPREF_xxx flags.
+ */
+static inline int rt6_srcprefs2flags(unsigned int srcprefs)
+{
+       /* No need to bitmask because srcprefs have only 3 bits. */
+       return srcprefs << 3;
+}
+
+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,
-                                                struct sock *sk,
-                                                struct flowi *fl);
+                                                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);
@@ -55,6 +84,12 @@ extern int                   ip6_route_add(struct fib6_config *cfg);
 extern int                     ip6_ins_rt(struct rt6_info *);
 extern int                     ip6_del_rt(struct rt6_info *);
 
+extern int                     ip6_route_get_saddr(struct net *net,
+                                                   struct rt6_info *rt,
+                                                   const struct in6_addr *daddr,
+                                                   unsigned int prefs,
+                                                   struct in6_addr *saddr);
+
 extern struct rt6_info         *rt6_lookup(struct net *net,
                                            const struct in6_addr *daddr,
                                            const struct in6_addr *saddr,
@@ -62,14 +97,14 @@ extern struct rt6_info              *rt6_lookup(struct net *net,
 
 extern struct dst_entry *icmp6_dst_alloc(struct net_device *dev,
                                         struct neighbour *neigh,
-                                        const struct in6_addr *addr);
+                                        struct flowi6 *fl6);
 extern int icmp6_dst_gc(void);
 
 extern void fib6_force_start_gc(struct net *net);
 
 extern struct rt6_info *addrconf_dst_alloc(struct inet6_dev *idev,
                                           const struct in6_addr *addr,
-                                          int anycast);
+                                          bool anycast);
 
 extern int                     ip6_dst_hoplimit(struct dst_entry *dst);
 
@@ -77,9 +112,9 @@ extern int                   ip6_dst_hoplimit(struct dst_entry *dst);
  *     support functions for ND
  *
  */
-extern struct rt6_info *       rt6_get_dflt_router(struct in6_addr *addr,
+extern struct rt6_info *       rt6_get_dflt_router(const struct in6_addr *addr,
                                                    struct net_device *dev);
-extern struct rt6_info *       rt6_add_dflt_router(struct in6_addr *gwaddr,
+extern struct rt6_info *       rt6_add_dflt_router(const struct in6_addr *gwaddr,
                                                    struct net_device *dev,
                                                    unsigned int pref);
 
@@ -87,17 +122,17 @@ extern void                        rt6_purge_dflt_routers(struct net *net);
 
 extern int                     rt6_route_rcv(struct net_device *dev,
                                              u8 *opt, int len,
-                                             struct in6_addr *gwaddr);
+                                             const struct in6_addr *gwaddr);
 
-extern void                    rt6_redirect(struct in6_addr *dest,
-                                            struct in6_addr *src,
-                                            struct in6_addr *saddr,
+extern void                    rt6_redirect(const struct in6_addr *dest,
+                                            const struct in6_addr *src,
+                                            const struct in6_addr *saddr,
                                             struct neighbour *neigh,
                                             u8 *lladdr,
                                             int on_link);
 
-extern void                    rt6_pmtu_discovery(struct in6_addr *daddr,
-                                                  struct in6_addr *saddr,
+extern void                    rt6_pmtu_discovery(const struct in6_addr *daddr,
+                                                  const struct in6_addr *saddr,
                                                   struct net_device *dev,
                                                   u32 pmtu);
 
@@ -112,6 +147,7 @@ struct rt6_rtnl_dump_arg {
 extern int rt6_dump_route(struct rt6_info *rt, void *p_arg);
 extern void rt6_ifdown(struct net *net, struct net_device *dev);
 extern void rt6_mtu_change(struct net_device *dev, unsigned mtu);
+extern void rt6_remove_prefsrc(struct inet6_ifaddr *ifp);
 
 
 /*
@@ -134,9 +170,9 @@ static inline void __ip6_dst_store(struct sock *sk, struct dst_entry *dst,
 static inline void ip6_dst_store(struct sock *sk, struct dst_entry *dst,
                                 struct in6_addr *daddr, struct in6_addr *saddr)
 {
-       write_lock(&sk->sk_dst_lock);
+       spin_lock(&sk->sk_dst_lock);
        __ip6_dst_store(sk, dst, daddr, saddr);
-       write_unlock(&sk->sk_dst_lock);
+       spin_unlock(&sk->sk_dst_lock);
 }
 
 static inline int ipv6_unicast_destination(struct sk_buff *skb)
@@ -146,5 +182,14 @@ static inline int ipv6_unicast_destination(struct sk_buff *skb)
        return rt->rt6i_flags & RTF_LOCAL;
 }
 
-#endif
+int ip6_fragment(struct sk_buff *skb, int (*output)(struct sk_buff *));
+
+static inline int ip6_skb_dst_mtu(struct sk_buff *skb)
+{
+       struct ipv6_pinfo *np = skb->sk ? inet6_sk(skb->sk) : NULL;
+
+       return (np && np->pmtudisc == IPV6_PMTUDISC_PROBE) ?
+              skb_dst(skb)->dev->mtu : dst_mtu(skb_dst(skb));
+}
+
 #endif