From patchwork Fri Jul 28 15:59:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 794954 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@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; dkim=pass (2048-bit key; unprotected) header.d=networkplumber-org.20150623.gappssmtp.com header.i=@networkplumber-org.20150623.gappssmtp.com header.b="C3PEodzg"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xJtpM27XKz9s5L for ; Sat, 29 Jul 2017 01:59:55 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752167AbdG1P7w (ORCPT ); Fri, 28 Jul 2017 11:59:52 -0400 Received: from mail-pg0-f51.google.com ([74.125.83.51]:33832 "EHLO mail-pg0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751633AbdG1P7v (ORCPT ); Fri, 28 Jul 2017 11:59:51 -0400 Received: by mail-pg0-f51.google.com with SMTP id u185so7077977pgb.1 for ; Fri, 28 Jul 2017 08:59:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=nZPoVoF/+LIRRqpR+br6aJNqpGPl9ntt00RrcBxiPic=; b=C3PEodzgw6jzhZ3IRvLsZ0Z7okF5M6rvpvAwNftR9/IXthlBLA+MxQpbABz4rbt2A5 F6GBlgH4k6f2CCLRPbZFkwIwdlPsNCwTcn1JnUxVg1KM7K2deZ4IzphSojauNxRp5j1j ohTPld1+1DX79HF8KfwOYOXjcRrBuXAgqcxLsznKks2PUf/z2aO2dySEnS6ZFf3abTMF gdyW8TDN7Ek+41f4TReriem438jn3tqeRwlPGNJKPnErwkk63JhSgQJzN32oxpbO7K9+ fo7FhZ9WQXTyddCUiWruJ+kBKLOfnQXD/j6qfSv2C/OKdM2dBHon82qf6ai7S1nHhTD7 HynA== 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; bh=nZPoVoF/+LIRRqpR+br6aJNqpGPl9ntt00RrcBxiPic=; b=VMPElCJNvhXyoZWMdkf/yyFykb/jHl0Qly8jfFUEl5+M6Oy6gHxXGW1B6z7O2Wykqt KkmFe8cZxUMaFtW8orjQM3ZFXspAzKuAfJ88E/o4llBMknLXYLb7qChDi8owV5YEGVG1 FE1M4LQk7UoyBK/xKFdh42Ddvq+7nX0LDjTLOBbEhTj3uR1jEYzlwIuk457IVxO1ykmh 370Dgftjow4GtaxV8IHlscRd83D2M/tq8osu8s0ozqMF90P8O9v9NxuPksQpO74lg0wP MDX8E42maVe3cJVDyAeYxiYYqVl/QrlObFtdZ/gJDo86f39Q9XYuAr0BjGo3v5/LWYw2 osRA== X-Gm-Message-State: AIVw112M44fS6S8asmeD4nxGh9wuh5gUxL0sZbdqkpphHTo2UNqm9Cj6 SKcYJZJQeiVaXijl X-Received: by 10.98.141.70 with SMTP id z67mr7937639pfd.289.1501257590808; Fri, 28 Jul 2017 08:59:50 -0700 (PDT) Received: from xeon-e3.lan (76-14-207-240.or.wavecable.com. [76.14.207.240]) by smtp.gmail.com with ESMTPSA id b64sm43637144pfg.153.2017.07.28.08.59.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 28 Jul 2017 08:59:50 -0700 (PDT) From: Stephen Hemminger X-Google-Original-From: Stephen Hemminger To: kys@microsoft.com, haiyangz@microsoft.com, sthemmin@microsoft.com Cc: devel@linuxdriverproject.org, netdev@vger.kernel.org Subject: [PATCH net-next v3 1/7] netvsc: fix return value for set_channels Date: Fri, 28 Jul 2017 08:59:41 -0700 Message-Id: <20170728155947.10062-2-sthemmin@microsoft.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170728155947.10062-1-sthemmin@microsoft.com> References: <20170728155947.10062-1-sthemmin@microsoft.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The error and normal case got swapped. Signed-off-by: Stephen Hemminger --- drivers/net/hyperv/netvsc_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c index 262486ce8e2a..f1eaf675d2e9 100644 --- a/drivers/net/hyperv/netvsc_drv.c +++ b/drivers/net/hyperv/netvsc_drv.c @@ -758,8 +758,8 @@ static int netvsc_set_channels(struct net_device *net, if (!IS_ERR(nvdev)) { netif_set_real_num_tx_queues(net, nvdev->num_chn); netif_set_real_num_rx_queues(net, nvdev->num_chn); - ret = PTR_ERR(nvdev); } else { + ret = PTR_ERR(nvdev); device_info.num_chn = orig; rndis_filter_device_add(dev, &device_info); }