From patchwork Fri Oct 23 19:14:36 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Krause X-Patchwork-Id: 535287 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 2925E141310 for ; Sat, 24 Oct 2015 08:40:00 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=QiSkaOAb; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 6D9379097E; Fri, 23 Oct 2015 21:39:59 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id cjm4EkAIWLKJ; Fri, 23 Oct 2015 21:39:58 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 8447990985; Fri, 23 Oct 2015 21:39:57 +0000 (UTC) X-Original-To: intel-wired-lan@lists.osuosl.org Delivered-To: intel-wired-lan@lists.osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id A1F201C1F02 for ; Fri, 23 Oct 2015 19:14:43 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 9B5DD9451B for ; Fri, 23 Oct 2015 19:14:43 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id wvteVuqu5UI3 for ; Fri, 23 Oct 2015 19:14:41 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-qg0-f53.google.com (mail-qg0-f53.google.com [209.85.192.53]) by hemlock.osuosl.org (Postfix) with ESMTPS id 7682086371 for ; Fri, 23 Oct 2015 19:14:41 +0000 (UTC) Received: by qgad10 with SMTP id d10so74343351qga.3 for ; Fri, 23 Oct 2015 12:14:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=IWs3kKz5+asajZPHOmrcCGW3XOjj7qj+s+tPdlF2820=; b=QiSkaOAbmpeqHj+DcktuvFggUZ07H7XfOWZcaQpKfTBgKB3NB0vBICWCf2yMsulHeL HJKBmiBlLT5lbNYsWznF3RC0ymBxO+vvylo8oa+KuM2iUZttI/dDfWoVP+L9oGdpBoiu WHZvog0BE7YAU/Yxj9EAGnizR07GJVmrzUwyNMaAM/M8LIjyuYYef/bTM/31T70Wscqm 0+RefBuXNVo0N8C/be0+UuKq3sQ+ec399X8tOxtLKz/lxNAteavH8CfxTNxEweTm3OAw K5ZjAyEwGjWIbF+I3x0dMd0j0GFbagI3VT4dfSq/mj8fkp0FaGYjJMHdKgT1ehLz3HLU 1smQ== X-Received: by 10.140.152.134 with SMTP id 128mr28890611qhy.65.1445627680667; Fri, 23 Oct 2015 12:14:40 -0700 (PDT) Received: from nick-System-Product-Name.hitronhub.home (CPEbc4dfb2691f3-CMbc4dfb2691f0.cpe.net.cable.rogers.com. [99.231.110.121]) by smtp.googlemail.com with ESMTPSA id k4sm8017899qkl.26.2015.10.23.12.14.38 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 23 Oct 2015 12:14:39 -0700 (PDT) From: Nicholas Krause To: jeffrey.t.kirsher@intel.com Date: Fri, 23 Oct 2015 15:14:36 -0400 Message-Id: <1445627676-3977-1-git-send-email-xerofoify@gmail.com> X-Mailer: git-send-email 2.1.4 X-Mailman-Approved-At: Fri, 23 Oct 2015 21:39:55 +0000 Cc: linux-kernel@vger.kernel.org, intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org Subject: [Intel-wired-lan] [PATCH] i40e:Fix variable assignment in the function i40e_set_ringparam X-BeenThere: intel-wired-lan@lists.osuosl.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Intel Wired Ethernet Linux Kernel Driver Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-wired-lan-bounces@lists.osuosl.org Sender: "Intel-wired-lan" This fixes variable assignment in the function i40e_set_ringparam to properly assign the internal variable to the return value of the call to the function i40e_up to properly allow us to signal the caller when a error has occurred when trying to bring up the device rather then assume incorrectly that it always succeeds for this particular call in the function i40e_set_ringparm. Signed-off-by: Nicholas Krause --- drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c index e972b5e..13ef808 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c +++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c @@ -1233,7 +1233,7 @@ static int i40e_set_ringparam(struct net_device *netdev, rx_rings = NULL; } - i40e_up(vsi); + err = i40e_up(vsi); free_tx: /* error cleanup if the Rx allocations failed after getting Tx */