[net-next] tuntap: remove unnecessary sk_receive_queue length check during xmit
diff mbox series

Message ID 1479868009-14157-1-git-send-email-jasowang@redhat.com
State New, archived
Headers show
Series
  • [net-next] tuntap: remove unnecessary sk_receive_queue length check during xmit
Related show

Commit Message

Jason Wang Nov. 23, 2016, 2:26 a.m. UTC
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>
---
 drivers/net/tun.c | 7 -------
 1 file changed, 7 deletions(-)

Comments

David Miller Nov. 24, 2016, 9:07 p.m. UTC | #1
From: Jason Wang <jasowang@redhat.com>
Date: Wed, 23 Nov 2016 10:26:49 +0800

> 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>

Good catch, applied, thanks Jason.

Patch
diff mbox series

diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 64e694c..e2af2dd 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;