From d9e45c1c63a0591a3fd81e85bbcc5ccdb97b1965 Mon Sep 17 00:00:00 2001 From: Gao feng Date: Tue, 7 Aug 2012 00:23:11 +0000 Subject: [PATCH] --- yaml --- r: 321571 b: refs/heads/master c: 08252b32311c3fa84219ad794d640af7399b5485 h: refs/heads/master i: 321569: 0182d77e08b63931dc4738ef53f878974105c6a4 321567: cdbc1ad42f4b7c266b9c99e704cc9b7e9a4d3816 v: v3 --- [refs] | 2 +- trunk/drivers/net/ppp/pptp.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c0e619206c76..80bdd11f25bd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d933d2beb1e416f62bf56fe002e5451414f9a9d2 +refs/heads/master: 08252b32311c3fa84219ad794d640af7399b5485 diff --git a/trunk/drivers/net/ppp/pptp.c b/trunk/drivers/net/ppp/pptp.c index 1c98321b56cc..162464fe86bf 100644 --- a/trunk/drivers/net/ppp/pptp.c +++ b/trunk/drivers/net/ppp/pptp.c @@ -189,7 +189,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, &fl4, NULL, + rt = ip_route_output_ports(sock_net(sk), &fl4, NULL, opt->dst_addr.sin_addr.s_addr, opt->src_addr.sin_addr.s_addr, 0, 0, IPPROTO_GRE, @@ -468,7 +468,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, &fl4, sk, + rt = ip_route_output_ports(sock_net(sk), &fl4, sk, opt->dst_addr.sin_addr.s_addr, opt->src_addr.sin_addr.s_addr, 0, 0,