Merge branch 'next' into for-linus

[firefly-linux-kernel-4.4.55.git] / drivers / net / hyperv / hyperv_net.h

diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
index 41071d32bc8e0e1259726aa647bc8a77324ffdd9..dd4544085db321d2f9020d97ebbbb9a8887ed4b9 100644 (file)
--- a/drivers/net/hyperv/hyperv_net.h
+++ b/drivers/net/hyperv/hyperv_net.h
@@ -161,6 +161,7 @@ struct netvsc_device_info {
        unsigned char mac_adr[ETH_ALEN];
        bool link_state;        /* 0 - link up, 1 - link down */
        int  ring_size;
+       u32  max_num_vrss_chns;
 };
 
 enum rndis_device_state {
@@ -611,6 +612,12 @@ struct multi_send_data {
        u32 count; /* counter of batched packets */
 };
 
+struct netvsc_stats {
+       u64 packets;
+       u64 bytes;
+       struct u64_stats_sync syncp;
+};
+
 /* The context of the netvsc device  */
 struct net_device_context {
        /* point back to our device context */
@@ -618,6 +625,9 @@ struct net_device_context {
        struct delayed_work dwork;
        struct work_struct work;
        u32 msg_enable; /* debug level */
+
+       struct netvsc_stats __percpu *tx_stats;
+       struct netvsc_stats __percpu *rx_stats;
 };
 
 /* Per netvsc device */