Page MenuHomeFreeBSD
Files F135436890

D7680.diff
No OneTemporary
Actions

D7680.diff
View Options

Index: head/sys/dev/hyperv/netvsc/ndis.h
===================================================================
--- head/sys/dev/hyperv/netvsc/ndis.h
+++ head/sys/dev/hyperv/netvsc/ndis.h
@@ -29,42 +29,41 @@
#ifndef _NET_NDIS_H_
#define _NET_NDIS_H_
-#define NDIS_MEDIA_STATE_CONNECTED 0
-#define NDIS_MEDIA_STATE_DISCONNECTED 1
+#define NDIS_MEDIA_STATE_CONNECTED 0
+#define NDIS_MEDIA_STATE_DISCONNECTED 1
-#define NDIS_OBJTYPE_DEFAULT 0x80
-#define NDIS_OBJTYPE_RSS_CAPS 0x88
-#define NDIS_OBJTYPE_RSS_PARAMS 0x89
-
-/* common_set */
-#define NDIS_OFFLOAD_SET_NOCHG 0
-#define NDIS_OFFLOAD_SET_ON 1
-#define NDIS_OFFLOAD_SET_OFF 2
+#define NDIS_OFFLOAD_SET_NOCHG 0
+#define NDIS_OFFLOAD_SET_ON 1
+#define NDIS_OFFLOAD_SET_OFF 2
/* a.k.a GRE MAC */
-#define NDIS_ENCAP_TYPE_NVGRE 0x00000001
+#define NDIS_ENCAP_TYPE_NVGRE 0x00000001
-#define NDIS_HASH_FUNCTION_MASK 0x000000FF /* see hash function */
-#define NDIS_HASH_TYPE_MASK 0x00FFFF00 /* see hash type */
+#define NDIS_HASH_FUNCTION_MASK 0x000000FF /* see hash function */
+#define NDIS_HASH_TYPE_MASK 0x00FFFF00 /* see hash type */
/* hash function */
-#define NDIS_HASH_FUNCTION_TOEPLITZ 0x00000001
+#define NDIS_HASH_FUNCTION_TOEPLITZ 0x00000001
/* hash type */
-#define NDIS_HASH_IPV4 0x00000100
-#define NDIS_HASH_TCP_IPV4 0x00000200
-#define NDIS_HASH_IPV6 0x00000400
-#define NDIS_HASH_IPV6_EX 0x00000800
-#define NDIS_HASH_TCP_IPV6 0x00001000
-#define NDIS_HASH_TCP_IPV6_EX 0x00002000
-
-#define NDIS_HASH_KEYSIZE_TOEPLITZ 40
-#define NDIS_HASH_INDCNT 128
+#define NDIS_HASH_IPV4 0x00000100
+#define NDIS_HASH_TCP_IPV4 0x00000200
+#define NDIS_HASH_IPV6 0x00000400
+#define NDIS_HASH_IPV6_EX 0x00000800
+#define NDIS_HASH_TCP_IPV6 0x00001000
+#define NDIS_HASH_TCP_IPV6_EX 0x00002000
+
+#define NDIS_HASH_KEYSIZE_TOEPLITZ 40
+#define NDIS_HASH_INDCNT 128
+
+#define NDIS_OBJTYPE_DEFAULT 0x80
+#define NDIS_OBJTYPE_RSS_CAPS 0x88
+#define NDIS_OBJTYPE_RSS_PARAMS 0x89
struct ndis_object_hdr {
- uint8_t ndis_type; /* NDIS_OBJTYPE_ */
- uint8_t ndis_rev; /* type specific */
- uint16_t ndis_size; /* incl. this hdr */
+ uint8_t ndis_type; /* NDIS_OBJTYPE_ */
+ uint8_t ndis_rev; /* type specific */
+ uint16_t ndis_size; /* incl. this hdr */
};
/*
@@ -73,70 +72,64 @@
*/
struct ndis_offload_params {
struct ndis_object_hdr ndis_hdr;
- uint8_t ndis_ip4csum; /* param_set */
- uint8_t ndis_tcp4csum; /* param_set */
- uint8_t ndis_udp4csum; /* param_set */
- uint8_t ndis_tcp6csum; /* param_set */
- uint8_t ndis_udp6csum; /* param_set */
- uint8_t ndis_lsov1; /* lsov1_set */
- uint8_t ndis_ipsecv1; /* ipsecv1_set */
- uint8_t ndis_lsov2_ip4; /* lsov2_set */
- uint8_t ndis_lsov2_ip6; /* lsov2_set */
- uint8_t ndis_tcp4conn; /* PARAM_NOCHG */
- uint8_t ndis_tcp6conn; /* PARAM_NOCHG */
- uint32_t ndis_flags; /* 0 */
+ uint8_t ndis_ip4csum; /* NDIS_OFFLOAD_PARAM_ */
+ uint8_t ndis_tcp4csum; /* NDIS_OFFLOAD_PARAM_ */
+ uint8_t ndis_udp4csum; /* NDIS_OFFLOAD_PARAM_ */
+ uint8_t ndis_tcp6csum; /* NDIS_OFFLOAD_PARAM_ */
+ uint8_t ndis_udp6csum; /* NDIS_OFFLOAD_PARAM_ */
+ uint8_t ndis_lsov1; /* NDIS_OFFLOAD_PARAM_ */
+ uint8_t ndis_ipsecv1; /* NDIS_OFFLOAD_IPSECV1_ */
+ uint8_t ndis_lsov2_ip4; /* NDIS_OFFLOAD_LSOV2_ */
+ uint8_t ndis_lsov2_ip6; /* NDIS_OFFLOAD_LSOV2_ */
+ uint8_t ndis_tcp4conn; /* 0 */
+ uint8_t ndis_tcp6conn; /* 0 */
+ uint32_t ndis_flags; /* 0 */
/* NDIS >= 6.1 */
- uint8_t ndis_ipsecv2; /* ipsecv2_set */
- uint8_t ndis_ipsecv2_ip4; /* ipsecv2_set */
+ uint8_t ndis_ipsecv2; /* NDIS_OFFLOAD_IPSECV2_ */
+ uint8_t ndis_ipsecv2_ip4;/* NDIS_OFFLOAD_IPSECV2_ */
/* NDIS >= 6.30 */
- uint8_t ndis_rsc_ip4; /* rsc_set */
- uint8_t ndis_rsc_ip6; /* rsc_set */
- uint8_t ndis_encap; /* common_set */
- uint8_t ndis_encap_types; /* NDIS_ENCAP_TYPE_ */
+ uint8_t ndis_rsc_ip4; /* NDIS_OFFLOAD_RSC_ */
+ uint8_t ndis_rsc_ip6; /* NDIS_OFFLOAD_RSC_ */
+ uint8_t ndis_encap; /* NDIS_OFFLOAD_SET_ */
+ uint8_t ndis_encap_types;/* NDIS_ENCAP_TYPE_ */
};
-#define NDIS_OFFLOAD_PARAMS_SIZE sizeof(struct ndis_offload_params)
-#define NDIS_OFFLOAD_PARAMS_SIZE_6_1 \
+#define NDIS_OFFLOAD_PARAMS_SIZE sizeof(struct ndis_offload_params)
+#define NDIS_OFFLOAD_PARAMS_SIZE_6_1 \
__offsetof(struct ndis_offload_params, ndis_rsc_ip4)
-#define NDIS_OFFLOAD_PARAMS_REV_2 2 /* NDIS 6.1 */
-#define NDIS_OFFLOAD_PARAMS_REV_3 3 /* NDIS 6.30 */
+#define NDIS_OFFLOAD_PARAMS_REV_2 2 /* NDIS 6.1 */
+#define NDIS_OFFLOAD_PARAMS_REV_3 3 /* NDIS 6.30 */
-/* param_set */
-#define NDIS_OFFLOAD_PARAM_NOCHG 0 /* common to all sets */
-#define NDIS_OFFLOAD_PARAM_OFF 1
-#define NDIS_OFFLOAD_PARAM_TX 2
-#define NDIS_OFFLOAD_PARAM_RX 3
-#define NDIS_OFFLOAD_PARAM_TXRX 4
+#define NDIS_OFFLOAD_PARAM_NOCHG 0 /* common */
+#define NDIS_OFFLOAD_PARAM_OFF 1
+#define NDIS_OFFLOAD_PARAM_TX 2
+#define NDIS_OFFLOAD_PARAM_RX 3
+#define NDIS_OFFLOAD_PARAM_TXRX 4
-/* lsov1_set */
/* NDIS_OFFLOAD_PARAM_NOCHG */
-#define NDIS_OFFLOAD_LSOV1_OFF 1
-#define NDIS_OFFLOAD_LSOV1_ON 2
+#define NDIS_OFFLOAD_LSOV1_OFF 1
+#define NDIS_OFFLOAD_LSOV1_ON 2
-/* ipsecv1_set */
/* NDIS_OFFLOAD_PARAM_NOCHG */
-#define NDIS_OFFLOAD_IPSECV1_OFF 1
-#define NDIS_OFFLOAD_IPSECV1_AH 2
-#define NDIS_OFFLOAD_IPSECV1_ESP 3
-#define NDIS_OFFLOAD_IPSECV1_AH_ESP 4
+#define NDIS_OFFLOAD_IPSECV1_OFF 1
+#define NDIS_OFFLOAD_IPSECV1_AH 2
+#define NDIS_OFFLOAD_IPSECV1_ESP 3
+#define NDIS_OFFLOAD_IPSECV1_AH_ESP 4
-/* lsov2_set */
/* NDIS_OFFLOAD_PARAM_NOCHG */
-#define NDIS_OFFLOAD_LSOV2_OFF 1
-#define NDIS_OFFLOAD_LSOV2_ON 2
+#define NDIS_OFFLOAD_LSOV2_OFF 1
+#define NDIS_OFFLOAD_LSOV2_ON 2
-/* ipsecv2_set */
/* NDIS_OFFLOAD_PARAM_NOCHG */
-#define NDIS_OFFLOAD_IPSECV2_OFF 1
-#define NDIS_OFFLOAD_IPSECV2_AH 2
-#define NDIS_OFFLOAD_IPSECV2_ESP 3
-#define NDIS_OFFLOAD_IPSECV2_AH_ESP 4
+#define NDIS_OFFLOAD_IPSECV2_OFF 1
+#define NDIS_OFFLOAD_IPSECV2_AH 2
+#define NDIS_OFFLOAD_IPSECV2_ESP 3
+#define NDIS_OFFLOAD_IPSECV2_AH_ESP 4
-/* rsc_set */
/* NDIS_OFFLOAD_PARAM_NOCHG */
-#define NDIS_OFFLOAD_RSC_OFF 1
-#define NDIS_OFFLOAD_RSC_ON 2
+#define NDIS_OFFLOAD_RSC_OFF 1
+#define NDIS_OFFLOAD_RSC_ON 2
/*
* OID_GEN_RECEIVE_SCALE_CAPABILITIES
@@ -152,22 +145,22 @@
uint16_t ndis_pad;
};
-#define NDIS_RSS_CAPS_SIZE \
+#define NDIS_RSS_CAPS_SIZE \
__offsetof(struct ndis_rss_caps, ndis_pad)
-#define NDIS_RSS_CAPS_SIZE_6_0 \
+#define NDIS_RSS_CAPS_SIZE_6_0 \
__offsetof(struct ndis_rss_caps, ndis_nind)
-#define NDIS_RSS_CAPS_REV_1 1 /* NDIS 6.{0,1,20} */
-#define NDIS_RSS_CAPS_REV_2 2 /* NDIS 6.30 */
+#define NDIS_RSS_CAPS_REV_1 1 /* NDIS 6.{0,1,20} */
+#define NDIS_RSS_CAPS_REV_2 2 /* NDIS 6.30 */
-#define NDIS_RSS_CAP_MSI 0x01000000
-#define NDIS_RSS_CAP_CLASSIFY_ISR 0x02000000
-#define NDIS_RSS_CAP_CLASSIFY_DPC 0x04000000
-#define NDIS_RSS_CAP_MSIX 0x08000000
-#define NDIS_RSS_CAP_IPV4 0x00000100
-#define NDIS_RSS_CAP_IPV6 0x00000200
-#define NDIS_RSS_CAP_IPV6_EX 0x00000400
-#define NDIS_RSS_CAP_HASH_TOEPLITZ 0x00000001
+#define NDIS_RSS_CAP_MSI 0x01000000
+#define NDIS_RSS_CAP_CLASSIFY_ISR 0x02000000
+#define NDIS_RSS_CAP_CLASSIFY_DPC 0x04000000
+#define NDIS_RSS_CAP_MSIX 0x08000000
+#define NDIS_RSS_CAP_IPV4 0x00000100
+#define NDIS_RSS_CAP_IPV6 0x00000200
+#define NDIS_RSS_CAP_IPV6_EX 0x00000400
+#define NDIS_RSS_CAP_HASH_TOEPLITZ 0x00000001
/*
* OID_GEN_RECEIVE_SCALE_PARAMETERS
@@ -188,18 +181,18 @@
uint32_t ndis_cpumaskentsz;
};
-#define NDIS_RSS_PARAMS_SIZE sizeof(struct ndis_rss_params)
-#define NDIS_RSS_PARAMS_SIZE_6_0 \
+#define NDIS_RSS_PARAMS_SIZE sizeof(struct ndis_rss_params)
+#define NDIS_RSS_PARAMS_SIZE_6_0 \
__offsetof(struct ndis_rss_params, ndis_cpumaskoffset)
-#define NDIS_RSS_PARAMS_REV_1 1 /* NDIS 6.0 */
-#define NDIS_RSS_PARAMS_REV_2 2 /* NDIS 6.20 */
+#define NDIS_RSS_PARAMS_REV_1 1 /* NDIS 6.0 */
+#define NDIS_RSS_PARAMS_REV_2 2 /* NDIS 6.20 */
-#define NDIS_RSS_FLAG_BCPU_UNCHG 0x0001
-#define NDIS_RSS_FLAG_HASH_UNCHG 0x0002
-#define NDIS_RSS_FLAG_IND_UNCHG 0x0004
-#define NDIS_RSS_FLAG_KEY_UNCHG 0x0008
-#define NDIS_RSS_FLAG_DISABLE 0x0010
+#define NDIS_RSS_FLAG_BCPU_UNCHG 0x0001
+#define NDIS_RSS_FLAG_HASH_UNCHG 0x0002
+#define NDIS_RSS_FLAG_IND_UNCHG 0x0004
+#define NDIS_RSS_FLAG_KEY_UNCHG 0x0008
+#define NDIS_RSS_FLAG_DISABLE 0x0010
/* non-standard convenient struct */
struct ndis_rssprm_toeplitz {

File Metadata

Mime Type
text/plain
Expires
Mon, Nov 10, 8:53 PM (6 h, 49 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
25121327
Default Alt Text
D7680.diff (8 KB)

Event Timeline