hv_netvsc: Fix VF register on vlan devices
authorHaiyang Zhang <haiyangz@microsoft.com>
Thu, 2 Jun 2016 19:02:04 +0000 (12:02 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 3 Jun 2016 23:40:05 +0000 (19:40 -0400)
Added a condition to avoid vlan devices with same MAC registering
as VF.

Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Reviewed-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/hyperv/netvsc_drv.c

index 6a69b5c..5ac1267 100644 (file)
@@ -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);