From patchwork Wed Mar 27 18:38:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 1067304 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=netronome.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=netronome-com.20150623.gappssmtp.com header.i=@netronome-com.20150623.gappssmtp.com header.b="UtyGp5g1"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44Txbh5qnjz9sWC for ; Thu, 28 Mar 2019 05:38:56 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2392045AbfC0Si4 (ORCPT ); Wed, 27 Mar 2019 14:38:56 -0400 Received: from mail-qk1-f193.google.com ([209.85.222.193]:44024 "EHLO mail-qk1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391641AbfC0Siw (ORCPT ); Wed, 27 Mar 2019 14:38:52 -0400 Received: by mail-qk1-f193.google.com with SMTP id c20so10548403qkc.10 for ; Wed, 27 Mar 2019 11:38:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netronome-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HDqx7f7cd0d+WnO7WAaHmbRoJlfAPpVUZhUYcmvauBM=; b=UtyGp5g1QyXsaII6uLOODbGWusbdlYpGIMQOw4hyYI5Lh/6IvlBZdR30mRYy6spRiB q6U5pC43QUEMWw8bd4jdlZEMcYpA9R+QcbcdZJva8YdIFMD5esnwan3bPLQSPsHOXDag S+ejvXokm4lPgxnvM1l/fjLfmN0CyZWeIl2l5fNUpF/A9GM1naKSED9qxsTupo8z01mz 7BV3Sg4GSyhWOpRxn2NnSw9vdNMYAfLhCVVH/MsGRFWZiKCmNIqY4WoJ8dy/d+FNxSGR /wrPEc0dFxCVlt19lPxTExxiAlfBWVe1ifA5rOeLNjTs2EU/A1FpsGv/VMvkz3VkU4/l 12kg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HDqx7f7cd0d+WnO7WAaHmbRoJlfAPpVUZhUYcmvauBM=; b=XApd9VWFwGLTVCrrL6cRiajzxxVrRj4vttvyIxjcFr/THz8nZxvDe6RYyCDCO7z8yV qMGKXJdIy79DU1Nuy8vgGxMFiYeD6FFBiKMXM1ExHpO8aTMfilkE+WjhJykRyRt6as0H kSGbL7DVWkobH20oZnY9/ZvVVoditkSOaw75Ww/aw+mD+Qs7E49gDsePKAtfgARN8o27 bCW4L3mSyaeUsuGfWq2RPOrcBnPOS6eg5z7WcWW5vgRC9IkWjB95s7rWWeAxg7oD4KXr TRcYslDesV8eVJLzJywyZaOdn9iso30n3irvMEia5ZNi3X7p0lDqNbYW2nKBYR7cB1sr 93ZQ== X-Gm-Message-State: APjAAAWTHaF13g9vTRi7MkRnvM5t/5od3kNX/gLmX+duZ5FhZpJxprhf MmFkQ+ozoXq7smL/noIektFGrA== X-Google-Smtp-Source: APXvYqwX34VeDww9Tnz7dydMErQdGcfxvI7hzrHfwH0cyp2GYSB/uDLQXK7I9xuNs3ix/DQrZH92TA== X-Received: by 2002:a05:620a:1591:: with SMTP id d17mr1903832qkk.39.1553711931342; Wed, 27 Mar 2019 11:38:51 -0700 (PDT) Received: from jkicinski-Precision-T1700.netronome.com ([66.60.152.14]) by smtp.gmail.com with ESMTPSA id i20sm11445442qkk.70.2019.03.27.11.38.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Mar 2019 11:38:50 -0700 (PDT) From: Jakub Kicinski To: davem@davemloft.net Cc: oss-drivers@netronome.com, netdev@vger.kernel.org, Jakub Kicinski , John Hurley , Simon Horman Subject: [PATCH net 1/2] nfp: validate the return code from dev_queue_xmit() Date: Wed, 27 Mar 2019 11:38:38 -0700 Message-Id: <20190327183839.18889-2-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190327183839.18889-1-jakub.kicinski@netronome.com> References: <20190327183839.18889-1-jakub.kicinski@netronome.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org dev_queue_xmit() may return error codes as well as netdev_tx_t, and it always consumes the skb. Make sure we always return a correct netdev_tx_t value. Fixes: eadfa4c3be99 ("nfp: add stats and xmit helpers for representors") Signed-off-by: Jakub Kicinski Reviewed-by: John Hurley Reviewed-by: Simon Horman --- drivers/net/ethernet/netronome/nfp/nfp_net_repr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_repr.c b/drivers/net/ethernet/netronome/nfp/nfp_net_repr.c index d2c803bb4e56..7b46fce2e81e 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_net_repr.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_net_repr.c @@ -195,7 +195,7 @@ static netdev_tx_t nfp_repr_xmit(struct sk_buff *skb, struct net_device *netdev) ret = dev_queue_xmit(skb); nfp_repr_inc_tx_stats(netdev, len, ret); - return ret; + return NETDEV_TX_OK; } static int nfp_repr_stop(struct net_device *netdev)