diff --git a/[refs] b/[refs] index 8727dcb96d05..c75221857f97 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5c659322a904a7cc0265e7b183372b9bdebec6db +refs/heads/master: 0110d6f22f392f976e84ab49da1b42f85b64a3c5 diff --git a/trunk/drivers/net/tun.c b/trunk/drivers/net/tun.c index 96c39bddc78c..43265207d463 100644 --- a/trunk/drivers/net/tun.c +++ b/trunk/drivers/net/tun.c @@ -387,6 +387,10 @@ static netdev_tx_t tun_net_xmit(struct sk_buff *skb, struct net_device *dev) } } + /* Orphan the skb - required as we might hang on to it + * for indefinite time. */ + skb_orphan(skb); + /* Enqueue packet */ skb_queue_tail(&tun->socket.sk->sk_receive_queue, skb); dev->trans_start = jiffies;