From owner-dev-commits-src-all@freebsd.org Mon Mar 15 05:05:31 2021
Return-Path: <owner-dev-commits-src-all@freebsd.org>
Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5371956F7D9;
Mon, 15 Mar 2021 05:05:31 +0000 (UTC) (envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4DzPWH1ZPNz3p9Z;
Mon, 15 Mar 2021 05:05:31 +0000 (UTC) (envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:5])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 28F1825C3;
Mon, 15 Mar 2021 05:05:31 +0000 (UTC) (envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 12F55VDE061584;
Mon, 15 Mar 2021 05:05:31 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 12F55VKQ061583;
Mon, 15 Mar 2021 05:05:31 GMT (envelope-from git)
Date: Mon, 15 Mar 2021 05:05:31 GMT
Message-Id: <202103150505.12F55VKQ061583@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Wei Hu <whu@FreeBSD.org>
Subject: git: b05c1dd0d162 - stable/12 - hyperv/vmbus: Fix the wrong size in
ndis_offload structure
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: whu
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/12
X-Git-Reftype: branch
X-Git-Commit: b05c1dd0d1622fba5810513f3cefee4e34041c36
Auto-Submitted: auto-generated
X-BeenThere: dev-commits-src-all@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: Commit messages for all branches of the src repository
<dev-commits-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-src-all>,
<mailto:dev-commits-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-src-all/>
List-Post: <mailto:dev-commits-src-all@freebsd.org>
List-Help: <mailto:dev-commits-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all>,
<mailto:dev-commits-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 15 Mar 2021 05:05:31 -0000
The branch stable/12 has been updated by whu:
URL: https://cgit.FreeBSD.org/src/commit/?id=b05c1dd0d1622fba5810513f3cefee4e34041c36
commit b05c1dd0d1622fba5810513f3cefee4e34041c36
Author: Wei Hu <whu@FreeBSD.org>
AuthorDate: 2019-07-09 08:21:14 +0000
Commit: Wei Hu <whu@FreeBSD.org>
CommitDate: 2021-03-15 05:03:58 +0000
hyperv/vmbus: Fix the wrong size in ndis_offload structure
Submitted by: whu
MFC after: 2 weeks
Sponsored by: Microsoft
(cherry picked from commit 23a499203c5b3fd74f781d1383269a6e168588cf)
---
sys/dev/hyperv/netvsc/ndis.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys/dev/hyperv/netvsc/ndis.h b/sys/dev/hyperv/netvsc/ndis.h
index 4e34b51ca30f..32b6aa307452 100644
--- a/sys/dev/hyperv/netvsc/ndis.h
+++ b/sys/dev/hyperv/netvsc/ndis.h
@@ -115,8 +115,8 @@ struct ndis_offload_params {
/* NDIS >= 6.30 */
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_ */
+ uint32_t ndis_encap; /* NDIS_OFFLOAD_SET_ */
+ uint32_t ndis_encap_types;/* NDIS_ENCAP_TYPE_ */
};
#define NDIS_OFFLOAD_PARAMS_SIZE sizeof(struct ndis_offload_params)