From e2b9f1f7af1dfe20df8e68849ebb4bbafed5727a Mon Sep 17 00:00:00 2001 From: Haiyang Zhang Date: Fri, 22 Jul 2016 18:14:50 -0700 Subject: hv_netvsc: Fix VF register on bonding devices Added a condition to avoid bonding devices with same MAC registering as VF. Signed-off-by: Haiyang Zhang Reviewed-by: K. Y. Srinivasan Signed-off-by: David S. Miller --- drivers/net/hyperv/netvsc_drv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c index 787a20235e5c..41bd952cc28d 100644 --- a/drivers/net/hyperv/netvsc_drv.c +++ b/drivers/net/hyperv/netvsc_drv.c @@ -1494,8 +1494,8 @@ 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) + /* Avoid Vlan, Bonding dev with same MAC registering as VF */ + if (event_dev->priv_flags & (IFF_802_1Q_VLAN | IFF_BONDING)) return NOTIFY_DONE; switch (event) { -- cgit v1.2.3