From nobody Thu May 11 21:37:35 2023 X-Original-To: dev-commits-src-main@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 4QHQGm0RY9z4B31S; Thu, 11 May 2023 21:37:36 +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 4QHQGl5dc2z4C99; Thu, 11 May 2023 21:37:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683841055; 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=P7ajEJ4Zi6mU5FcVfWUnvhxroeUZij9sYuYussSFTKU=; b=DvsWmweZ0y47MktOuflvKt41RZWoLucT/ABtbCEPrhyaZO7leWc8w0h+mnMbWqhWg0LG6E BLCBhbDV5tHupscyTWupsCYc4kPuPe19e4UdzE+/Z/yFqQIWr9fGO0ddYxEJsOF83QVkJK M9rQo8u3GiCLW2Xw3hiBPYpnLDliFWiQwHDtcAm6VcJyCKSMQOx/bdGW76dX9oFOxx3pxK bnGQWPYm2TNQdJZNo0PWAkC+R8BCDAfFBOFbZP/c//5FwVKSBYfkHaIoP/2LXuEb39TMjg W8kjNqB0KnqzEiDNMFh3IO/eMbcLkU2o7IUCKc0CSyre0g/XUe3yvyuv+2/PcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683841055; 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=P7ajEJ4Zi6mU5FcVfWUnvhxroeUZij9sYuYussSFTKU=; b=RPs1qWcL6MSRK9NdmDaiFGA9kGP7di9Dl/pURtOIoxd9o6nJXwVRsCrmdGtTfdzVF2o/7o P32HAJxBZQ3VjcrV2zAJHU+fh9LnGKFLlNKf3PxR6Sc4z+JlqbxiOhCjSsW6Y7uWFMVDIX QkpjsZyWPnlSRLIksLdhEneQ2+nDS9SZjUipd207h4eszZuS8yyJbKKCvST3EV/4Fk/2Gu 2LdK0BujmaUUk9v6P5Jdzv3dPwurBG7WyxuvtvVFMa6TVbm0jDNDGy+WNR871tvnCQCeWY 8QroEbN/7MLsMmYgAx5HZ/HXJJMud3kdij4bspAbP/kWeb8pqbET7klhHgTEUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683841055; a=rsa-sha256; cv=none; b=etTmnUw8Srzl+GAGOtfnv8dTbDyrRZbcnsVI9Ax6VjTmNtR2X4TYwat0YB9T9wRMCnlSi7 3K+iu4C+Xcdpbhen7uhaGVjwUUE2ObfyQng4w9FHHO7CFrgui6Wt87RGcYmuy2TwUbpwLi 7wrrms1WuHw10ARenWCqqdGyfSSOaxg0/4j/3W2B5BP40mztnJWwm8+kIMGSP3jCpwgXAk LG8f0AjCTzkXuszPH1faSA9QSHxIc1hIjr4T0K5sBAR1+tpwTBlFUvmoFdVYMNsm7miU8i /zdUgtZqNn//umxmR+7GlXvX3BIjy9WYZAfKltYzINQHqeayZyftR2YwzQIt9A== 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 4QHQGl4lV5z18Ng; Thu, 11 May 2023 21:37:35 +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 34BLbZ6K067274; Thu, 11 May 2023 21:37:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34BLbZfm067273; Thu, 11 May 2023 21:37:35 GMT (envelope-from git) Date: Thu, 11 May 2023 21:37:35 GMT Message-Id: <202305112137.34BLbZfm067273@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 910a83438358 - main - LinuxKPI: 802.11: fix IEEE80211_TX_INFO_DRIVER_DATA_SIZE List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 910a834383587fc6630225200cc66b7965d5102f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=910a834383587fc6630225200cc66b7965d5102f commit 910a834383587fc6630225200cc66b7965d5102f Author: Bjoern A. Zeeb AuthorDate: 2023-05-11 21:35:11 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-05-11 21:36:59 +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 MFC after: 10 days --- 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 *)]; }; };