1 files changed, 2 insertions, 3 deletions

diff --git a/drivers/net/pptp.c b/drivers/net/pptp.c
index ccbc91326bfa..164cfad6ce79 100644
--- a/drivers/net/pptp.c
+++ b/drivers/net/pptp.c
@@ -277,7 +277,7 @@ static int pptp_xmit(struct ppp_channel *chan, struct sk_buff *skb)
         iph->tos      = 0;
         iph->daddr    = rt->rt_dst;
         iph->saddr    = rt->rt_src;
-        iph->ttl      = dst_metric(&rt->dst, RTAX_HOPLIMIT);
+        iph->ttl      = ip4_dst_hoplimit(&rt->dst);
         iph->tot_len  = htons(skb->len);
 
         skb_dst_drop(skb);
@@ -673,8 +673,7 @@ static int __init pptp_init_module(void)
         int err = 0;
         pr_info("PPTP driver version " PPTP_DRIVER_VERSION "\n");
 
-        callid_sock = __vmalloc((MAX_CALLID + 1) * sizeof(void *),
-                GFP_KERNEL | __GFP_ZERO, PAGE_KERNEL);
+        callid_sock = vzalloc((MAX_CALLID + 1) * sizeof(void *));
         if (!callid_sock) {
                 pr_err("PPTP: cann't allocate memory\n");
                 return -ENOMEM;