From patchwork Mon May 14 22:32:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 913324 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="Vm5xrkON"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40lFpR65n2z9s08 for ; Tue, 15 May 2018 08:33:19 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752371AbeENWdN (ORCPT ); Mon, 14 May 2018 18:33:13 -0400 Received: from mail-pl0-f68.google.com ([209.85.160.68]:33516 "EHLO mail-pl0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752343AbeENWdF (ORCPT ); Mon, 14 May 2018 18:33:05 -0400 Received: by mail-pl0-f68.google.com with SMTP id n10-v6so8180006plp.0 for ; Mon, 14 May 2018 15:33:05 -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=SBlXVT/J7RcugpV5CLyIcAnRc5CqHQwBRcS1d8qR2Lk=; b=Vm5xrkONTvXNwLJlgQ/VBTl7ZnYuAUeVbS+o8PYnJIJ2U7AF5uFyq+3gzc/E3i9TlV e/8ilvEyQ/Mg7TtRNsriV/61TWHi3iT50Q3swZJHyQ5YX+ilrpl80ml0WF4OnwFR52C6 hEOvo6E4lcEkmUJ406K0nBEtolmlVHCqzHeeA9FjWIgoS+CWSbEyLonW1k+Voedsli0S CnSzLaHd0ZqB0u2Jtbk/nNBStgZkFPpOvl3l9LOm/KGLPaDSgEMbcFcAH7wrjPmv+42q o8SOKrFJvWRs/Gy1dXWl/vg03ygLceBXq6mtR7+0qUvPb6iuZ2TFqOUY8MN03HZf+PsV SIIw== 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=SBlXVT/J7RcugpV5CLyIcAnRc5CqHQwBRcS1d8qR2Lk=; b=C+7f8FpyHqPVpoyUbdOnRFxksriYG0IOOAB+F2SOz4XUK4E3bVTipTxW0IpIYagnSV Bcnu3TWNp/TRmXGdHVOu/XrtWmQgEcsoVEBwTYi3QaqiTxFrbAHv0oFmyuvubtqUmPV0 5Sf05uqKBFJ7EFNmgH/0qGkGtaBpwWyTIQtnGsUgWWr6DeB9PqaChmzG0xcGO8/n0DZI vZMKw/7K+AniB/yi1MBOKWYWF9EA+olOjwQ8N1j3l6XR7urmZmrizD/em6/oOngMIALX PG6x5p3cE/5DDqyR7+Gfv4RK3g1HgvH3Q6efGwIc0HA3z5HKkpk+jBhy9AfLtVDs6Smz te2Q== X-Gm-Message-State: ALKqPwc/t6TIhRKoNUOFqfl6rhj0V0PoxpYa0AEwGoCdILD8xMsWAPUk CvsWfuXcQdu9S/JvaTfaBYlamg== X-Google-Smtp-Source: AB8JxZrwezqOgXUtzq+1mRSAb52rokNTaMDKMo0yx25StWFx4NUXKHFW4EzU9cGxqS7ksteXOs5JFA== X-Received: by 2002:a17:902:a714:: with SMTP id w20-v6mr11317170plq.374.1526337184638; Mon, 14 May 2018 15:33:04 -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.33.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 May 2018 15:33:03 -0700 (PDT) From: Stephen Hemminger X-Google-Original-From: Stephen Hemminger To: davem@davemloft.net Cc: netdev@vger.kernel.org, Stephen Hemminger Subject: [PATCH net-stable 24/24] hv_netvsc: set master device Date: Mon, 14 May 2018 15:32:23 -0700 Message-Id: <20180514223223.25433-25-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 97f3efb64323beb0690576e9d74e94998ad6e82a upstream The hyper-v transparent bonding should have used master_dev_link. The netvsc device should look like a master bond device not like the upper side of a tunnel. This makes the semantics the same so that userspace applications looking at network devices see the correct master relationshipship. Fixes: 0c195567a8f6 ("netvsc: transparent VF management") Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller --- drivers/net/hyperv/netvsc_drv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c index be4b15b63355..11b46c8d2d67 100644 --- a/drivers/net/hyperv/netvsc_drv.c +++ b/drivers/net/hyperv/netvsc_drv.c @@ -1778,7 +1778,8 @@ static int netvsc_vf_join(struct net_device *vf_netdev, goto rx_handler_failed; } - ret = netdev_upper_dev_link(vf_netdev, ndev); + ret = netdev_master_upper_dev_link(vf_netdev, ndev, + NULL, NULL); if (ret != 0) { netdev_err(vf_netdev, "can not set master device %s (err = %d)\n",