From nobody Tue Mar 18 09:22:14 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 4ZH5vp4C5Bz5qL69; Tue, 18 Mar 2025 09:22:14 +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 4ZH5vp20bGz459n; Tue, 18 Mar 2025 09:22:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742289734; 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=GyT9eZeMGP3bflHZn3QqJGe03T2Ns16hmEZgV0XuTnc=; b=fNIEa8kxP9ccplCkAGVPsylvhXLqNgI2WyFR8zt/47n4iiNq9hp9CtBJm143Xs0h/8qwnm umZ5EoGbP9AhtW/SzcAfQz+3g5caMqzGdZgZmIHhYY/5tHSXpwbejIrmYwiWn2TrEHxyy0 GsjhnwiZG2/NkH2KHTmoJYjiW6d5ttksj8G9EiFD3W+7VRTTbSSyTy5Swcre2jhlfOQ9Ei Gw13IThlQGDVMzSMRt9my4r2fMKxdNfZvZT22P6ObxOwzozzCLNhjz+lgMusZM4/aas6JK 9245iMBJCjQsDyMlgUWLLlMFVevI1bnOa0pTNRVzCUM6Yc3nTCjlDXC0OtAVNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742289734; a=rsa-sha256; cv=none; b=kXEGitdstqjmWgzQ60FdK2Z6UyxmOjl/mbOSxo//3w8gY0z/XTrDcFRm3mdpxLkE4YM3r8 MjijcwqIYri+Djhkdg9WC4deCALLtorUavSmY7jqCs7SJDbTxP//dl5TeII3MJNa7EO9vW CGCri2cUqHs7nzc7N9VoV9oLC9xej/OrbYnJGVarfmrOgzy0skvqdXUJYHAOF0Vob+UdYd PpazZX5yz6xGupkGLO7qGUeUp20v/01+HWnfR0jUrLcPptUcevLtNB3MHzD47UC87ydTL+ X6dwF5FfUhozXAKpUMf4JNWHkwFRgjVxfazj74N/KKgYJwTWKrMDllF00kFq1Q== 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=1742289734; 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=GyT9eZeMGP3bflHZn3QqJGe03T2Ns16hmEZgV0XuTnc=; b=fzaNV6JBvicAGF9tZW17Gc45hVLH4TbqviZprXT48X/stn1zTimGWjE2b+3SackbTDIAEO zJ3MFptJ+dn021bKNFEiE/o9jP9TMMH6s/toM4xZRFVayO9R4PFFj8AcqpPY41dLpOZTvV XRCVl4e8iTcf5GGWqcLozDYUZLimHPncpvwiWIRuqK4Ol9pbZ3qb87pkeg6SGYr10dJgtC bRzR0Io0GZBxCqCUsi8u4GekokV/rCPjWp3VoY3zKmRkDlgrAr0gY0d1McgKV9CZErGfke Trf1Xx5Yb0pQt7Qx26Opt8d6JX1HWVp6hXCpmeC6QfvPxZZ+RDBb6RfSjlUsFg== 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 4ZH5vp1K0czBGF; Tue, 18 Mar 2025 09:22:14 +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 52I9MEEm076254; Tue, 18 Mar 2025 09:22:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52I9MEJH076251; Tue, 18 Mar 2025 09:22:14 GMT (envelope-from git) Date: Tue, 18 Mar 2025 09:22:14 GMT Message-Id: <202503180922.52I9MEJH076251@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: 7513a0afe5fb - main - net80211: make use of IEEE80211_KEY_BITS for debug messages 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: 7513a0afe5fb26d30dbcae0347e43728e3511d3e Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=7513a0afe5fb26d30dbcae0347e43728e3511d3e commit 7513a0afe5fb26d30dbcae0347e43728e3511d3e Author: Bjoern A. Zeeb AuthorDate: 2025-03-14 23:43:17 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-03-18 09:21:57 +0000 net80211: make use of IEEE80211_KEY_BITS for debug messages Use %b with IEEE80211_KEY_BITS for the debug logging in ieee80211_crypto.c rather than just printing the hex value, which makes some of the messages more obvious and avoids having the header file next to one at all times. Sponsored by: The FreeBSD Foundation MFC after: 3 days Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D49369 --- sys/net80211/ieee80211_crypto.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/sys/net80211/ieee80211_crypto.c b/sys/net80211/ieee80211_crypto.c index b1c8b750e145..600d69d6043b 100644 --- a/sys/net80211/ieee80211_crypto.c +++ b/sys/net80211/ieee80211_crypto.c @@ -466,14 +466,15 @@ ieee80211_crypto_newkey(struct ieee80211vap *vap, */ IEEE80211_DPRINTF(vap, IEEE80211_MSG_CRYPTO, "%s: driver override for cipher %s, flags " - "0x%x -> 0x%x\n", __func__, cip->ic_name, - oflags, key->wk_flags); + "%b -> %b\n", __func__, cip->ic_name, + oflags, IEEE80211_KEY_BITS, + key->wk_flags, IEEE80211_KEY_BITS); keyctx = cip->ic_attach(vap, key); if (keyctx == NULL) { IEEE80211_DPRINTF(vap, IEEE80211_MSG_CRYPTO, "%s: unable to attach cipher %s with " - "flags 0x%x\n", __func__, cip->ic_name, - key->wk_flags); + "flags %b\n", __func__, cip->ic_name, + key->wk_flags, IEEE80211_KEY_BITS); key->wk_flags = oflags; /* restore old flags */ vap->iv_stats.is_crypto_attachfail++; return 0; @@ -498,9 +499,9 @@ _ieee80211_crypto_delkey(struct ieee80211vap *vap, struct ieee80211_key *key) KASSERT(key->wk_cipher != NULL, ("No cipher!")); IEEE80211_DPRINTF(vap, IEEE80211_MSG_CRYPTO, - "%s: %s keyix %u flags 0x%x rsc %ju tsc %ju len %u\n", + "%s: %s keyix %u flags %b rsc %ju tsc %ju len %u\n", __func__, key->wk_cipher->ic_name, - key->wk_keyix, key->wk_flags, + key->wk_keyix, key->wk_flags, IEEE80211_KEY_BITS, key->wk_keyrsc[IEEE80211_NONQOS_TID], key->wk_keytsc, key->wk_keylen); @@ -566,9 +567,9 @@ ieee80211_crypto_setkey(struct ieee80211vap *vap, struct ieee80211_key *key) KASSERT(cip != NULL, ("No cipher!")); IEEE80211_DPRINTF(vap, IEEE80211_MSG_CRYPTO, - "%s: %s keyix %u flags 0x%x mac %s rsc %ju tsc %ju len %u\n", + "%s: %s keyix %u flags %b mac %s rsc %ju tsc %ju len %u\n", __func__, cip->ic_name, key->wk_keyix, - key->wk_flags, ether_sprintf(key->wk_macaddr), + key->wk_flags, IEEE80211_KEY_BITS, ether_sprintf(key->wk_macaddr), key->wk_keyrsc[IEEE80211_NONQOS_TID], key->wk_keytsc, key->wk_keylen); @@ -586,9 +587,9 @@ ieee80211_crypto_setkey(struct ieee80211vap *vap, struct ieee80211_key *key) */ if (!cip->ic_setkey(key)) { IEEE80211_DPRINTF(vap, IEEE80211_MSG_CRYPTO, - "%s: cipher %s rejected key index %u len %u flags 0x%x\n", + "%s: cipher %s rejected key index %u len %u flags %b\n", __func__, cip->ic_name, key->wk_keyix, - key->wk_keylen, key->wk_flags); + key->wk_keylen, key->wk_flags, IEEE80211_KEY_BITS); vap->iv_stats.is_crypto_setkey_cipher++; return 0; }