From owner-svn-src-all@freebsd.org  Mon Oct 17 08:03:16 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id B74D4C15A36;
 Mon, 17 Oct 2016 08:03:16 +0000 (UTC)
 (envelope-from sephe@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 88D2B1E58;
 Mon, 17 Oct 2016 08:03:16 +0000 (UTC)
 (envelope-from sephe@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u9H83Fc3024975;
 Mon, 17 Oct 2016 08:03:15 GMT (envelope-from sephe@FreeBSD.org)
Received: (from sephe@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u9H83FkP024974;
 Mon, 17 Oct 2016 08:03:15 GMT (envelope-from sephe@FreeBSD.org)
Message-Id: <201610170803.u9H83FkP024974@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: sephe set sender to
 sephe@FreeBSD.org using -f
From: Sepherosa Ziehau <sephe@FreeBSD.org>
Date: Mon, 17 Oct 2016 08:03:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r307496 - stable/11/sys/net
X-SVN-Group: stable-11
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 17 Oct 2016 08:03:16 -0000

Author: sephe
Date: Mon Oct 17 08:03:15 2016
New Revision: 307496
URL: https://svnweb.freebsd.org/changeset/base/307496

Log:
  MFC 305277,305278
  
  305277
      net/rndis: Add comment for rndis_comp_hdr
  
      Reviewed by:    hps
      Sponsored by:   Microsoft
      Differential Revision:  https://reviews.freebsd.org/D7738
  
  305278
      net/rndis: Define common message header for RNDIS messages.
  
      And avoid RNDIS_HEADER_OFFSET hardcoding.
  
      Reviewed by:    hps
      Sponsored by:   Microsoft
      Differential Revision:  https://reviews.freebsd.org/D7739

Modified:
  stable/11/sys/net/rndis.h
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/net/rndis.h
==============================================================================
--- stable/11/sys/net/rndis.h	Mon Oct 17 07:46:13 2016	(r307495)
+++ stable/11/sys/net/rndis.h	Mon Oct 17 08:03:15 2016	(r307496)
@@ -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
@@ -147,6 +155,12 @@ struct rndis_pktinfo {
 /*
  * RNDIS control messages
  */
+
+/*
+ * Common header for RNDIS completion messages.
+ *
+ * NOTE: It does not apply to REMOTE_NDIS_RESET_CMPLT.
+ */
 struct rndis_comp_hdr {
 	uint32_t rm_type;
 	uint32_t rm_len;
@@ -316,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))