- patches.arch/x86_mce_intel_decode_physical_address.patch:

[linux-flexiantxendom0-3.2.10.git] / net / ipv6 / route.c

diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 1fde3f8..ed3961a 100644 (file)
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -317,7 +317,6 @@ static void rt6_probe(struct rt6_info *rt)
 #else
 static inline void rt6_probe(struct rt6_info *rt)
 {
-       return;
 }
 #endif
 
@@ -816,7 +815,7 @@ struct dst_entry * ip6_route_output(struct net *net, struct sock *sk,
 {
        int flags = 0;
 
-       if (fl->oif || rt6_need_strict(&fl->fl6_dst))
+       if ((sk && sk->sk_bound_dev_if) || rt6_need_strict(&fl->fl6_dst))
                flags |= RT6_LOOKUP_F_IFACE;
 
        if (!ipv6_addr_any(&fl->fl6_src))
@@ -1554,7 +1553,6 @@ void rt6_redirect(struct in6_addr *dest, struct in6_addr *src,
 
 out:
        dst_release(&rt->u.dst);
-       return;
 }
 
 /*