MFC 304973,304975,304976,304979,305044-305048

304973
    hyperv/hn: Switch to new RNDIS query for link status extraction.

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

304975
    hyperv/hn: Switch to new RNDIS query for RSS capabilities extraction.

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

304976
    hyperv/hn: Fix # of channels setting, if RSS is not available.

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

304979
    hyperv/hn: Switch to new RNDIS set for RSS parameters.

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

305044
    hyperv/hn: Move OIDs to net/rndis.h; they are standard NDIS OIDs.

    Actually all OIDs defined in net/rndis.h are standard NDIS OIDs.
    While I'm here, use the verbose macro name as in NDIS spec.

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

305045
    hyperv/hn: Indentation and field comment fixup for ndis.h.

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

305046
    net/rndis: Packet types are defined by NDIS; not RNDIS specific.

    Reviewed by:    hps
    Sponsored by:   Microsoft
    Differential Revision:  https://reviews.freebsd.org/D7681

305047
    hyperv/hn: Switch to new RNDIS set for RX filters.

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

305048
    hyperv/hn: Remove unused function

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

1 files changed, 16 insertions, 12 deletions

diff --git a/sys/net/rndis.h b/sys/net/rndis.h
index 5dd1d91..3a51454 100644
--- a/sys/net/rndis.h
+++ b/sys/net/rndis.h
@@ -62,6 +62,8 @@
 #define	OID_GEN_SUPPORTED_GUIDS		0x00010117
 #define	OID_GEN_NETWORK_LAYER_ADDRESSES	0x00010118
 #define	OID_GEN_TRANSPORT_HEADER_OFFSET	0x00010119
+#define	OID_GEN_RECEIVE_SCALE_CAPABILITIES	0x00010203
+#define	OID_GEN_RECEIVE_SCALE_PARAMETERS	0x00010204
 #define	OID_GEN_MACHINE_NAME		0x0001021A
 #define	OID_GEN_RNDIS_CONFIG_PARAMETER	0x0001021B
 #define	OID_GEN_VLAN_ID			0x0001021C
@@ -82,6 +84,8 @@
 #define	OID_802_3_XMIT_TIMES_CRS_LOST	0x01020206
 #define	OID_802_3_XMIT_LATE_COLLISIONS	0x01020207
 
+#define	OID_TCP_OFFLOAD_PARAMETERS	0xFC01020C
+
 #define	RNDIS_MEDIUM_802_3		0x00000000
 
 /* Device flags */
@@ -262,18 +266,18 @@ struct rndis_keepalive_comp {
 };
 
 /* packet filter bits used by OID_GEN_CURRENT_PACKET_FILTER */
-#define	RNDIS_PACKET_TYPE_DIRECTED		0x00000001
-#define	RNDIS_PACKET_TYPE_MULTICAST		0x00000002
-#define	RNDIS_PACKET_TYPE_ALL_MULTICAST		0x00000004
-#define	RNDIS_PACKET_TYPE_BROADCAST		0x00000008
-#define	RNDIS_PACKET_TYPE_SOURCE_ROUTING	0x00000010
-#define	RNDIS_PACKET_TYPE_PROMISCUOUS		0x00000020
-#define	RNDIS_PACKET_TYPE_SMT			0x00000040
-#define	RNDIS_PACKET_TYPE_ALL_LOCAL		0x00000080
-#define	RNDIS_PACKET_TYPE_GROUP			0x00001000
-#define	RNDIS_PACKET_TYPE_ALL_FUNCTIONAL	0x00002000
-#define	RNDIS_PACKET_TYPE_FUNCTIONAL		0x00004000
-#define	RNDIS_PACKET_TYPE_MAC_FRAME		0x00008000
+#define	NDIS_PACKET_TYPE_DIRECTED		0x00000001
+#define	NDIS_PACKET_TYPE_MULTICAST		0x00000002
+#define	NDIS_PACKET_TYPE_ALL_MULTICAST		0x00000004
+#define	NDIS_PACKET_TYPE_BROADCAST		0x00000008
+#define	NDIS_PACKET_TYPE_SOURCE_ROUTING		0x00000010
+#define	NDIS_PACKET_TYPE_PROMISCUOUS		0x00000020
+#define	NDIS_PACKET_TYPE_SMT			0x00000040
+#define	NDIS_PACKET_TYPE_ALL_LOCAL		0x00000080
+#define	NDIS_PACKET_TYPE_GROUP			0x00001000
+#define	NDIS_PACKET_TYPE_ALL_FUNCTIONAL		0x00002000
+#define	NDIS_PACKET_TYPE_FUNCTIONAL		0x00004000
+#define	NDIS_PACKET_TYPE_MAC_FRAME		0x00008000
 
 /* RNDIS offsets */
 #define	RNDIS_HEADER_OFFSET	8	/* bytes */