1 files changed, 33 insertions, 0 deletions

diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
index dd4544085db3..5fa98f599b3d 100644
--- a/drivers/net/hyperv/hyperv_net.h
+++ b/drivers/net/hyperv/hyperv_net.h
@@ -162,6 +162,7 @@ struct netvsc_device_info {
         bool link_state;        /* 0 - link up, 1 - link down */
         int  ring_size;
         u32  max_num_vrss_chns;
+        u32  num_chn;
 };
 
 enum rndis_device_state {
@@ -541,6 +542,29 @@ union nvsp_2_message_uber {
         struct nvsp_2_free_rxbuf free_rxbuf;
 } __packed;
 
+struct nvsp_4_send_vf_association {
+        /* 1: allocated, serial number is valid. 0: not allocated */
+        u32 allocated;
+
+        /* Serial number of the VF to team with */
+        u32 serial;
+} __packed;
+
+enum nvsp_vm_datapath {
+        NVSP_DATAPATH_SYNTHETIC = 0,
+        NVSP_DATAPATH_VF,
+        NVSP_DATAPATH_MAX
+};
+
+struct nvsp_4_sw_datapath {
+        u32 active_datapath; /* active data path in VM */
+} __packed;
+
+union nvsp_4_message_uber {
+        struct nvsp_4_send_vf_association vf_assoc;
+        struct nvsp_4_sw_datapath active_dp;
+} __packed;
+
 enum nvsp_subchannel_operation {
         NVSP_SUBCHANNEL_NONE = 0,
         NVSP_SUBCHANNEL_ALLOCATE,
@@ -578,6 +602,7 @@ union nvsp_all_messages {
         union nvsp_message_init_uber init_msg;
         union nvsp_1_message_uber v1_msg;
         union nvsp_2_message_uber v2_msg;
+        union nvsp_4_message_uber v4_msg;
         union nvsp_5_message_uber v5_msg;
 } __packed;
 
@@ -589,6 +614,7 @@ struct nvsp_message {
 
 
 #define NETVSC_MTU 65536
+#define NETVSC_MTU_MIN 68
 
 #define NETVSC_RECEIVE_BUFFER_SIZE              (1024*1024*16)  /* 16MB */
 #define NETVSC_RECEIVE_BUFFER_SIZE_LEGACY       (1024*1024*15)  /* 15MB */
@@ -670,6 +696,8 @@ struct netvsc_device {
         u32 send_table[VRSS_SEND_TAB_SIZE];
         u32 max_chn;
         u32 num_chn;
+        spinlock_t sc_lock; /* Protects num_sc_offered variable */
+        u32 num_sc_offered;
         atomic_t queue_sends[NR_CPUS];
 
         /* Holds rndis device info */
@@ -688,6 +716,11 @@ struct netvsc_device {
 
         /* The net device context */
         struct net_device_context *nd_ctx;
+
+        /* 1: allocated, serial number is valid. 0: not allocated */
+        u32 vf_alloc;
+        /* Serial number of the VF to team with */
+        u32 vf_serial;
 };
 
 /* NdisInitialize message */