From nobody Tue Mar 18 09:22:17 2025 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 4ZH5vt3b0Mz5qKwB; Tue, 18 Mar 2025 09:22:18 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZH5vs44txz45B8; Tue, 18 Mar 2025 09:22:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742289737; 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=t4MYd4nU6ufJkPIsEj56YdjJEtrOopyr93whi/i5ua8=; b=lALmvVh1I1dHy6u9Y4hQfeuPLDTftsG9tv+zzultRlQQA5578j7orhL4SlxFcpfKYwV4vr NnadGc7TXI4jiILx5zOS1odDTmR33+7HHJNsYzKnst+oLAcZmK0Km44vH3L0gvGMhDJdaW rTip0/bydlZbEVqrHwj9OKB7VDTRxpHLyO/WMTwtFTyTAflqmFc4Q4VxYklxiMzDxLJrPp dgDBhqp5EvUmhT3GDVxQ5cTS2q9gQQ8ExHDrzizO+E0JM8wBY9Q/Va0qI0+QOYuRhK76Dw elsFJQmEZBIt0jX4IMTNim3cghADHj+FnsLi0wYvJQnIAwX8oiiaHzZw7m9qDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742289737; a=rsa-sha256; cv=none; b=mHOteDLAZIXgnYkM3FSWZ58m5XhEnUW66uvieZUz2E9wjHGYfIZpUtBvxIQUQ2ERZYbRsO G/N5lPiq8fi8xBDG/4RG7qwg/PX1tvAPGkhXQkrmdpMrzGqreVP47nvyV4JeuCRnp1b+dh kMKlAuEsvxHVFb/k6uNBSTmg4SAb5wJ6RWn2pJB3Of3X8ag7Ge/CBU9LRTUHQFIp3D0xBM u519Z59OU5+ANNm6cNsxo2sMdMyNgMKBD92/huHVxjfRSNpA25EEEq8sriU380aYlMyaRo /4byvtBs5bvAFWUY/JzhRIvFZBzftvl5LjnUbeIu9CuVdEeEGQl45tgAIMnmwg== 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=1742289737; 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=t4MYd4nU6ufJkPIsEj56YdjJEtrOopyr93whi/i5ua8=; b=oEhdH6UX3O4PtxGFxiURQJyCPzLNQtmwD4uLIyfzbYyeMzOwpXkEoep4v6LNmggPJHN9Za Si9zdPYeoxKTALOCvMHIGSq0S0VFpZHdqK7t7wtLH1wYxdz+nDmh0fL7xLsOs9dM1aFgLK E927smiVaBxNsfcRXwghCoHvq8lWdPvUrJyqy0LtfZShHdlTkNf3HVegdQIi3Vwkkkmw1r f0MaH+QB30b0NvhzomqPlrflTAMLK2S+DESfR9GZSNCqhTniOfey2x0j7zy+7trVvk8Cox /X307nH2Ep3wMLugXpBcC3Nw/pSdT7WbxZ7zXb8RexPCTugXDgLHUu+g/k+d8g== 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 4ZH5vs3d7HzBGG; Tue, 18 Mar 2025 09:22:17 +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 52I9MHg2076368; Tue, 18 Mar 2025 09:22:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52I9MH9i076364; Tue, 18 Mar 2025 09:22:17 GMT (envelope-from git) Date: Tue, 18 Mar 2025 09:22:17 GMT Message-Id: <202503180922.52I9MH9i076364@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: 848fdcae0326 - main - rtw89: make wow.c compile 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 848fdcae0326db5b7c3edd2e8c264d25254abe1d Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=848fdcae0326db5b7c3edd2e8c264d25254abe1d commit 848fdcae0326db5b7c3edd2e8c264d25254abe1d Author: Bjoern A. Zeeb AuthorDate: 2025-03-15 00:14:52 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-03-18 09:22:01 +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 MFC after: 3 days --- 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); }