svn commit: r305278 - head/sys/net

[Sepherosa Ziehau]

Author: sephe
Date: Fri Sep  2 05:57:13 2016
New Revision: 305278
URL: https://svnweb.freebsd.org/changeset/base/305278

Log:
  net/rndis: Define common message header for RNDIS messages.
  
  And avoid RNDIS_HEADER_OFFSET hardcoding.
  
  Reviewed by:	hps
  MFC after:	1 week
  Sponsored by:	Microsoft
  Differential Revision:	https://reviews.freebsd.org/D7739

Modified:
  head/sys/net/rndis.h

Modified: head/sys/net/rndis.h
==============================================================================
--- head/sys/net/rndis.h	Fri Sep  2 05:49:38 2016	(r305277)
+++ head/sys/net/rndis.h	Fri Sep  2 05:57:13 2016	(r305278)
@@ -93,6 +93,14 @@
 #define	RNDIS_DF_CONNECTION_ORIENTED	0x00000002
 
 /*
+ * Common RNDIS message header.
+ */
+struct rndis_msghdr {
+	uint32_t rm_type;
+	uint32_t rm_len;
+};
+
+/*
  * RNDIS data message
  */
 #define	REMOTE_NDIS_PACKET_MSG		0x00000001
@@ -322,7 +330,7 @@ struct rndis_keepalive_comp {
 #define	NDIS_PACKET_TYPE_MAC_FRAME		0x00008000
 
 /* RNDIS offsets */
-#define	RNDIS_HEADER_OFFSET	8	/* bytes */
+#define	RNDIS_HEADER_OFFSET	((uint32_t)sizeof(struct rndis_msghdr))
 #define	RNDIS_DATA_OFFSET	\
     ((uint32_t)(sizeof(struct rndis_packet_msg) - RNDIS_HEADER_OFFSET))