diff --git a/[refs] b/[refs] index 786fb6eb14b3..d550f839d52a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4d97480b1806e883eb1c7889d4e7a87e936e06d9 +refs/heads/master: 8bae8bd6cb24eecad9fda3e125d36ab9c67d3fd7 diff --git a/trunk/drivers/net/pptp.c b/trunk/drivers/net/pptp.c index eae542a7e987..9c0403d0107c 100644 --- a/trunk/drivers/net/pptp.c +++ b/trunk/drivers/net/pptp.c @@ -285,8 +285,10 @@ static int pptp_xmit(struct ppp_channel *chan, struct sk_buff *skb) ip_send_check(iph); ip_local_out(skb); + return 1; tx_error: + kfree_skb(skb); return 1; }