aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/hyperv/netvsc_drv.c
diff options
context:
space:
mode:
authorHaiyang Zhang <haiyangz@microsoft.com>2016-07-22 18:14:50 -0700
committerDavid S. Miller <davem@davemloft.net>2016-07-25 11:19:22 -0700
commite2b9f1f7af1dfe20df8e68849ebb4bbafed5727a (patch)
tree6ab502bcaba25b9b9114ab2007279bf100537d7c /drivers/net/hyperv/netvsc_drv.c
parentkcm: remove redundant -ve error check and return path (diff)
downloadlinux-dev-e2b9f1f7af1dfe20df8e68849ebb4bbafed5727a.tar.xz
linux-dev-e2b9f1f7af1dfe20df8e68849ebb4bbafed5727a.zip
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 <haiyangz@microsoft.com> Reviewed-by: K. Y. Srinivasan <kys@microsoft.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
-rw-r--r--drivers/net/hyperv/netvsc_drv.c4
1 files 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) {