From patchwork Mon May 14 22:32:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 913329 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=networkplumber.org 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="vNewW15X"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40lFq46MsNz9s1B for ; Tue, 15 May 2018 08:33:52 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752454AbeENWdv (ORCPT ); Mon, 14 May 2018 18:33:51 -0400 Received: from mail-pg0-f68.google.com ([74.125.83.68]:35731 "EHLO mail-pg0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752235AbeENWcs (ORCPT ); Mon, 14 May 2018 18:32:48 -0400 Received: by mail-pg0-f68.google.com with SMTP id n1-v6so6090732pgs.2 for ; Mon, 14 May 2018 15:32:48 -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=f93QrxrBErc8RHanM4j+z9VbKtUj7qI4kOPpq4+pkVA=; b=vNewW15XQwx3g7WZVgXvjTssPndI0sr47Mml0H6PFr6nsU4Mu8bfttxjhkMNyoKK/A N+IU7tUeTdWpsxKIiRMU42jkRbKiHUZzl8AFEwKgXqDC6M7v4R8LvtVFn9QLv499xTbV 3akRnPuAbZsK7wqg9/wlJmopZ/oJMBKxnczXyErOaPZHG8BCSCjqLYZElXNRdM1azD1/ yICSXU82vRQd08SPFg5Is8aNW1F7HcFKzWl61o50/yJFNjSV+IMoCR7lQkLzYOUBmb7K NBKPIgSme3CY4A084ZaX2RaCGJqF0ElyjfuPHV5zPlKNrJu6gxztBwPQKm5SDVH/wOLv mmcA== 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=f93QrxrBErc8RHanM4j+z9VbKtUj7qI4kOPpq4+pkVA=; b=pAfUWbgNGb8plxvHwRUAJOBb0awMVb2y3zQI8IHrOPcE5PWVQtaJ20yru/eP63Cu6k 62tU0BYDm1YxCxFyMemnpqOHjNcvDG0QXWVkWBSADjoxo4VxU1Zwsn/bR7GZc5svEY4o 0WfhLYYRzTey559dvwn1yj8fNSKTy4nutsMcy90dofiioWa1GRIYCMfPV68TnNClclaH Jfa0J2tPuI+PvAgfd4erSkbk+gKM5ARlUBJxgOFn5JL5XjjiY58AxV9RXezl2sTELVSq aI0gB5lROnZGeP1qqlW/ECVdZNYlyOxKQHeQNoK2up3b/jo2bO0n7LTUik0pl0/VVzt1 H9WA== X-Gm-Message-State: ALKqPwcQlrVEWZkif8wYr/nGgPhnwZNw1FgUvdbiEIis5XT1X2643i9q 5OYc7en5zqCruK8OV8327kbkAA== X-Google-Smtp-Source: AB8JxZq2RE93YBTvkwGoN4k8dFiSI6LsXz0rAIHjirKW2PnUmch1I+YK322OA3FrQvUe3OOixJSHHQ== X-Received: by 2002:a63:62c6:: with SMTP id w189-v6mr10028835pgb.164.1526337167862; Mon, 14 May 2018 15:32:47 -0700 (PDT) Received: from xeon-e3.lan (204-195-35-107.wavecable.com. [204.195.35.107]) by smtp.gmail.com with ESMTPSA id y29-v6sm23827830pff.42.2018.05.14.15.32.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 May 2018 15:32:47 -0700 (PDT) From: Stephen Hemminger X-Google-Original-From: Stephen Hemminger To: davem@davemloft.net Cc: netdev@vger.kernel.org, Stephen Hemminger , Stephen Hemminger Subject: [PATCH net-stable 12/24] hv_netvsc: fix error unwind handling if vmbus_open fails Date: Mon, 14 May 2018 15:32:11 -0700 Message-Id: <20180514223223.25433-13-sthemmin@microsoft.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180514223223.25433-1-sthemmin@microsoft.com> References: <20180514223223.25433-1-sthemmin@microsoft.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Stephen Hemminger commit fcfb4a00d1e514e8313277a01ef919de1113025b upstream Need to delete NAPI association if vmbus_open fails. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller --- drivers/net/hyperv/netvsc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c index 839b9d6ecb41..b7720b65f5d6 100644 --- a/drivers/net/hyperv/netvsc.c +++ b/drivers/net/hyperv/netvsc.c @@ -1288,7 +1288,6 @@ struct netvsc_device *netvsc_device_add(struct hv_device *device, net_device->chan_table); if (ret != 0) { - netif_napi_del(&net_device->chan_table[0].napi); netdev_err(ndev, "unable to open channel: %d\n", ret); goto cleanup; } @@ -1321,6 +1320,7 @@ struct netvsc_device *netvsc_device_add(struct hv_device *device, vmbus_close(device->channel); cleanup: + netif_napi_del(&net_device->chan_table[0].napi); free_netvsc_device(&net_device->rcu); return ERR_PTR(ret);