From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933041AbcFBRUy (ORCPT ); Thu, 2 Jun 2016 13:20:54 -0400 Received: from p3plsmtps2ded04.prod.phx3.secureserver.net ([208.109.80.198]:53773 "EHLO p3plsmtps2ded04.prod.phx3.secureserver.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751963AbcFBRUx (ORCPT ); Thu, 2 Jun 2016 13:20:53 -0400 x-originating-ip: 72.167.245.219 From: Haiyang Zhang To: davem@davemloft.net, netdev@vger.kernel.org Cc: haiyangz@microsoft.com, kys@microsoft.com, olaf@aepfle.de, vkuznets@redhat.com, linux-kernel@vger.kernel.org, driverdev-devel@linuxdriverproject.org Subject: [PATCH net-next] hv_netvsc: Fix VF register on vlan devices Date: Thu, 2 Jun 2016 12:02:04 -0700 Message-Id: <1464894124-11450-1-git-send-email-haiyangz@microsoft.com> X-Mailer: git-send-email 1.7.4.1 X-CMAE-Envelope: MS4wfOrDS/+l5CKd8Zw3lNemLZhVcHOu+7FbgbbdvekWh1yZTq6Deqp1IZ2vGbBAakqQfUroNYxuxXM8MdjKGTI6rhcJL9v+dy5p2lUfBu9jIH5fJ+RaSVSk VClxuTK9hRy1YqkJGZKBkdEc8tb08K6EIp5OkPicf2/YZyPDLm2bn8rcPLt7T6rMGULgi1bOgeQ+58k0KwUBk+Amyhnozy3RtYMXbhI2CNUlwMG4JHVe2J4L 1HuyrL/mdbdU0XyigrmwoPjwQNIAPbexuzIKniBuE8NSPkvAJVyez5hzzmAby1rHDeo0JPnmAeJHZDgCirmOzEPZBzL4mM29eDyjfvnkrtiqSKMml2MTprpE nQLq8jh9BICyQEapyDN4j12IDoFAf54M6Cv4ycLAkuZx7XoTPQDqYBTJ2UrOgUYiKi0eYsKHtFyOu1ylmeu/GAGlWTClVQ== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Added a condition to avoid vlan devices with same MAC registering as VF. Signed-off-by: Haiyang Zhang Reviewed-by: K. Y. Srinivasan --- drivers/net/hyperv/netvsc_drv.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c index 6a69b5c..5ac1267 100644 --- a/drivers/net/hyperv/netvsc_drv.c +++ b/drivers/net/hyperv/netvsc_drv.c @@ -1500,6 +1500,10 @@ static int netvsc_netdev_event(struct notifier_block *this, { struct net_device *event_dev = netdev_notifier_info_to_dev(ptr); + /* Avoid Vlan dev with same MAC registering as VF */ + if (event_dev->priv_flags & IFF_802_1Q_VLAN) + return NOTIFY_DONE; + switch (event) { case NETDEV_REGISTER: return netvsc_register_vf(event_dev); -- 1.7.4.1