diff options
| author | David S. Miller <davem@davemloft.net> | 2016-09-23 08:39:54 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-09-23 08:39:54 -0400 |
| commit | c14fec3969b0e8af5c38ad9f14198d6d7cca54d0 (patch) | |
| tree | c8dc065962c44292584cd7c48e8d6bcaeb613bb3 /drivers/net/hyperv/hyperv_net.h | |
| parent | dd5a3005eb09b84d759dda43b1ae662bb223d2ac (diff) | |
| parent | f7ad75b753f386454f50044fd69edad767b69ce8 (diff) | |
Merge branch 'hv_netvsc-next'
Stephen Hemminger says:
====================
hv_netvsc changes
These are mostly about improving the handling of interaction between
the virtual network device (netvsc) and the SR-IOV VF network device.
====================
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.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h index 284b97b6b258..7130bf910f52 100644 --- a/drivers/net/hyperv/hyperv_net.h +++ b/drivers/net/hyperv/hyperv_net.h @@ -649,6 +649,8 @@ struct multi_recv_comp { struct netvsc_stats { u64 packets; u64 bytes; + u64 broadcast; + u64 multicast; struct u64_stats_sync syncp; }; @@ -695,9 +697,8 @@ struct net_device_context { bool start_remove; /* State to manage the associated VF interface. */ - struct net_device *vf_netdev; - bool vf_inject; - atomic_t vf_use_cnt; + struct net_device __rcu *vf_netdev; + /* 1: allocated, serial number is valid. 0: not allocated */ u32 vf_alloc; /* Serial number of the VF to team with */ |