ipv4: Make output route lookup return rtable directly.

Instead of on the stack.

Signed-off-by: David S. Miller <davem@davemloft.net>

3 files changed, 12 insertions, 9 deletions

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 584f97b73060..0592e6da15a6 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -2681,7 +2681,7 @@ static void bond_arp_send(struct net_device *slave_dev, int arp_op, __be32 dest_
 
 static void bond_arp_send_all(struct bonding *bond, struct slave *slave)
 {
-        int i, vlan_id, rv;
+        int i, vlan_id;
         __be32 *targets = bond->params.arp_targets;
         struct vlan_entry *vlan;
         struct net_device *vlan_dev;
@@ -2708,8 +2708,8 @@ static void bond_arp_send_all(struct bonding *bond, struct slave *slave)
                 fl.fl4_dst = targets[i];
                 fl.fl4_tos = RTO_ONLINK;
 
-                rv = ip_route_output_key(dev_net(bond->dev), &rt, &fl);
-                if (rv) {
+                rt = ip_route_output_key(dev_net(bond->dev), &fl);
+                if (IS_ERR(rt)) {
                         if (net_ratelimit()) {
                                 pr_warning("%s: no route to arp_ip_target %pI4\n",
                                            bond->dev->name, &fl.fl4_dst);
diff --git a/drivers/net/cnic.c b/drivers/net/cnic.c
index 5274de3e1bb9..25f08880ae0f 100644
--- a/drivers/net/cnic.c
+++ b/drivers/net/cnic.c
@@ -3397,9 +3397,12 @@ static int cnic_get_v4_route(struct sockaddr_in *dst_addr,
         memset(&fl, 0, sizeof(fl));
         fl.nl_u.ip4_u.daddr = dst_addr->sin_addr.s_addr;
 
-        err = ip_route_output_key(&init_net, &rt, &fl);
-        if (!err)
+        rt = ip_route_output_key(&init_net, &fl);
+        err = 0;
+        if (!IS_ERR(rt))
                 *dst = &rt->dst;
+        else
+                err = PTR_ERR(rt);
         return err;
 #else
         return -ENETUNREACH;
diff --git a/drivers/net/pptp.c b/drivers/net/pptp.c
index 164cfad6ce79..1af549c89d51 100644
--- a/drivers/net/pptp.c
+++ b/drivers/net/pptp.c
@@ -175,7 +175,6 @@ static int pptp_xmit(struct ppp_channel *chan, struct sk_buff *skb)
         struct pptp_opt *opt = &po->proto.pptp;
         struct pptp_gre_header *hdr;
         unsigned int header_len = sizeof(*hdr);
-        int err = 0;
         int islcp;
         int len;
         unsigned char *data;
@@ -198,8 +197,8 @@ static int pptp_xmit(struct ppp_channel *chan, struct sk_buff *skb)
                                         .saddr = opt->src_addr.sin_addr.s_addr,
                                         .tos = RT_TOS(0) } },
                         .proto = IPPROTO_GRE };
-                err = ip_route_output_key(&init_net, &rt, &fl);
-                if (err)
+                rt = ip_route_output_key(&init_net, &fl);
+                if (IS_ERR(rt))
                         goto tx_error;
         }
         tdev = rt->dst.dev;
@@ -477,7 +476,8 @@ static int pptp_connect(struct socket *sock, struct sockaddr *uservaddr,
                                         .tos = RT_CONN_FLAGS(sk) } },
                         .proto = IPPROTO_GRE };
                 security_sk_classify_flow(sk, &fl);
-                if (ip_route_output_key(&init_net, &rt, &fl)) {
+                rt = ip_route_output_key(&init_net, &fl);
+                if (IS_ERR(rt)) {
                         error = -EHOSTUNREACH;
                         goto end;
                 }