From nobody Mon Jun 26 12:08:42 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QqRT64gdKz4k6qk; Mon, 26 Jun 2023 12:08:42 +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 4QqRT62df3z3j7j; Mon, 26 Jun 2023 12:08:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687781322; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rg5JVhpv+gny1UFZ+SEPzs259xISw+uy1MtlIh85V+c=; b=U9HK6niAMgDpfXsq8IbHqr28Yd9G7AnUyM/7d1gcIiy66hjYjbmyBddBgeypIDLLNWbDol OsDQolFf/cBQyNILLasgVRRgfdDHfuu9BeKlsM81vUTdp54ygr655laUipcosAndneu0CT 5mbZLaLfWlIoftFvDhxM1/3+CDgBiDdBw90NohonkrhQnnoIn/hNzTXhTT9/n6sIQoIrsb zHJfbwbXca9d+xxwIVr//op7bJVElh19MbTN2PbrpeNr7kbnSt5B2vP+I4vnoXGxo9b8Rq EcOJayBLfn6Qs8irpl+1RtfhL5ZsDCKqriL/fQ8yIuXVnwFhhdxkER28NGaOxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687781322; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rg5JVhpv+gny1UFZ+SEPzs259xISw+uy1MtlIh85V+c=; b=in4laHlvB0uMOQtrCDgb412AU6quEJmSrHRi0HDxpRACRj961EqzxK75B2xHY2GI2Xq4m0 7UcDcFVVmizJ9czzaVjTJ6Qr3b4F3cdMZQBGMqk7l7Jb15o4GjtKWhJx8s/1Vsct7ss75L 8fq7Ii9+4LDVfE9atpOXEtphg7Z/t05oj0eHHSSPUwf1Jp4XToQzxiJwQPcWRf9IrMxyZW 7T6rmBFPUPBrmI+eo6k51y7x5aqHii6TPjpxuZ8jqQBaAZLQVWhkNI9sbMVBVIpTS8Moim UcarjkNjhcIJp4/WWsZYEaYu1UaSJaSmhAB5FkZVShvJCbrBwbdbwcMJQJ1DRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687781322; a=rsa-sha256; cv=none; b=vdsjb7l/TYq2mKOEgn1ixh+OdwytzqaTV/5owgiC5V/omDKzNdGeSFmeaIY7R731vCyP/i BxAGBV7icGgq2cESoG8+8OXnRp1ND5f+43//a+8qqWvXl76QIYZZqoPkYfi/nnsowSltIG w8b9ExZmBq/ygGFmzAtlchsndCUpNkB0Eie6lSCs1LXRtn19qr6f5jQZ4hscyRutmH+g6U P0mMnI5GFhF70jeu9JDBEsPRXRTpNsj9sVUw2lk/CVq2AgYR8EQ2cY8F0tl1HDY7l1lxH8 2goElQUGkLh5ztCC1wg6O/ykYw0RgcpF+pPRkU4yRVX3eYfrkDdJIAS4G6u6TA== 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 4QqRT61lCmz17dZ; Mon, 26 Jun 2023 12:08:42 +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 35QC8gjU083188; Mon, 26 Jun 2023 12:08:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35QC8gc1083187; Mon, 26 Jun 2023 12:08:42 GMT (envelope-from git) Date: Mon, 26 Jun 2023 12:08:42 GMT Message-Id: <202306261208.35QC8gc1083187@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 3df3e9a27d5f - stable/13 - LinuxKPI: 802.11: fix IEEE80211_TX_INFO_DRIVER_DATA_SIZE List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3df3e9a27d5f5cc4dedc2d4003bbb049c471f789 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=3df3e9a27d5f5cc4dedc2d4003bbb049c471f789 commit 3df3e9a27d5f5cc4dedc2d4003bbb049c471f789 Author: Bjoern A. Zeeb AuthorDate: 2023-05-11 21:35:11 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-06-26 09:14:22 +0000 LinuxKPI: 802.11: fix IEEE80211_TX_INFO_DRIVER_DATA_SIZE Fix the sizing of IEEE80211_TX_INFO_DRIVER_DATA_SIZE so that it also works on 32bit platforms. Otherwise it triggers a compile-time assertion in ath10k for i386. Sponsored by: The FreeBSD Foundation (cherry picked from commit 910a834383587fc6630225200cc66b7965d5102f) --- sys/compat/linuxkpi/common/include/net/mac80211.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/include/net/mac80211.h b/sys/compat/linuxkpi/common/include/net/mac80211.h index 77045f866e8b..9cef12d825d7 100644 --- a/sys/compat/linuxkpi/common/include/net/mac80211.h +++ b/sys/compat/linuxkpi/common/include/net/mac80211.h @@ -755,7 +755,7 @@ struct ieee80211_tx_info { bool is_valid_ack_signal; void *status_driver_data[16 / sizeof(void *)]; /* XXX TODO */ } status; -#define IEEE80211_TX_INFO_DRIVER_DATA_SIZE (5 * sizeof(void *)) /* XXX TODO 5? */ +#define IEEE80211_TX_INFO_DRIVER_DATA_SIZE 40 void *driver_data[IEEE80211_TX_INFO_DRIVER_DATA_SIZE / sizeof(void *)]; }; };