From nobody Tue Apr 05 15:39:52 2022 X-Original-To: dev-commits-src-all@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 C192B1A9DF3D; Tue, 5 Apr 2022 15:39:52 +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 4KXsK453Z4z4rrm; Tue, 5 Apr 2022 15:39:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649173192; 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=jC693XeS1X9MZLwE1mtocP9QW7AFFzGNywjCfZBXgpw=; b=O/vACM1zs9cVrX2Z+pgGZ9wMrRv1wDcAxlk5aev890x6LYErmo8IWNtN0mfVVederw9ezH Wgfq7oqqj/vEj/Q/ThLsM23/OewvJAJ2lZdaZz2MTIXq7THFfGTtyfBygatC0k2e8+nATq L76p3Hkr6u0iHZPExMfzVAaXLVdC57WTDVag9UAj5+b+kM3CfNsC0UWYe36JfbkfZexnB1 ZHorhUizYHuy1BHXhU0ZL9msEVXuQf3jgu+yxasONMjXt7GQEtVyFpIeK89yhqewhrw3OR TJAmDlt6WaUjeGxsExn0QtPJMwut+nm8DPbQzbNxzJSF8n3y6E9YbK7xI1u05Q== 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 8E8351403; Tue, 5 Apr 2022 15:39:52 +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 235Fdq4M001375; Tue, 5 Apr 2022 15:39:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 235Fdqab001374; Tue, 5 Apr 2022 15:39:52 GMT (envelope-from git) Date: Tue, 5 Apr 2022 15:39:52 GMT Message-Id: <202204051539.235Fdqab001374@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: 2a8e509ba30c - stable/13 - LinuxKPI: 802.11: fix compat code for i386 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 2a8e509ba30c6546ceeec49f9447c2e3d21a1d22 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649173192; 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=jC693XeS1X9MZLwE1mtocP9QW7AFFzGNywjCfZBXgpw=; b=B24kOIyW/EyHbRt2KHghKhi5k4D4lqHXoUk21uNSClKpI4CFy6udx1GqAVXFIcJsJhL3mM Fs6pMItUHNRguCRWpDp52hx6yxDTtCBIYVkYPicaR66Y4kW8j+x8PwPSLDWs5+9F2SclRy +nX+Ld7pADRvqdhlp3PdVk35CNgTcWn7DMDQ44VfpkilM8FmxdDNHo8ZZgzDtHcz9T2HlY XPpCWcx8H2P6UB5okWEXCV/UPhP+ijfpSWsMeS4DqyllwYPtd1he4tHU7Kb2Ni+4vmUM5S u2SmFZE7d6CBNY8aHGGM6gIQzK+6E7OrUpMkd6UWDckR2NdYRELsmbvLCspIgg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649173192; a=rsa-sha256; cv=none; b=d/FTrurHvneBenNsyHs4GyL3G7Fnn+2XRhZJfdw0U4JrCkO4t8V9CsHY2xz1trqH+fqMyf 1nIKe7zy2BhSBtxr6K0jtwBTIVsP2fcro055Didrc62+DmJF+w6RXbRKhoqEEIwFnlGYen UPHqmKpCW8yuUwb/i6FHsZke6koN6bBBUm8f30bmBAD5sv76YwndoS5YuzCfqlBYKZx0G6 I+G0nzW9pkpvXJOWuSOMIg6e55dKrHjSIMuTbPt4Rbkd8sLqs1N61v6OIeQYKCyO4+pXUV z4AOhCY75N70rysYQvGHakksDE7VzR7rYNCrRbiDUlRETnDDQ84ij+q7ka7kQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=2a8e509ba30c6546ceeec49f9447c2e3d21a1d22 commit 2a8e509ba30c6546ceeec49f9447c2e3d21a1d22 Author: Bjoern A. Zeeb AuthorDate: 2022-03-31 17:29:53 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-04-05 14:46:58 +0000 LinuxKPI: 802.11: fix compat code for i386 Compiling another driver on i386 revealed two problems: - ieee80211_tx_info.status.status_driver_data space needs to be calculated. While a pointer is 32bit vm_paddr_t is 64 bit on i386 so we didn't fit more than one of these in but needed more space. - the arguments to ieee80211_txq_get_depth() are expected to unsigned long and not uint64_t. No user noticable changes. Sponsored by: The FreeBSD Foundation (cherry picked from commit 86220d3cbd500b1018dcdabb0ba70644db438cfd) --- sys/compat/linuxkpi/common/include/net/mac80211.h | 9 +++++---- sys/compat/linuxkpi/common/src/linux_80211.c | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/net/mac80211.h b/sys/compat/linuxkpi/common/include/net/mac80211.h index 14404d4723f8..4e3342837ddc 100644 --- a/sys/compat/linuxkpi/common/include/net/mac80211.h +++ b/sys/compat/linuxkpi/common/include/net/mac80211.h @@ -670,7 +670,7 @@ struct ieee80211_tx_info { uint8_t antenna; uint16_t tx_time; bool is_valid_ack_signal; - void *status_driver_data[2]; /* XXX TODO */ + void *status_driver_data[16 / sizeof(void *)]; /* XXX TODO */ } status; #define IEEE80211_TX_INFO_DRIVER_DATA_SIZE (5 * sizeof(void *)) /* XXX TODO 5? */ void *driver_data[IEEE80211_TX_INFO_DRIVER_DATA_SIZE / sizeof(void *)]; @@ -900,8 +900,8 @@ struct sk_buff *linuxkpi_ieee80211_pspoll_get(struct ieee80211_hw *, struct ieee80211_vif *); struct sk_buff *linuxkpi_ieee80211_nullfunc_get(struct ieee80211_hw *, struct ieee80211_vif *, bool); -void linuxkpi_ieee80211_txq_get_depth(struct ieee80211_txq *, uint64_t *, - uint64_t *); +void linuxkpi_ieee80211_txq_get_depth(struct ieee80211_txq *, unsigned long *, + unsigned long *); struct wireless_dev *linuxkpi_ieee80211_vif_to_wdev(struct ieee80211_vif *); void linuxkpi_ieee80211_connection_loss(struct ieee80211_vif *); void linuxkpi_ieee80211_beacon_loss(struct ieee80211_vif *); @@ -1931,7 +1931,8 @@ ieee80211_tx_info_clear_status(struct ieee80211_tx_info *info) } static __inline void -ieee80211_txq_get_depth(struct ieee80211_txq *txq, uint64_t *frame_cnt, uint64_t *byte_cnt) +ieee80211_txq_get_depth(struct ieee80211_txq *txq, unsigned long *frame_cnt, + unsigned long *byte_cnt) { if (frame_cnt == NULL && byte_cnt == NULL) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 3a70d8bbfcab..13ad2908c021 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -4007,11 +4007,11 @@ linuxkpi_ieee80211_tx_dequeue(struct ieee80211_hw *hw, void linuxkpi_ieee80211_txq_get_depth(struct ieee80211_txq *txq, - uint64_t *frame_cnt, uint64_t *byte_cnt) + unsigned long *frame_cnt, unsigned long *byte_cnt) { struct lkpi_txq *ltxq; struct sk_buff *skb; - uint64_t fc, bc; + unsigned long fc, bc; ltxq = TXQ_TO_LTXQ(txq);