ipv4: Make caller provide on-stack flow key to ip_route_output_ports().

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

1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/net/pptp.c b/drivers/net/pptp.c
index 51dfcf8023c7..e771e8d27eb7 100644
--- a/drivers/net/pptp.c
+++ b/drivers/net/pptp.c
@@ -175,6 +175,7 @@ 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);
+        struct flowi4 fl4;
         int islcp;
         int len;
         unsigned char *data;
@@ -189,7 +190,7 @@ static int pptp_xmit(struct ppp_channel *chan, struct sk_buff *skb)
         if (sk_pppox(po)->sk_state & PPPOX_DEAD)
                 goto tx_error;
 
-        rt = ip_route_output_ports(&init_net, NULL,
+        rt = ip_route_output_ports(&init_net, &fl4, NULL,
                                    opt->dst_addr.sin_addr.s_addr,
                                    opt->src_addr.sin_addr.s_addr,
                                    0, 0, IPPROTO_GRE,
@@ -434,6 +435,7 @@ static int pptp_connect(struct socket *sock, struct sockaddr *uservaddr,
         struct pppox_sock *po = pppox_sk(sk);
         struct pptp_opt *opt = &po->proto.pptp;
         struct rtable *rt;
+        struct flowi4 fl4;
         int error = 0;
 
         if (sp->sa_protocol != PX_PROTO_PPTP)
@@ -463,7 +465,7 @@ static int pptp_connect(struct socket *sock, struct sockaddr *uservaddr,
         po->chan.private = sk;
         po->chan.ops = &pptp_chan_ops;
 
-        rt = ip_route_output_ports(&init_net, sk,
+        rt = ip_route_output_ports(&init_net, &fl4, sk,
                                    opt->dst_addr.sin_addr.s_addr,
                                    opt->src_addr.sin_addr.s_addr,
                                    0, 0,