From nobody Tue Apr 29 11:41:34 2025 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 4Zmz1C5BwVz5tv8t; Tue, 29 Apr 2025 11:41:35 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zmz1C0Rgpz3wm4; Tue, 29 Apr 2025 11:41:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745926895; 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=pIz5RLfcpjmO11EKl4jQy1xIIECJ2Jy/N0YIlIdElhs=; b=UoP3sTEKmNOs94gb063yztZb0+Z0MVgRfCG0N03lKQE0Mf2RHHkVPIteVRKBrer6lStSQd Rnmn+rvTDQ2v1qW96ehvqt/Z7OFWjHkiU3wzcB2pMtOhx5Sg1fafzqnMBUEKPtM0eOzXre Cz8V/M/Ixsjs7UUDhg9GMaVLPvEEiW2T8tNGmVPfEmCMBGJs6W6FsGn55ackAY+KcNg2vU ULA9FTf+iatSEUz3/z1leMfX4il62XvwA5QRh5zX/+FeDxQcedntbjJvFjWjvjiOcYc1hz XkIi6iMWgFTq636p0J8T+t6dqu4jB2lGNSRJfj7/OXYyALib1HAF8ZsIeLSg3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745926895; a=rsa-sha256; cv=none; b=EbjukBjRsF9ScRtczxhkboVUl2JXx9kN03vCf1SdnKosgnjAhfrPB7AcCAW9oo4gjOLGFF 1d6OaIuptAVXh4S2p4VG/zPkha9Q5fwJPAW0U/Hi3i3NPw0LgfgeH8/v/ImTCFT8n59N3c 1JIALZax/uTcbzAOh8g1oTf35Lphw/SAcCV7rdNGgNS+eC8Ihp7um+VGsFBMSg3uLoY5nd rM4L3CRFI2WNot9KDSudxrhSxFdXExSVY7JeEEeslgG7Ewix4xjr9bX5O4xR/foChf+CAP gY+oLyubunYXxB0GaDmvIaHQaopmoKOoFSckkaKLHLHMCn3GAqM3KgfMsay+sQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745926895; 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=pIz5RLfcpjmO11EKl4jQy1xIIECJ2Jy/N0YIlIdElhs=; b=fLYagrHk8QLoUlzwxVnddjKjpVl1WxSpSCqdkeah1HAPzLp4Uz6unVcutw1jcmF1XOHbaZ azlxKRHYUqnrvgpxDpY3N7IZ3lV1DTN1YJ+P4419ZUP4D7bFBtczDLUlI8C43dBDuVWyYN pes2QIIQm4A27WlFfNkQfnK9rhmqP1+Hdl0KFpN9T+w6fyEyZuMvtN1GA9ggkOsfvm5Eey qxd++oicwW7HtpXobpWfeIQ90CaYfVRBNM3kU1C8uCrg8E/yDZd68rGkSCPPQicwGPpur5 HzZMKf1g4Fpx61WzX8RjqUK5+eZXxoUOwJFmO4gz2IoqNiphoN4VgI1aWq4e4A== 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 4Zmz1C03QQz3cD; Tue, 29 Apr 2025 11:41:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53TBfY1a045650; Tue, 29 Apr 2025 11:41:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53TBfYBx045647; Tue, 29 Apr 2025 11:41:34 GMT (envelope-from git) Date: Tue, 29 Apr 2025 11:41:34 GMT Message-Id: <202504291141.53TBfYBx045647@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: 1be235fcc48c - stable/14 - rtw89: make wow.c compile 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: 1be235fcc48c95e686dd1f69e8daba953dac1ecc Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=1be235fcc48c95e686dd1f69e8daba953dac1ecc commit 1be235fcc48c95e686dd1f69e8daba953dac1ecc Author: Bjoern A. Zeeb AuthorDate: 2025-03-15 00:14:52 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-04-29 10:49:27 +0000 rtw89: make wow.c compile So far we have not compiled wow.c given we do not enable CONFIG_PM yet. Make the necessary file local adjustments to make the file compile once further changes in LinuxKPI 802.11 code are comitted. Sponsored by: The FreeBSD Foundation (cherry picked from commit 848fdcae0326db5b7c3edd2e8c264d25254abe1d) --- sys/contrib/dev/rtw89/wow.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/sys/contrib/dev/rtw89/wow.c b/sys/contrib/dev/rtw89/wow.c index 9882064ef68d..8322c0763715 100644 --- a/sys/contrib/dev/rtw89/wow.c +++ b/sys/contrib/dev/rtw89/wow.c @@ -17,13 +17,21 @@ void rtw89_wow_parse_akm(struct rtw89_dev *rtwdev, struct sk_buff *skb) struct ieee80211_mgmt *mgmt = (struct ieee80211_mgmt *)skb->data; struct rtw89_wow_param *rtw_wow = &rtwdev->wow; const u8 *rsn, *ies = mgmt->u.assoc_req.variable; +#if defined(__linux__) struct rtw89_rsn_ie *rsn_ie; +#elif defined(__FreeBSD__) + const struct rtw89_rsn_ie *rsn_ie; +#endif rsn = cfg80211_find_ie(WLAN_EID_RSN, ies, skb->len); if (!rsn) return; +#if defined(__linux__) rsn_ie = (struct rtw89_rsn_ie *)rsn; +#elif defined(__FreeBSD__) + rsn_ie = (const struct rtw89_rsn_ie *)rsn; +#endif rtw_wow->akm = rsn_ie->akm_cipher_suite.type; } @@ -111,8 +119,13 @@ static int rtw89_rx_pn_to_iv(struct rtw89_dev *rtwdev, if (err) return err; +#if defined(__linux__) rtw89_debug(rtwdev, RTW89_DBG_WOW, "%s key %d pn-%llx to iv-%*ph\n", __func__, key->keyidx, pn, 8, iv); +#elif defined(__FreeBSD__) + rtw89_debug(rtwdev, RTW89_DBG_WOW, "%s key %d pn-%jx to iv-%*ph\n", + __func__, key->keyidx, (uintmax_t)pn, 8, iv); +#endif return 0; } @@ -129,8 +142,13 @@ static int rtw89_tx_pn_to_iv(struct rtw89_dev *rtwdev, if (err) return err; +#if defined(__linux__) rtw89_debug(rtwdev, RTW89_DBG_WOW, "%s key %d pn-%llx to iv-%*ph\n", __func__, key->keyidx, pn, 8, iv); +#elif defined(__FreeBSD__) + rtw89_debug(rtwdev, RTW89_DBG_WOW, "%s key %d pn-%jx to iv-%*ph\n", + __func__, key->keyidx, (uintmax_t)pn, 8, iv); +#endif return 0; } @@ -204,8 +222,13 @@ static int rtw89_tx_iv_to_pn(struct rtw89_dev *rtwdev, return err; atomic64_set(&key->tx_pn, pn); +#if defined(__linux__) rtw89_debug(rtwdev, RTW89_DBG_WOW, "%s key %d iv-%*ph to pn-%llx\n", __func__, key->keyidx, 8, iv, pn); +#elif defined(__FreeBSD__) + rtw89_debug(rtwdev, RTW89_DBG_WOW, "%s key %d iv-%*ph to pn-%jx\n", + __func__, key->keyidx, 8, iv, (uintmax_t)pn); +#endif return 0; } @@ -235,8 +258,13 @@ static int rtw89_rx_pn_get_pmf(struct rtw89_dev *rtwdev, u64_encode_bits(seq.ccmp.pn[5], RTW89_KEY_PN_0); gtk_info->ipn = cpu_to_le64(pn); gtk_info->igtk_keyid = cpu_to_le32(key->keyidx); +#if defined(__linux__) rtw89_debug(rtwdev, RTW89_DBG_WOW, "%s key %d pn-%llx\n", __func__, key->keyidx, pn); +#elif defined(__FreeBSD__) + rtw89_debug(rtwdev, RTW89_DBG_WOW, "%s key %d pn-%jx\n", + __func__, key->keyidx, (uintmax_t)pn); +#endif return 0; } @@ -472,10 +500,17 @@ static void rtw89_wow_debug_aoac_rpt(struct rtw89_dev *rtwdev) 8, aoac_rpt->gtk_rx_iv[2]); rtw89_debug(rtwdev, RTW89_DBG_WOW, "[aoac_rpt] gtk_rx_iv[3] = %*ph\n", 8, aoac_rpt->gtk_rx_iv[3]); +#if defined(__linux__) rtw89_debug(rtwdev, RTW89_DBG_WOW, "[aoac_rpt] igtk_key_id = %llu\n", aoac_rpt->igtk_key_id); rtw89_debug(rtwdev, RTW89_DBG_WOW, "[aoac_rpt] igtk_ipn = %llu\n", aoac_rpt->igtk_ipn); +#elif defined(__FreeBSD__) + rtw89_debug(rtwdev, RTW89_DBG_WOW, "[aoac_rpt] igtk_key_id = %ju\n", + (uintmax_t)aoac_rpt->igtk_key_id); + rtw89_debug(rtwdev, RTW89_DBG_WOW, "[aoac_rpt] igtk_ipn = %ju\n", + (uintmax_t)aoac_rpt->igtk_ipn); +#endif rtw89_debug(rtwdev, RTW89_DBG_WOW, "[aoac_rpt] igtk = %*ph\n", 32, aoac_rpt->igtk); }