datapath: Move find_route() to compat.h

[sliver-openvswitch.git] / datapath / tunnel.c

diff --git a/datapath/tunnel.c b/datapath/tunnel.c
index bd63da5..c2c3df4 100644 (file)
--- a/datapath/tunnel.c
+++ b/datapath/tunnel.c
@@ -79,44 +79,6 @@ void ovs_tnl_rcv(struct vport *vport, struct sk_buff *skb,
        ovs_vport_receive(vport, skb, tun_key);
 }
 
-struct rtable *find_route(struct net *net,
-                         __be32 *saddr, __be32 daddr, u8 ipproto,
-                         u8 tos, u32 skb_mark)
-{
-       struct rtable *rt;
-       /* Tunnel configuration keeps DSCP part of TOS bits, But Linux
-        * router expect RT_TOS bits only. */
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,39)
-       struct flowi fl = { .nl_u = { .ip4_u = {
-                                       .daddr = daddr,
-                                       .saddr = *saddr,
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
-                                       .fwmark = skb_mark,
-#endif
-                                       .tos   = RT_TOS(tos) } },
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)
-                                       .mark = skb_mark,
-#endif
-                                       .proto = ipproto };
-
-       if (unlikely(ip_route_output_key(net, &rt, &fl)))
-               return ERR_PTR(-EADDRNOTAVAIL);
-       *saddr = fl.nl_u.ip4_u.saddr;
-       return rt;
-#else
-       struct flowi4 fl = { .daddr = daddr,
-                            .saddr = *saddr,
-                            .flowi4_tos = RT_TOS(tos),
-                            .flowi4_mark = skb_mark,
-                            .flowi4_proto = ipproto };
-
-       rt = ip_route_output_key(net, &fl);
-       *saddr = fl.saddr;
-       return rt;
-#endif
-}
-
 static bool need_linearize(const struct sk_buff *skb)
 {
        int i;