summaryrefslogtreecommitdiffstats
path: root/drivers/net/hyperv/hyperv_net.h
diff options
context:
space:
mode:
authorstephen hemminger2017-08-07 20:30:00 +0200
committerDavid S. Miller2017-08-09 03:09:52 +0200
commit7b83f52047e8a3d551a9495b0267df5d0754c5bf (patch)
tree06de5d3c75b36b18e501c148a5067833304ca3c0 /drivers/net/hyperv/hyperv_net.h
parentliquidio: fix wrong info about vf rx/tx ring parameters reported to ethtool (diff)
downloadkernel-qcow2-linux-7b83f52047e8a3d551a9495b0267df5d0754c5bf.tar.gz
kernel-qcow2-linux-7b83f52047e8a3d551a9495b0267df5d0754c5bf.tar.xz
kernel-qcow2-linux-7b83f52047e8a3d551a9495b0267df5d0754c5bf.zip
netvsc: make sure and unregister datapath
Go back to switching datapath directly in the notifier callback. Otherwise datapath might not get switched on unregister. No need for calling the NOTIFY_PEERS notifier since that is only for a gratitious ARP/ND packet; but that is not required with Hyper-V because both VF and synthetic NIC have the same MAC address. Reported-by: Vitaly Kuznetsov <vkuznets@redhat.com> Fixes: 0c195567a8f6 ("netvsc: transparent VF management") Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/hyperv/hyperv_net.h')
-rw-r--r--drivers/net/hyperv/hyperv_net.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
index c701b059c5ac..d1ea99a12cf2 100644
--- a/drivers/net/hyperv/hyperv_net.h
+++ b/drivers/net/hyperv/hyperv_net.h
@@ -724,14 +724,11 @@ struct net_device_context {
struct net_device __rcu *vf_netdev;
struct netvsc_vf_pcpu_stats __percpu *vf_stats;
struct work_struct vf_takeover;
- struct work_struct vf_notify;
/* 1: allocated, serial number is valid. 0: not allocated */
u32 vf_alloc;
/* Serial number of the VF to team with */
u32 vf_serial;
-
- bool datapath; /* 0 - synthetic, 1 - VF nic */
};
/* Per channel data */