d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hyperv/hn: Suffix NDIS offload size with NDIS version.

Browse Source 
MFC after:	1 week
Sponsored by:	Microsoft
Differential Revision:	https://reviews.freebsd.org/D8091
This commit is contained in:
Sepherosa Ziehau 2016-10-10 06:14:38 +00:00
parent 43147058fd
commit 5d67f6752b
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=306939
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/dev/hyperv/netvsc/hv_rndis_filter.c
View File

@ -1179,16 +1179,16 @@ hn_rndis_query_hwcaps(struct hn_softc *sc, struct ndis_offload *caps)
size = NDIS_OFFLOAD_SIZE;
} else if (sc->hn_ndis_ver >= HN_NDIS_VERSION_6_1) {
in.ndis_hdr.ndis_rev = NDIS_OFFLOAD_REV_2;
size = NDIS_OFFLOAD_SIZE_2;
size = NDIS_OFFLOAD_SIZE_6_1;
} else {
in.ndis_hdr.ndis_rev = NDIS_OFFLOAD_REV_1;
size = NDIS_OFFLOAD_SIZE_1;
size = NDIS_OFFLOAD_SIZE_6_0;
}
in.ndis_hdr.ndis_size = size;
caps_len = NDIS_OFFLOAD_SIZE;
error = hn_rndis_query2(sc, OID_TCP_OFFLOAD_HARDWARE_CAPABILITIES,
&in, size, caps, &caps_len, NDIS_OFFLOAD_SIZE_1);
&in, size, caps, &caps_len, NDIS_OFFLOAD_SIZE_6_0);
if (error)
return (error);
@ -1209,7 +1209,7 @@ hn_rndis_query_hwcaps(struct hn_softc *sc, struct ndis_offload *caps)
if_printf(sc->hn_ifp, "invalid NDIS objsize %u, "
"data size %zu\n", caps->ndis_hdr.ndis_size, caps_len);
return (EINVAL);
} else if (caps->ndis_hdr.ndis_size < NDIS_OFFLOAD_SIZE_1) {
} else if (caps->ndis_hdr.ndis_size < NDIS_OFFLOAD_SIZE_6_0) {
if_printf(sc->hn_ifp, "invalid NDIS objsize %u\n",
caps->ndis_hdr.ndis_size);
return (EINVAL);
@ -1217,7 +1217,9 @@ hn_rndis_query_hwcaps(struct hn_softc *sc, struct ndis_offload *caps)
if (bootverbose) {
/*
* Fields for NDIS 6.0 are accessable.
* NOTE:
* caps->ndis_hdr.ndis_size MUST be checked before accessing
* NDIS 6.1+ specific fields.
*/
if_printf(sc->hn_ifp, "hwcaps rev %u\n",
caps->ndis_hdr.ndis_rev);

4
sys/dev/hyperv/netvsc/ndis.h
View File

@ -319,9 +319,9 @@ struct ndis_offload {
};
#define NDIS_OFFLOAD_SIZE sizeof(struct ndis_offload)
#define NDIS_OFFLOAD_SIZE_1 \
#define NDIS_OFFLOAD_SIZE_6_0 \
__offsetof(struct ndis_offload, ndis_ipsecv2)
#define NDIS_OFFLOAD_SIZE_2 \
#define NDIS_OFFLOAD_SIZE_6_1 \
__offsetof(struct ndis_offload, ndis_rsc)
#define NDIS_OFFLOAD_REV_1 1 /* NDIS 6.0 */