MFC 304832-304834,304972

304832
    hyperv/hn: Use vmbus xact for RNDIS query.

    And switch MAC address query to use new RNDIS query function.

    Sponsored by:   Microsoft
    Differential Revision:  https://reviews.freebsd.org/D7639

304833
    hyperv/hn: Save the adopted NDIS version for RNDIS to use later.

    Sponsored by:   Microsoft
    Differential Revision:  https://reviews.freebsd.org/D7640

304834
    hyperv/hn: Use vmbus xact for RNDIS set.

    And use new RNDIS set to configure NDIS offloading parameters.

    Sponsored by:   Microsoft
    Differential Revision:  https://reviews.freebsd.org/D7641

304972
    hyperv/hn: Add definition for NDIS media state.

    Sponsored by:   Microsoft
    Differential Revision:  https://reviews.freebsd.org/D7652

1 files changed, 11 insertions, 0 deletions

diff --git a/sys/net/rndis.h b/sys/net/rndis.h
index 52ec660..5dd1d91 100644
--- a/sys/net/rndis.h
+++ b/sys/net/rndis.h
@@ -172,6 +172,10 @@ struct rndis_query_req {
 	uint32_t rm_devicevchdl;
 };
 
+#define	RNDIS_QUERY_REQ_INFOBUFOFFSET		\
+	(sizeof(struct rndis_query_req) -	\
+	 __offsetof(struct rndis_query_req, rm_rid))
+
 struct rndis_query_comp {
 	uint32_t rm_type;
 	uint32_t rm_len;
@@ -181,6 +185,9 @@ struct rndis_query_comp {
 	uint32_t rm_infobufoffset;
 };
 
+#define	RNDIS_QUERY_COMP_INFOBUFABS(ofs)	\
+	((ofs) + __offsetof(struct rndis_query_req, rm_rid))
+
 /* Send a set object request. */
 #define	REMOTE_NDIS_SET_MSG		0x00000005
 #define	REMOTE_NDIS_SET_CMPLT		0x80000005
@@ -195,6 +202,10 @@ struct rndis_set_req {
 	uint32_t rm_devicevchdl;
 };
 
+#define	RNDIS_SET_REQ_INFOBUFOFFSET		\
+	(sizeof(struct rndis_set_req) -		\
+	 __offsetof(struct rndis_set_req, rm_rid))
+
 struct rndis_set_comp {
 	uint32_t rm_type;
 	uint32_t rm_len;