From patchwork Wed Jul 29 20:51:43 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phil Sutter X-Patchwork-Id: 501840 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 051FE1402F0 for ; Thu, 30 Jul 2015 06:51:52 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753958AbbG2Uvs (ORCPT ); Wed, 29 Jul 2015 16:51:48 -0400 Received: from orbit.nwl.cc ([176.31.251.142]:53151 "EHLO mail.nwl.cc" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753819AbbG2Uvr (ORCPT ); Wed, 29 Jul 2015 16:51:47 -0400 Received: from mail.nwl.cc (orbit [127.0.0.1]) by mail.nwl.cc (Postfix) with ESMTP id 16FC021483; Wed, 29 Jul 2015 22:51:45 +0200 (CEST) Received: by mail.nwl.cc (Postfix, from userid 1000) id 457362141D; Wed, 29 Jul 2015 22:51:44 +0200 (CEST) From: Phil Sutter To: netdev@vger.kernel.org Cc: Jesper Dangaard Brouer , Cong Wang , Eric Dumazet , David Miller Subject: [net-next PATCH 3/3] veth: don't assign a qdisc to veth Date: Wed, 29 Jul 2015 22:51:43 +0200 Message-Id: <1438203103-27013-4-git-send-email-phil@nwl.cc> X-Mailer: git-send-email 2.1.2 In-Reply-To: <1438203103-27013-3-git-send-email-phil@nwl.cc> References: <1438203103-27013-1-git-send-email-phil@nwl.cc> <1438203103-27013-2-git-send-email-phil@nwl.cc> <1438203103-27013-3-git-send-email-phil@nwl.cc> X-Virus-Scanned: ClamAV using ClamSMTP Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jesper Dangaard Brouer The veth driver is a virtual device, and should not have assigned the default qdisc. Verified (ndo_start_xmit) veth_xmit can only return NETDEV_TX_OK, thus this should be safe to bypass qdisc. Not assigning a qdisc is subtly done by setting tx_queue_len to zero. Reported-by: Mrunal Patel Signed-off-by: Jesper Dangaard Brouer Signed-off-by: Phil Sutter --- drivers/net/veth.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/veth.c b/drivers/net/veth.c index c8186ff..6b3d822 100644 --- a/drivers/net/veth.c +++ b/drivers/net/veth.c @@ -302,6 +302,7 @@ static const struct net_device_ops veth_netdev_ops = { static void veth_setup(struct net_device *dev) { ether_setup(dev); + dev->tx_queue_len = 0; dev->priv_flags &= ~IFF_TX_SKB_SHARING; dev->priv_flags |= IFF_LIVE_ADDR_CHANGE;