3 files changed, 27 insertions, 46 deletions

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 68a5ce0a649f..3ad4f501949e 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -2676,7 +2676,6 @@ static void bond_arp_send_all(struct bonding *bond, struct slave *slave)
         __be32 *targets = bond->params.arp_targets;
         struct vlan_entry *vlan;
         struct net_device *vlan_dev;
-        struct flowi fl;
         struct rtable *rt;
 
         for (i = 0; (i < BOND_MAX_ARP_TARGETS); i++) {
@@ -2695,15 +2694,12 @@ static void bond_arp_send_all(struct bonding *bond, struct slave *slave)
                  * determine which VLAN interface would be used, so we
                  * can tag the ARP with the proper VLAN tag.
                  */
-                memset(&fl, 0, sizeof(fl));
-                fl.fl4_dst = targets[i];
-                fl.fl4_tos = RTO_ONLINK;
-
-                rt = ip_route_output_key(dev_net(bond->dev), &fl);
+                rt = ip_route_output(dev_net(bond->dev), targets[i], 0,
+                                     RTO_ONLINK, 0);
                 if (IS_ERR(rt)) {
                         if (net_ratelimit()) {
                                 pr_warning("%s: no route to arp_ip_target %pI4\n",
-                                           bond->dev->name, &fl.fl4_dst);
+                                           bond->dev->name, &targets[i]);
                         }
                         continue;
                 }
@@ -2739,7 +2735,7 @@ static void bond_arp_send_all(struct bonding *bond, struct slave *slave)
 
                 if (net_ratelimit()) {
                         pr_warning("%s: no path to arp_ip_target %pI4 via rt.dev %s\n",
-                                   bond->dev->name, &fl.fl4_dst,
+                                   bond->dev->name, &targets[i],
                                    rt->dst.dev ? rt->dst.dev->name : "NULL");
                 }
                 ip_rt_put(rt);
diff --git a/drivers/net/cnic.c b/drivers/net/cnic.c
index 271a1f00c224..65832951fe07 100644
--- a/drivers/net/cnic.c
+++ b/drivers/net/cnic.c
@@ -3407,20 +3407,14 @@ static int cnic_get_v4_route(struct sockaddr_in *dst_addr,
                              struct dst_entry **dst)
 {
 #if defined(CONFIG_INET)
-        struct flowi fl;
-        int err;
         struct rtable *rt;
 
-        memset(&fl, 0, sizeof(fl));
-        fl.nl_u.ip4_u.daddr = dst_addr->sin_addr.s_addr;
-
-        rt = ip_route_output_key(&init_net, &fl);
-        err = 0;
-        if (!IS_ERR(rt))
+        rt = ip_route_output(&init_net, dst_addr->sin_addr.s_addr, 0, 0, 0);
+        if (!IS_ERR(rt)) {
                 *dst = &rt->dst;
-        else
-                err = PTR_ERR(rt);
-        return err;
+                return 0;
+        }
+        return PTR_ERR(rt);
 #else
         return -ENETUNREACH;
 #endif
diff --git a/drivers/net/pptp.c b/drivers/net/pptp.c
index 1af549c89d51..51dfcf8023c7 100644
--- a/drivers/net/pptp.c
+++ b/drivers/net/pptp.c
@@ -189,18 +189,14 @@ static int pptp_xmit(struct ppp_channel *chan, struct sk_buff *skb)
         if (sk_pppox(po)->sk_state & PPPOX_DEAD)
                 goto tx_error;
 
-        {
-                struct flowi fl = { .oif = 0,
-                        .nl_u = {
-                                .ip4_u = {
-                                        .daddr = opt->dst_addr.sin_addr.s_addr,
-                                        .saddr = opt->src_addr.sin_addr.s_addr,
-                                        .tos = RT_TOS(0) } },
-                        .proto = IPPROTO_GRE };
-                rt = ip_route_output_key(&init_net, &fl);
-                if (IS_ERR(rt))
-                        goto tx_error;
-        }
+        rt = ip_route_output_ports(&init_net, NULL,
+                                   opt->dst_addr.sin_addr.s_addr,
+                                   opt->src_addr.sin_addr.s_addr,
+                                   0, 0, IPPROTO_GRE,
+                                   RT_TOS(0), 0);
+        if (IS_ERR(rt))
+                goto tx_error;
+
         tdev = rt->dst.dev;
 
         max_headroom = LL_RESERVED_SPACE(tdev) + sizeof(*iph) + sizeof(*hdr) + 2;
@@ -467,22 +463,17 @@ static int pptp_connect(struct socket *sock, struct sockaddr *uservaddr,
         po->chan.private = sk;
         po->chan.ops = &pptp_chan_ops;
 
-        {
-                struct flowi fl = {
-                        .nl_u = {
-                                .ip4_u = {
-                                        .daddr = opt->dst_addr.sin_addr.s_addr,
-                                        .saddr = opt->src_addr.sin_addr.s_addr,
-                                        .tos = RT_CONN_FLAGS(sk) } },
-                        .proto = IPPROTO_GRE };
-                security_sk_classify_flow(sk, &fl);
-                rt = ip_route_output_key(&init_net, &fl);
-                if (IS_ERR(rt)) {
-                        error = -EHOSTUNREACH;
-                        goto end;
-                }
-                sk_setup_caps(sk, &rt->dst);
+        rt = ip_route_output_ports(&init_net, sk,
+                                   opt->dst_addr.sin_addr.s_addr,
+                                   opt->src_addr.sin_addr.s_addr,
+                                   0, 0,
+                                   IPPROTO_GRE, RT_CONN_FLAGS(sk), 0);
+        if (IS_ERR(rt)) {
+                error = -EHOSTUNREACH;
+                goto end;
         }
+        sk_setup_caps(sk, &rt->dst);
+
         po->chan.mtu = dst_mtu(&rt->dst);
         if (!po->chan.mtu)
                 po->chan.mtu = PPP_MTU;