summaryrefslogtreecommitdiffstats
path: root/drivers/net/tun.c
diff options
context:
space:
mode:
authorJason Wang <jasowang@redhat.com>2016-11-23 03:26:49 +0100
committerDavid S. Miller <davem@davemloft.net>2016-11-24 22:06:56 +0100
commit436accebb53021ef7c63535f60bda410aa87c136 (patch)
tree08b17a57a6ab38417ceff1c9979521f21e7d96f0 /drivers/net/tun.c
parentsamples/bpf: fix bpf loader (diff)
downloadlinux-436accebb53021ef7c63535f60bda410aa87c136.tar.xz
linux-436accebb53021ef7c63535f60bda410aa87c136.zip
tuntap: remove unnecessary sk_receive_queue length check during xmit
After commit 1576d9860599 ("tun: switch to use skb array for tx"), sk_receive_queue was not used any more. So remove the uncessary sk_receive_queue length check during xmit. Signed-off-by: Jason Wang <jasowang@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/tun.c')
-rw-r--r--drivers/net/tun.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 64e694c68d99..e2af2dd544f0 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -878,13 +878,6 @@ static netdev_tx_t tun_net_xmit(struct sk_buff *skb, struct net_device *dev)
sk_filter(tfile->socket.sk, skb))
goto drop;
- /* Limit the number of packets queued by dividing txq length with the
- * number of queues.
- */
- if (skb_queue_len(&tfile->socket.sk->sk_receive_queue) * numqueues
- >= dev->tx_queue_len)
- goto drop;
-
if (unlikely(skb_orphan_frags(skb, GFP_ATOMIC)))
goto drop;