Merge tag 'hyperv-next-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/hyper...

[linux-2.6-microblaze.git] / drivers / net / hyperv / hyperv_net.h

diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
index ab7cc3d..9caa876 100644 (file)
--- a/drivers/net/hyperv/hyperv_net.h
+++ b/drivers/net/hyperv/hyperv_net.h
@@ -609,7 +609,8 @@ struct nvsp_5_send_indirect_table {
        /* The number of entries in the send indirection table */
        u32 count;
 
-       /* The offset of the send indirection table from top of this struct.
+       /* The offset of the send indirection table from the beginning of
+        * struct nvsp_message.
         * The send indirection table tells which channel to put the send
         * traffic on. Each entry is a channel number.
         */
@@ -822,7 +823,8 @@ struct nvsp_message {
 
 #define NETVSC_SUPPORTED_HW_FEATURES (NETIF_F_RXCSUM | NETIF_F_IP_CSUM | \
                                      NETIF_F_TSO | NETIF_F_IPV6_CSUM | \
-                                     NETIF_F_TSO6 | NETIF_F_LRO | NETIF_F_SG)
+                                     NETIF_F_TSO6 | NETIF_F_LRO | \
+                                     NETIF_F_SG | NETIF_F_RXHASH)
 
 #define VRSS_SEND_TAB_SIZE 16  /* must be power of 2 */
 #define VRSS_CHANNEL_MAX 64
@@ -853,6 +855,7 @@ struct multi_recv_comp {
 struct nvsc_rsc {
        const struct ndis_pkt_8021q_info *vlan;
        const struct ndis_tcp_ip_checksum_info *csum_info;
+       const u32 *hash_info;
        u8 is_last; /* last RNDIS msg in a vmtransfer_page */
        u32 cnt; /* #fragments in an RSC packet */
        u32 pktlen; /* Full packet length */