summaryrefslogtreecommitdiff
path: root/drivers/net/ppp
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2015-10-07 16:48:38 -0500
committerDavid S. Miller <davem@davemloft.net>2015-10-08 04:26:57 -0700
commite2cb77db089796f163092326ca25512845df7a3a (patch)
treed3ebd206afc735e0a6b3cb5ffe959774fd5d1e56 /drivers/net/ppp
parentb92dacd45698e120104ff81066ceb534916090d9 (diff)
ipv4: Merge ip_local_out and ip_local_out_sk
It is confusing and silly hiding a parameter so modify all of the callers to pass in the appropriate socket or skb->sk if no socket is known. Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ppp')
-rw-r--r--drivers/net/ppp/pptp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ppp/pptp.c b/drivers/net/ppp/pptp.c
index 686f37daa262..6bef7be10671 100644
--- a/drivers/net/ppp/pptp.c
+++ b/drivers/net/ppp/pptp.c
@@ -282,7 +282,7 @@ static int pptp_xmit(struct ppp_channel *chan, struct sk_buff *skb)
ip_select_ident(sock_net(sk), skb, NULL);
ip_send_check(iph);
- ip_local_out(skb);
+ ip_local_out(skb->sk, skb);
return 1;
tx_error: