1 files changed, 18 insertions, 5 deletions

diff --git a/include/net/route.h b/include/net/route.h
index f46af256880c..ee81307863d5 100644
--- a/include/net/route.h
+++ b/include/net/route.h
@@ -28,6 +28,8 @@
 #include <net/inetpeer.h>
 #include <net/flow.h>
 #include <net/inet_sock.h>
+#include <net/ip_fib.h>
+#include <net/l3mdev.h>
 #include <linux/in_route.h>
 #include <linux/rtnetlink.h>
 #include <linux/rcupdate.h>
@@ -64,6 +66,8 @@ struct rtable {
         /* Miscellaneous cached information */
         u32                     rt_pmtu;
 
+        u32                     rt_table_id;
+
         struct list_head        rt_uncached;
         struct uncached_list    *rt_uncached_list;
 };
@@ -110,9 +114,17 @@ struct in_device;
 int ip_rt_init(void);
 void rt_cache_flush(struct net *net);
 void rt_flush_dev(struct net_device *dev);
-struct rtable *__ip_route_output_key(struct net *, struct flowi4 *flp);
+struct rtable *__ip_route_output_key_hash(struct net *, struct flowi4 *flp,
+                                          int mp_hash);
+
+static inline struct rtable *__ip_route_output_key(struct net *net,
+                                                   struct flowi4 *flp)
+{
+        return __ip_route_output_key_hash(net, flp, -1);
+}
+
 struct rtable *ip_route_output_flow(struct net *, struct flowi4 *flp,
-                                    struct sock *sk);
+                                    const struct sock *sk);
 struct dst_entry *ipv4_blackhole_route(struct net *net,
                                        struct dst_entry *dst_orig);
 
@@ -254,9 +266,6 @@ static inline void ip_route_connect_init(struct flowi4 *fl4, __be32 dst, __be32
         if (inet_sk(sk)->transparent)
                 flow_flags |= FLOWI_FLAG_ANYSRC;
 
-        if (netif_index_is_vrf(sock_net(sk), oif))
-                flow_flags |= FLOWI_FLAG_VRFSRC | FLOWI_FLAG_SKIP_NH_OIF;
-
         flowi4_init_output(fl4, oif, sk->sk_mark, tos, RT_SCOPE_UNIVERSE,
                            protocol, flow_flags, dst, src, dport, sport);
 }
@@ -273,6 +282,10 @@ static inline struct rtable *ip_route_connect(struct flowi4 *fl4,
         ip_route_connect_init(fl4, dst, src, tos, oif, protocol,
                               sport, dport, sk);
 
+        if (!src && oif) {
+                l3mdev_get_saddr(net, oif, fl4);
+                src = fl4->saddr;
+        }
         if (!dst || !src) {
                 rt = __ip_route_output_key(net, fl4);
                 if (IS_ERR(rt))