Message ID | 53856D51.40304@gmail.com |
---|---|
State | RFC, archived |
Delegated to: | David Miller |
Headers | show |
--- drivers/net/tun.c +++ drivers/net/tun.c @@ -1343,7 +1343,7 @@ /* Read frames from queue */ skb = __skb_recv_datagram(tfile->socket.sk, noblock ? MSG_DONTWAIT : 0, - &peeked, &off, &err); + &peeked, &off, &err, timeop); if (skb) { ret = tun_put_user(tun, tfile, skb, iv, len); kfree_skb(skb);