Patched in Tegra support.

1 files changed, 25 insertions, 29 deletions

diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h
index 27d83183e61..5e91b72fc71 100644
--- a/include/net/ip6_route.h
+++ b/include/net/ip6_route.h
@@ -1,6 +1,9 @@
 #ifndef _NET_IP6_ROUTE_H
 #define _NET_IP6_ROUTE_H
 
+#define IP6_RT_PRIO_USER        1024
+#define IP6_RT_PRIO_ADDRCONF    256
+
 struct route_info {
         __u8                    type;
         __u8                    length;
@@ -50,25 +53,16 @@ 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, int create)
-{
-        if (rt6_has_peer(rt))
-                return rt6_peer_ptr(rt);
-
-        rt6_bind_peer(rt, create);
-        return (rt6_has_peer(rt) ? rt6_peer_ptr(rt) : NULL);
-}
+extern void                     rt6_bind_peer(struct rt6_info *rt,
+                                              int create);
 
 static inline struct inet_peer *rt6_get_peer(struct rt6_info *rt)
 {
-        return __rt6_get_peer(rt, 0);
-}
+        if (rt->rt6i_peer)
+                return rt->rt6i_peer;
 
-static inline struct inet_peer *rt6_get_peer_create(struct rt6_info *rt)
-{
-        return __rt6_get_peer(rt, 1);
+        rt6_bind_peer(rt, 0);
+        return rt->rt6i_peer;
 }
 
 extern void                     ip6_route_input(struct sk_buff *skb);
@@ -76,8 +70,6 @@ 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);
@@ -103,14 +95,14 @@ extern struct rt6_info		*rt6_lookup(struct net *net,
 
 extern struct dst_entry *icmp6_dst_alloc(struct net_device *dev,
                                          struct neighbour *neigh,
-                                         struct flowi6 *fl6);
+                                         const struct in6_addr *addr);
 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,
-                                           bool anycast);
+                                           int anycast);
 
 extern int                      ip6_dst_hoplimit(struct dst_entry *dst);
 
@@ -130,12 +122,17 @@ extern int			rt6_route_rcv(struct net_device *dev,
                                               u8 *opt, int len,
                                               const struct in6_addr *gwaddr);
 
-extern void ip6_update_pmtu(struct sk_buff *skb, struct net *net, __be32 mtu,
-                            int oif, u32 mark);
-extern void ip6_sk_update_pmtu(struct sk_buff *skb, struct sock *sk,
-                               __be32 mtu);
-extern void ip6_redirect(struct sk_buff *skb, struct net *net, int oif, u32 mark);
-extern void ip6_sk_redirect(struct sk_buff *skb, struct sock *sk);
+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(const struct in6_addr *daddr,
+                                                   const struct in6_addr *saddr,
+                                                   struct net_device *dev,
+                                                   u32 pmtu);
 
 struct netlink_callback;
 
@@ -147,7 +144,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 int mtu);
+extern void rt6_mtu_change(struct net_device *dev, unsigned mtu);
 extern void rt6_remove_prefsrc(struct inet6_ifaddr *ifp);
 
 
@@ -155,8 +152,7 @@ extern void rt6_remove_prefsrc(struct inet6_ifaddr *ifp);
  *      Store a destination cache entry in a socket
  */
 static inline void __ip6_dst_store(struct sock *sk, struct dst_entry *dst,
-                                   const struct in6_addr *daddr,
-                                   const struct in6_addr *saddr)
+                                   struct in6_addr *daddr, struct in6_addr *saddr)
 {
         struct ipv6_pinfo *np = inet6_sk(sk);
         struct rt6_info *rt = (struct rt6_info *) dst;
@@ -177,7 +173,7 @@ static inline void ip6_dst_store(struct sock *sk, struct dst_entry *dst,
         spin_unlock(&sk->sk_dst_lock);
 }
 
-static inline bool ipv6_unicast_destination(const struct sk_buff *skb)
+static inline int ipv6_unicast_destination(struct sk_buff *skb)
 {
         struct rt6_info *rt = (struct rt6_info *) skb_dst(skb);